From eeed8cb17ee92cfa3c37e1c89f783167f05b7346 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 30 Jul 2020 00:54:41 +0000
Subject: user/calligra: Update to 3.2.1

---
 user/calligra/poppler4.patch | 76 --------------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 user/calligra/poppler4.patch

(limited to 'user/calligra/poppler4.patch')

diff --git a/user/calligra/poppler4.patch b/user/calligra/poppler4.patch
deleted file mode 100644
index 9a13bcdec..000000000
--- a/user/calligra/poppler4.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 2 Nov 2018 21:23:13 +0100
-Subject: Fix build with poppler 0.71
-
-Port away from removed API
-
-Differential Revision: https://phabricator.kde.org/D16607
----
- filters/karbon/pdf/PdfImport.cpp    |  6 +++---
- filters/karbon/pdf/SvgOutputDev.cpp | 10 +++++-----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
-index 48b08df..e910dae 100644
---- a/filters/karbon/pdf/PdfImport.cpp
-+++ b/filters/karbon/pdf/PdfImport.cpp
-@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
-     SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
-     if (dev->isOk()) {
-         int rotate = 0;
--        GBool useMediaBox = gTrue;
--        GBool crop = gFalse;
--        GBool printing = gFalse;
-+        bool useMediaBox = true;
-+        bool crop = false;
-+        bool printing = false;
-         pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
-         dev->dumpContent();
-     }
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 9063e69..80f01a5 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -39,7 +39,7 @@ class SvgOutputDev::Private
- {
- public:
-     Private(const QString &fname)
--            : svgFile(fname), defs(0), body(0), state(gTrue)
-+            : svgFile(fname), defs(0), body(0), state(true)
-             , brush(Qt::SolidPattern) {}
- 
-     ~Private() {
-@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName)
-         : d(new Private(fileName))
- {
-     if (! d->svgFile.open(QIODevice::WriteOnly)) {
--        d->state = gFalse;
-+        d->state = false;
-         return;
-     }
- 
-@@ -82,17 +82,17 @@ bool SvgOutputDev::isOk()
- 
- bool SvgOutputDev::upsideDown()
- {
--    return gTrue;
-+    return true;
- }
- 
- bool SvgOutputDev::useDrawChar()
- {
--    return gFalse;
-+    return false;
- }
- 
- bool SvgOutputDev::interpretType3Chars()
- {
--    return gFalse;
-+    return false;
- }
- 
- void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
--- 
-cgit v1.1
-
-- 
cgit v1.2.3-60-g2f50