[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.71.patch)

[Antonio Rojas]

    Date: Thursday, November 1, 2018 @ 12:40:02
  Author: arojas
Revision: 337683

More poppler fixes

Added:
  calligra/trunk/calligra-poppler-0.71.patch
Modified:
  calligra/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |    7 --
 calligra-poppler-0.71.patch |   99 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-01 12:20:33 UTC (rev 337682)
+++ PKGBUILD	2018-11-01 12:40:02 UTC (rev 337683)
@@ -38,14 +38,12 @@
 source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
         calligra-qt5.11.patch
         calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"
-        calligra-poppler-override.patch::"https://cgit.kde.org/calligra.git/patch/?id=2993cf64"
-        calligra-poppler-0.71.patch::"https://cgit.kde.org/calligra.git/patch/?id=ab9cb332")
+        calligra-poppler-0.71.patch)
 sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870'
             'SKIP'
             '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a'
             'b6b3dc44606aa4243cd0da23819f3bad9953d0542b87d3b4e04113f431f2598c'
-            '08bfd9b8b1e77f0ea319d66f9692c34227872c772215e8c6c6663051e77b7f9b'
-            'ab13e12778cb7a4e30f1953fdaf964e2d2e7a135832cda2553838ff8690b4004')
+            '27e9a721a8f132cd582a638418093ff532d35423c34625414b82fc97f670a4b1')
 validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
               42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
 
@@ -57,7 +55,6 @@
   patch -p1 -i ../calligra-qt5.11.patch
 # Fix build with poppler 0.69
   patch -p1 -i ../calligra-poppler-0.69.patch
-  patch -p1 -i ../calligra-poppler-override.patch
 # Fix build with poppler 0.71
   patch -p1 -i ../calligra-poppler-0.71.patch
 }

Added: calligra-poppler-0.71.patch
===================================================================
--- calligra-poppler-0.71.patch	                        (rev 0)
+++ calligra-poppler-0.71.patch	2018-11-01 12:40:02 UTC (rev 337683)
@@ -0,0 +1,99 @@
+diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
+index 48b08dfa32d..e910dae0756 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 5692824bc45..43205170991 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() {
+@@ -52,7 +52,7 @@ public:
+     QString defsData;
+     QTextStream * defs;
+     QTextStream * body;
+-    GBool state;
++    bool state;
+     QSizeF pageSize;
+     QPen pen;
+     QBrush brush;
+@@ -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;
+     }
+ 
+@@ -75,24 +75,24 @@ SvgOutputDev::~SvgOutputDev()
+     delete d;
+ }
+ 
+-GBool SvgOutputDev::isOk()
++bool SvgOutputDev::isOk()
+ {
+     return d->state;
+ }
+ 
+-GBool SvgOutputDev::upsideDown()
++bool SvgOutputDev::upsideDown()
+ {
+-    return gTrue;
++    return true;
+ }
+ 
+-GBool SvgOutputDev::useDrawChar()
++bool SvgOutputDev::useDrawChar()
+ {
+-    return gFalse;
++    return false;
+ }
+ 
+-GBool SvgOutputDev::interpretType3Chars()
++bool SvgOutputDev::interpretType3Chars()
+ {
+-    return gFalse;
++    return false;
+ }
+ 
+ void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
+@@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+ 
+ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+                              int width, int height, GfxImageColorMap *colorMap,
+-                             int *maskColors, GBool /*inlineImg*/)
++                             int *maskColors, bool /*inlineImg*/)
+ {
+     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+     imgStr->reset();
+@@ -549,7 +549,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+ 
+ 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)
+ {
+     drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+ }
+