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 3E53B138334 for ; Wed, 16 Jan 2019 16:30:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10AFDE0B35; Wed, 16 Jan 2019 16:30:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 CE008E0B35 for ; Wed, 16 Jan 2019 16:30:25 +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 99039335D19 for ; Wed, 16 Jan 2019 16:30:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C569B266 for ; Wed, 16 Jan 2019 16:30:21 +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: <1547655659.9699b1c310d94b9a4c76336a5f0a4aebe2589e91.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/calligra/calligra-3.1.0-r3.ebuild app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch X-VCS-Directories: app-office/calligra/ app-office/calligra/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9699b1c310d94b9a4c76336a5f0a4aebe2589e91 X-VCS-Branch: master Date: Wed, 16 Jan 2019 16:30:21 +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: 6da4aa4c-0211-4a3a-b33f-da99576b76bb X-Archives-Hash: 273c124d4f58efaf785eb888e5872a74 commit: 9699b1c310d94b9a4c76336a5f0a4aebe2589e91 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 16 16:20:59 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 16 16:20:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9699b1c3 app-office/calligra: Fix build with poppler-0.73 Closes: https://bugs.gentoo.org/675454 Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.1.0-r3.ebuild | 1 + .../files/calligra-3.1.0-poppler-0.73.patch | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild index 329a851fea6..24ca06bcb3a 100644 --- a/app-office/calligra/calligra-3.1.0-r3.ebuild +++ b/app-office/calligra/calligra-3.1.0-r3.ebuild @@ -121,6 +121,7 @@ PATCHES=( "${FILESDIR}"/${P}-poppler-0.69.patch "${FILESDIR}"/${P}-poppler-0.71.patch "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable + "${FILESDIR}"/${P}-poppler-0.73.patch "${FILESDIR}"/${P}-no-webkit.patch ) diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch new file mode 100644 index 00000000000..727f6edf3f1 --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch @@ -0,0 +1,35 @@ +From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Tue, 15 Jan 2019 22:24:08 +0100 +Subject: Guchar -> unsigned char + +It was just a typdef and it's now gone +--- + filters/karbon/pdf/SvgOutputDev.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 80f01a5..1a5aa30b 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + if (maskColors) { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +- Guchar * pix = imgStr->getLine(); ++ unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + + for (int x = 0; x < width; x++) { +@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + } else { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +- Guchar * pix = imgStr->getLine(); ++ unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + } + +-- +cgit v1.1 +