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

Antonio Rojas arojas at archlinux.org
Tue Oct 23 14:45:43 UTC 2018


    Date: Tuesday, October 23, 2018 @ 14:45:43
  Author: arojas
Revision: 337186

Fix build with poppler 0.69

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

-----------------------------+
 PKGBUILD                    |    7 +++-
 calligra-poppler-0.69.patch |   67 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-23 14:43:36 UTC (rev 337185)
+++ PKGBUILD	2018-10-23 14:45:43 UTC (rev 337186)
@@ -36,10 +36,11 @@
   replaces+=(calligra-l10n-$_lang)
 done
 source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
-        calligra-qt5.11.patch)
+        calligra-qt5.11.patch calligra-poppler-0.69.patch)
 sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870'
             'SKIP'
-            '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a')
+            '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a'
+            '7a29c220b3871569cb16390261951481341b7e5923ed5c95aa4188286b2ba56d')
 validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
               42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
 
@@ -49,6 +50,8 @@
   cd $pkgname-$pkgver
 # Fix build with Qt 5.11
   patch -p1 -i ../calligra-qt5.11.patch
+# Fix build with poppler 0.69
+  patch -p1 -i ../calligra-poppler-0.69.patch
 }
 
 build() {

Added: calligra-poppler-0.69.patch
===================================================================
--- calligra-poppler-0.69.patch	                        (rev 0)
+++ calligra-poppler-0.69.patch	2018-10-23 14:45:43 UTC (rev 337186)
@@ -0,0 +1,67 @@
+diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
+index c3e96b0cd28..48b08dfa32d 100644
+--- a/filters/karbon/pdf/PdfImport.cpp
++++ b/filters/karbon/pdf/PdfImport.cpp
+@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+     delete globalParams;
+     globalParams = 0;
+ 
+-    // check for memory leaks
+-    Object::memCheck(stderr);
+-
+     return KoFilter::OK;
+ }
+ 
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 931917ae15d..7901317ebd0 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix)
+            .arg(matrix.dx()) .arg(matrix.dy());
+ }
+ 
+-QString SvgOutputDev::convertMatrix(double * matrix)
++QString SvgOutputDev::convertMatrix(const double * matrix)
+ {
+     return QString("matrix(%1 %2 %3 %4 %5 %6)")
+            .arg(matrix[0]).arg(matrix[1])
+@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+ 
+     QString str;
+ 
+-    char * p = s->getCString();
++    const char * p = s->getCString();
+     int len = s->getLength();
+     CharCode code;
+     Unicode *u = nullptr;
+@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+     double x = state->getCurX();
+     double y = state->getCurY();
+ 
+-    double * ctm = state->getCTM();
++    const double * ctm = state->getCTM();
+     QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
+ 
+     QMatrix mirror;
+@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+         return;
+     }
+ 
+-    double * ctm = state->getCTM();
++    const double * ctm = state->getCTM();
+     QMatrix m;
+     m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
+ 
+diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
+index 85fe55dfff6..2a4490848bf 100644
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -84,7 +84,7 @@ public:
+ private:
+     QString convertPath(GfxPath *path);
+     QString convertMatrix(const QMatrix &matrix);
+-    QString convertMatrix(double * matrix);
++    QString convertMatrix(const double * matrix);
+     QString printFill();
+     QString printStroke();
+ 



More information about the arch-commits mailing list