[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/

[Andreas Sturmlechner]

commit:     11e22c282ae1fc952dfcdfa407a40c55ab0e3cd0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 20:07:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  2 15:22:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e22c28

app-office/calligra: Fix build with poppler-0.82.0

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-3.1.0-r4.ebuild       |  4 +++
 .../files/calligra-3.1.0-poppler-0.82.patch        | 35 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild 
b/app-office/calligra/calligra-3.1.0-r4.ebuild
index 37e03558459..411c8177f1c 100644
--- a/app-office/calligra/calligra-3.1.0-r4.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r4.ebuild
@@ -135,6 +135,10 @@ pkg_setup() {
 src_prepare() {
        kde5_src_prepare
 
+       if has_version ">=app-text/poppler-0.82"; then
+               eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make 
upstreamable patch
+       fi
+
        if ! use test; then
                sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
                        -i libs/pigment/CMakeLists.txt || die

diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch 
b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
new file mode 100644
index 00000000000..4cb9d1872eb
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch
@@ -0,0 +1,35 @@
+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)
+     const char * p = s->c_str();
+     int len = s->getLength();
+     CharCode code;
+-    Unicode *u = nullptr;
++    const Unicode *u = nullptr;
+     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:
+     // images
+     void drawImage(GfxState *state, Object *ref, Stream *str,
+                            int width, int height, GfxImageColorMap *colorMap,
+-                           bool interpolate, int *maskColors, bool inlineImg) 
override;
++                           bool interpolate, const int *maskColors, bool 
inlineImg) override;
+ 
+     // styles
+     virtual void updateAll(GfxState *state);