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 48749138334 for ; Sat, 2 Nov 2019 15:23:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A702E089F; Sat, 2 Nov 2019 15:23:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 35DC3E089E for ; Sat, 2 Nov 2019 15:23:17 +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 0F80F34C703 for ; Sat, 2 Nov 2019 15:23:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F01388C for ; Sat, 2 Nov 2019 15:23:12 +0000 (UTC) From: "Andreas Sturmlechner" 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 Sturmlechner" Message-ID: <1572708149.11e22c282ae1fc952dfcdfa407a40c55ab0e3cd0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/calligra/calligra-3.1.0-r4.ebuild app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch X-VCS-Directories: app-office/calligra/ app-office/calligra/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 11e22c282ae1fc952dfcdfa407a40c55ab0e3cd0 X-VCS-Branch: master Date: Sat, 2 Nov 2019 15:23:12 +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: 6d4fb7fe-3c1d-4b2f-860d-db235fefdb62 X-Archives-Hash: 1f54b1d7c311632185df99ab9ac7dff7 commit: 11e22c282ae1fc952dfcdfa407a40c55ab0e3cd0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 1 20:07:56 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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);