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

[Evangelos Foutras]

    Date: Tuesday, November 12, 2019 @ 13:09:57
  Author: foutrelis
Revision: 367882

Use minimal patch for poppler 0.82

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

-----------------------------+
 PKGBUILD                    |    2 +-
 calligra-poppler-0.82.patch |   31 ++++---------------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-12 12:54:17 UTC (rev 367881)
+++ PKGBUILD	2019-11-12 13:09:57 UTC (rev 367882)
@@ -51,7 +51,7 @@
             '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87'
             '87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece'
             'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8'
-            '3d59c6dec806113b9659cdd7f64230d87d081366a8a53ed9edd3a1afc13dd940')
+            'a2f02dccd8f7748b187dba805220ded95c41bbddc084091794691164184d1b82')
 validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
               42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
 

Modified: calligra-poppler-0.82.patch
===================================================================
--- calligra-poppler-0.82.patch	2019-11-12 12:54:17 UTC (rev 367881)
+++ calligra-poppler-0.82.patch	2019-11-12 13:09:57 UTC (rev 367882)
@@ -1,10 +1,7 @@
-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)
+diff -upr calligra-3.1.0.orig/filters/karbon/pdf/SvgOutputDev.cpp calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp
+--- calligra-3.1.0.orig/filters/karbon/pdf/SvgOutputDev.cpp	2019-11-12 14:55:33.418358543 +0200
++++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp	2019-11-12 14:59:26.843199351 +0200
+@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState *
      const char * p = s->c_str();
      int len = s->getLength();
      CharCode code;
@@ -13,23 +10,3 @@
      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);