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/poppler3.patch | 92 --------------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 user/calligra/poppler3.patch

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

diff --git a/user/calligra/poppler3.patch b/user/calligra/poppler3.patch
deleted file mode 100644
index 54702b515..000000000
--- a/user/calligra/poppler3.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 25 Oct 2018 23:06:34 +0200
-Subject: GBool -> bool
-
-It was just a typedef in poppler and it'll die in next versions
----
- filters/karbon/pdf/SvgOutputDev.cpp | 12 ++++++------
- filters/karbon/pdf/SvgOutputDev.h   | 10 +++++-----
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
-index 1d07f16..870a940 100644
---- a/filters/karbon/pdf/SvgOutputDev.cpp
-+++ b/filters/karbon/pdf/SvgOutputDev.cpp
-@@ -52,7 +52,7 @@ public:
-     QString defsData;
-     QTextStream * defs;
-     QTextStream * body;
--    GBool state;
-+    bool state;
-     QSizeF pageSize;
-     QPen pen;
-     QBrush brush;
-@@ -75,22 +75,22 @@ SvgOutputDev::~SvgOutputDev()
-     delete d;
- }
- 
--GBool SvgOutputDev::isOk()
-+bool SvgOutputDev::isOk()
- {
-     return d->state;
- }
- 
--GBool SvgOutputDev::upsideDown()
-+bool SvgOutputDev::upsideDown()
- {
-     return gTrue;
- }
- 
--GBool SvgOutputDev::useDrawChar()
-+bool SvgOutputDev::useDrawChar()
- {
-     return gFalse;
- }
- 
--GBool SvgOutputDev::interpretType3Chars()
-+bool SvgOutputDev::interpretType3Chars()
- {
-     return gFalse;
- }
-@@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
- 
- void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-                              int width, int height, GfxImageColorMap *colorMap,
--                             GBool /*interpolate*/, int *maskColors, GBool inlineImg)
-+                             bool /*interpolate*/, int *maskColors, bool inlineImg)
- {
-     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
-     imgStr->reset();
-diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
-index 422027c..df2805c 100644
---- a/filters/karbon/pdf/SvgOutputDev.h
-+++ b/filters/karbon/pdf/SvgOutputDev.h
-@@ -44,11 +44,11 @@ public:
-     explicit SvgOutputDev(const QString &fileName);
-     virtual ~SvgOutputDev();
- 
--    GBool isOk();
-+    bool isOk();
- 
--    GBool upsideDown() override;
--    GBool useDrawChar() override;
--    GBool interpretType3Chars() override;
-+    bool upsideDown() override;
-+    bool useDrawChar() override;
-+    bool interpretType3Chars() override;
-     void startPage(int pageNum, GfxState *state, XRef *xref) override;
-     void endPage() override;
- 
-@@ -63,7 +63,7 @@ public:
-     // images
-     void drawImage(GfxState *state, Object *ref, Stream *str,
-                            int width, int height, GfxImageColorMap *colorMap,
--                           GBool interpolate, int *maskColors, GBool inlineImg) override;
-+                           bool interpolate, int *maskColors, bool inlineImg) override;
- 
-     // styles
-     void updateAll(GfxState *state) override;
--- 
-cgit v1.1
-
-- 
cgit v1.2.3-60-g2f50