| 1 |
commit: 3e20f1daf5328ec3f6e512e927c892c247394020 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 16 13:25:31 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 16 13:25:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e20f1da |
| 7 |
|
| 8 |
media-gfx/inkscape: Fix build with poppler-0.82 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/677058 |
| 11 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 12 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/inkscape-0.92.4-poppler-0.82.0.patch | 76 ++++++++++++++++++++++ |
| 15 |
media-gfx/inkscape/inkscape-0.92.4.ebuild | 1 + |
| 16 |
2 files changed, 77 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..73cc4f97c37 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch |
| 23 |
@@ -0,0 +1,76 @@ |
| 24 |
+From 9b2f1a99bd8a411926925ac0c91f50289c7db8ee Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Thomas Holder <thomas@×××××××××××××.de> |
| 26 |
+Date: Sat, 16 Nov 2019 14:12:24 +0100 |
| 27 |
+Subject: [PATCH] fix poppler 0.82.0 build |
| 28 |
+MIME-Version: 1.0 |
| 29 |
+Content-Type: text/plain; charset=UTF-8 |
| 30 |
+Content-Transfer-Encoding: 8bit |
| 31 |
+ |
| 32 |
+Backport of 324c7903d9fd62e74c042c31477299be3b980fd2 from master by |
| 33 |
+Andreas K. Hüttel <dilfridge@g.o> |
| 34 |
+--- |
| 35 |
+ src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- |
| 36 |
+ src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++ |
| 37 |
+ src/extension/internal/pdfinput/svg-builder.cpp | 2 +- |
| 38 |
+ src/extension/internal/pdfinput/svg-builder.h | 2 +- |
| 39 |
+ 4 files changed, 9 insertions(+), 3 deletions(-) |
| 40 |
+ |
| 41 |
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp |
| 42 |
+index ddbff7671f..e71bb79381 100644 |
| 43 |
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp |
| 44 |
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp |
| 45 |
+@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) { |
| 46 |
+ int wMode; |
| 47 |
+ double riseX, riseY; |
| 48 |
+ CharCode code; |
| 49 |
+- Unicode *u = NULL; |
| 50 |
++ Unicode _POPPLER_CONST_82 *u = NULL; |
| 51 |
+ double x, y, dx, dy, tdx, tdy; |
| 52 |
+ double originX, originY, tOriginX, tOriginY; |
| 53 |
+ double oldCTM[6], newCTM[6]; |
| 54 |
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h |
| 55 |
+index 21a60702fa..93c0f99ba1 100644 |
| 56 |
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h |
| 57 |
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h |
| 58 |
+@@ -3,6 +3,12 @@ |
| 59 |
+ |
| 60 |
+ #include <glib/poppler-features.h> |
| 61 |
+ |
| 62 |
++#if POPPLER_CHECK_VERSION(0, 82, 0) |
| 63 |
++#define _POPPLER_CONST_82 const |
| 64 |
++#else |
| 65 |
++#define _POPPLER_CONST_82 |
| 66 |
++#endif |
| 67 |
++ |
| 68 |
+ #if POPPLER_CHECK_VERSION(0, 76, 0) |
| 69 |
+ #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) |
| 70 |
+ #else |
| 71 |
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp |
| 72 |
+index 1cefb92abd..ea2940ffe1 100644 |
| 73 |
+--- a/src/extension/internal/pdfinput/svg-builder.cpp |
| 74 |
++++ b/src/extension/internal/pdfinput/svg-builder.cpp |
| 75 |
+@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) { |
| 76 |
+ void SvgBuilder::addChar(GfxState *state, double x, double y, |
| 77 |
+ double dx, double dy, |
| 78 |
+ double originX, double originY, |
| 79 |
+- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) { |
| 80 |
++ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) { |
| 81 |
+ |
| 82 |
+ |
| 83 |
+ bool is_space = ( uLen == 1 && u[0] == 32 ); |
| 84 |
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h |
| 85 |
+index 34b42e17b8..78e302081f 100644 |
| 86 |
+--- a/src/extension/internal/pdfinput/svg-builder.h |
| 87 |
++++ b/src/extension/internal/pdfinput/svg-builder.h |
| 88 |
+@@ -141,7 +141,7 @@ public: |
| 89 |
+ void addChar(GfxState *state, double x, double y, |
| 90 |
+ double dx, double dy, |
| 91 |
+ double originX, double originY, |
| 92 |
+- CharCode code, int nBytes, Unicode *u, int uLen); |
| 93 |
++ CharCode code, int nBytes, Unicode const *u, int uLen); |
| 94 |
+ void beginTextObject(GfxState *state); |
| 95 |
+ void endTextObject(GfxState *state); |
| 96 |
+ |
| 97 |
+-- |
| 98 |
+2.24.0 |
| 99 |
+ |
| 100 |
|
| 101 |
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild |
| 102 |
index c38fe42d1a6..87203911632 100644 |
| 103 |
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild |
| 104 |
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild |
| 105 |
@@ -98,6 +98,7 @@ PATCHES=( |
| 106 |
"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" |
| 107 |
"${FILESDIR}/${PN}-0.48.4-epython.patch" |
| 108 |
"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 |
| 109 |
+ "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" |
| 110 |
) |
| 111 |
|
| 112 |
S="${WORKDIR}/${MY_P}" |
Archives