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

[Antonio Rojas]

    Date: Tuesday, November 12, 2019 @ 09:46:27
  Author: arojas
Revision: 367860

Fix build with poppler 0.82

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

-----------------------------+
 PKGBUILD                    |    8 ++++++--
 calligra-poppler-0.82.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-12 09:22:18 UTC (rev 367859)
+++ PKGBUILD	2019-11-12 09:46:27 UTC (rev 367860)
@@ -41,7 +41,8 @@
         calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"
         calligra-poppler-0.71.patch
         calligra-poppler-0.72.patch
-        calligra-poppler-0.73.patch)
+        calligra-poppler-0.73.patch
+        calligra-poppler-0.82.patch)
 sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870'
             'SKIP'
             '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a'
@@ -49,7 +50,8 @@
             '127cc5e0946fbf741279306b4e9d592f5f901a7fab09039fcfc6c7e60193fa80'
             '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87'
             '87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece'
-            'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8')
+            'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8'
+            '3d59c6dec806113b9659cdd7f64230d87d081366a8a53ed9edd3a1afc13dd940')
 validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
               42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
 
@@ -69,6 +71,8 @@
   patch -p1 -i ../calligra-poppler-0.72.patch
 # Fix build with poppler 0.73
   patch -p1 -i ../calligra-poppler-0.73.patch
+# Fix build with poppler 0.82
+  patch -p1 -i ../calligra-poppler-0.82.patch
 }
 
 build() {

Added: calligra-poppler-0.82.patch
===================================================================
--- calligra-poppler-0.82.patch	                        (rev 0)
+++ calligra-poppler-0.82.patch	2019-11-12 09:46:27 UTC (rev 367860)
@@ -0,0 +1,35 @@
+Patch stolen from Mageia Cauldron but had to be modified quite a bit.
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index ffdbf01..70bc9f8 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+     const char * p = s->c_str();
+     int len = s->getLength();
+     CharCode code;
+-    Unicode *u = nullptr;
++    const Unicode *u = nullptr;
+     int uLen;
+     double dx, dy, originX, originY;
+     while (len > 0) {
+@@ -545,7 +545,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,
+-                             bool /*interpolate*/, int *maskColors, bool inlineImg)
++                             bool /*interpolate*/, const int *maskColors, bool inlineImg)
+ {
+     drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+ }
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -63,7 +63,7 @@ public:
+                            int *maskColors, bool inlineImg);
+     virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+                            int width, int height, GfxImageColorMap *colorMap,
+-                           bool interpolate, int *maskColors, bool inlineImg);
++                           bool interpolate, const int *maskColors, bool inlineImg);
+ 
+     // styles
+     virtual void updateAll(GfxState *state);