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

[Evangelos Foutras]

    Date: Saturday, January 19, 2019 @ 11:33:46
  Author: foutrelis
Revision: 344471

Fix build with poppler 0.73

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

-----------------------------+
 PKGBUILD                    |    8 ++++++--
 calligra-poppler-0.73.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-19 11:29:16 UTC (rev 344470)
+++ PKGBUILD	2019-01-19 11:33:46 UTC (rev 344471)
@@ -39,13 +39,15 @@
         calligra-qt5.11.patch
         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.72.patch
+        calligra-poppler-0.73.patch)
 sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870'
             'SKIP'
             '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a'
             '127cc5e0946fbf741279306b4e9d592f5f901a7fab09039fcfc6c7e60193fa80'
             '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87'
-            '87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece')
+            '87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece'
+            'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8')
 validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
               42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
 
@@ -61,6 +63,8 @@
   patch -p1 -i ../calligra-poppler-0.71.patch
 # Fix build with poppler 0.72
   patch -p1 -i ../calligra-poppler-0.72.patch
+# Fix build with poppler 0.73
+  patch -p1 -i ../calligra-poppler-0.73.patch
 }
 
 build() {

Added: calligra-poppler-0.73.patch
===================================================================
--- calligra-poppler-0.73.patch	                        (rev 0)
+++ calligra-poppler-0.73.patch	2019-01-19 11:33:46 UTC (rev 344471)
@@ -0,0 +1,32 @@
+From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid at kde.org>
+Date: Tue, 15 Jan 2019 22:24:08 +0100
+Subject: [PATCH] Guchar -> unsigned char
+
+It was just a typdef and it's now gone
+---
+ filters/karbon/pdf/SvgOutputDev.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 80f01a5f76f..1a5aa30bc40 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+     if (maskColors) {
+         for (int y = 0; y < height; y++) {
+             dest = (unsigned int *)(buffer + y * 4 * width);
+-            Guchar * pix = imgStr->getLine();
++            unsigned char * pix = imgStr->getLine();
+             colorMap->getRGBLine(pix, dest, width);
+ 
+             for (int x = 0; x < width; x++) {
+@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+     } else {
+         for (int y = 0; y < height; y++) {
+             dest = (unsigned int *)(buffer + y * 4 * width);
+-            Guchar * pix = imgStr->getLine();
++            unsigned char * pix = imgStr->getLine();
+             colorMap->getRGBLine(pix, dest, width);
+         }
+