From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 97D6D138334 for ; Sat, 16 Nov 2019 13:25:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0778E07FA; Sat, 16 Nov 2019 13:25:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7843E07FA for ; Sat, 16 Nov 2019 13:25:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4250034CEB5 for ; Sat, 16 Nov 2019 13:25:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BD0E71A for ; Sat, 16 Nov 2019 13:25:50 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1573910743.3e20f1daf5328ec3f6e512e927c892c247394020.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/, media-gfx/inkscape/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch media-gfx/inkscape/inkscape-0.92.4.ebuild X-VCS-Directories: media-gfx/inkscape/ media-gfx/inkscape/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 3e20f1daf5328ec3f6e512e927c892c247394020 X-VCS-Branch: master Date: Sat, 16 Nov 2019 13:25:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6819ba16-a2ce-483a-94d6-baebdfa4aa28 X-Archives-Hash: 02dc626dc886807b5e41e381f21282e1 commit: 3e20f1daf5328ec3f6e512e927c892c247394020 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Nov 16 13:25:31 2019 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Nov 16 13:25:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e20f1da media-gfx/inkscape: Fix build with poppler-0.82 Closes: https://bugs.gentoo.org/677058 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas K. Hüttel gentoo.org> .../files/inkscape-0.92.4-poppler-0.82.0.patch | 76 ++++++++++++++++++++++ media-gfx/inkscape/inkscape-0.92.4.ebuild | 1 + 2 files changed, 77 insertions(+) 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 new file mode 100644 index 00000000000..73cc4f97c37 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.82.0.patch @@ -0,0 +1,76 @@ +From 9b2f1a99bd8a411926925ac0c91f50289c7db8ee Mon Sep 17 00:00:00 2001 +From: Thomas Holder +Date: Sat, 16 Nov 2019 14:12:24 +0100 +Subject: [PATCH] fix poppler 0.82.0 build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport of 324c7903d9fd62e74c042c31477299be3b980fd2 from master by +Andreas K. Hüttel +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 2 +- + src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++ + src/extension/internal/pdfinput/svg-builder.cpp | 2 +- + src/extension/internal/pdfinput/svg-builder.h | 2 +- + 4 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index ddbff7671f..e71bb79381 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) { + int wMode; + double riseX, riseY; + CharCode code; +- Unicode *u = NULL; ++ Unicode _POPPLER_CONST_82 *u = NULL; + double x, y, dx, dy, tdx, tdy; + double originX, originY, tOriginX, tOriginY; + double oldCTM[6], newCTM[6]; +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 21a60702fa..93c0f99ba1 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -3,6 +3,12 @@ + + #include + ++#if POPPLER_CHECK_VERSION(0, 82, 0) ++#define _POPPLER_CONST_82 const ++#else ++#define _POPPLER_CONST_82 ++#endif ++ + #if POPPLER_CHECK_VERSION(0, 76, 0) + #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) + #else +diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +index 1cefb92abd..ea2940ffe1 100644 +--- a/src/extension/internal/pdfinput/svg-builder.cpp ++++ b/src/extension/internal/pdfinput/svg-builder.cpp +@@ -1379,7 +1379,7 @@ void SvgBuilder::beginString(GfxState *state) { + void SvgBuilder::addChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) { ++ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) { + + + bool is_space = ( uLen == 1 && u[0] == 32 ); +diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h +index 34b42e17b8..78e302081f 100644 +--- a/src/extension/internal/pdfinput/svg-builder.h ++++ b/src/extension/internal/pdfinput/svg-builder.h +@@ -141,7 +141,7 @@ public: + void addChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode code, int nBytes, Unicode *u, int uLen); ++ CharCode code, int nBytes, Unicode const *u, int uLen); + void beginTextObject(GfxState *state); + void endTextObject(GfxState *state); + +-- +2.24.0 + diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild index c38fe42d1a6..87203911632 100644 --- a/media-gfx/inkscape/inkscape-0.92.4.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild @@ -98,6 +98,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" "${FILESDIR}/${PN}-0.48.4-epython.patch" "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 + "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" ) S="${WORKDIR}/${MY_P}"