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

[Antonio Rojas]

    Date: Thursday, November 1, 2018 @ 12:08:54
  Author: arojas
Revision: 337679

Fix build with poppler 0.71

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

-----------------------------+
 PKGBUILD                    |   11 +++++-
 calligra-poppler-0.69.patch |   67 ------------------------------------------
 2 files changed, 8 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-01 12:05:39 UTC (rev 337678)
+++ PKGBUILD	2018-11-01 12:08:54 UTC (rev 337679)
@@ -6,7 +6,7 @@
 pkgname=calligra
 pkgdesc="A set of applications for productivity and creative usage"
 pkgver=3.1.0
-pkgrel=10
+pkgrel=11
 arch=(x86_64)
 url='https://www.calligra-suite.org/'
 license=(FDL1.2 GPL2 LGPL)
@@ -36,11 +36,14 @@
   replaces+=(calligra-l10n-$_lang)
 done
 source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
-        calligra-qt5.11.patch calligra-poppler-0.69.patch)
+        calligra-qt5.11.patch
+        calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"
+        calligra-poppler-0.71.patch::"https://cgit.kde.org/calligra.git/patch/?id=ab9cb332")
 sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870'
             'SKIP'
             '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a'
-            '7a29c220b3871569cb16390261951481341b7e5923ed5c95aa4188286b2ba56d')
+            '7a29c220b3871569cb16390261951481341b7e5923ed5c95aa4188286b2ba56d'
+            'ab13e12778cb7a4e30f1953fdaf964e2d2e7a135832cda2553838ff8690b4004')
 validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
               42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
 
@@ -52,6 +55,8 @@
   patch -p1 -i ../calligra-qt5.11.patch
 # Fix build with poppler 0.69
   patch -p1 -i ../calligra-poppler-0.69.patch
+# Fix build with poppler 0.71
+  patch -p1 -i ../calligra-poppler-0.71.patch
 }
 
 build() {

Deleted: calligra-poppler-0.69.patch
===================================================================
--- calligra-poppler-0.69.patch	2018-11-01 12:05:39 UTC (rev 337678)
+++ calligra-poppler-0.69.patch	2018-11-01 12:08:54 UTC (rev 337679)
@@ -1,67 +0,0 @@
-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();
-