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

[Antonio Rojas]

    Date: Thursday, December 13, 2018 @ 17:14:29
  Author: arojas
Revision: 342083

Fix build with poppler 0.72

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-13 16:41:36 UTC (rev 342082)
+++ PKGBUILD	2018-12-13 17:14:29 UTC (rev 342083)
@@ -38,12 +38,14 @@
 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-0.71.patch)
+        calligra-poppler-0.71.patch
+        calligra-poppler-0.72.patch)
 sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870'
             'SKIP'
             '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a'
             '127cc5e0946fbf741279306b4e9d592f5f901a7fab09039fcfc6c7e60193fa80'
-            '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87')
+            '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87'
+            'e172b1dcb21f17fcd69ee1d1d6600b1cf4ecdb9a8be297bc3e3703330ff28f6f')
 validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
               42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
 
@@ -57,6 +59,8 @@
   patch -p1 -i ../calligra-poppler-0.69.patch
 # Fix build with poppler 0.71
   patch -p1 -i ../calligra-poppler-0.71.patch
+# Fix build with poppler 0.72
+  patch -p1 -i ../calligra-poppler-0.72.patch
 }
 
 build() {

Added: calligra-poppler-0.72.patch
===================================================================
--- calligra-poppler-0.72.patch	                        (rev 0)
+++ calligra-poppler-0.72.patch	2018-12-13 17:14:29 UTC (rev 342083)
@@ -0,0 +1,32 @@
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 4a1fad6bbcf..958be4d2fd8 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -407,9 +407,9 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+     QString str;
+ 
+ #ifdef HAVE_POPPLER_PRE_0_64
+-    char * p = s->getCString();
++    char * p = s->c_str();
+ #else
+-    const char * p = s->getCString();
++    const char * p = s->c_str();
+ #endif
+     int len = s->getLength();
+     CharCode code;
+@@ -459,11 +459,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+     *d->body << " y=\"" << y << "px\"";
+ 
+     if (font && font->getFamily()) {
+-        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
+-        //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
++        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
++        //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() );
+     } else if (font && font->getName()) {
+-        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
+-        //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
++        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
++        //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() );
+     }
+     *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
+