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 0BCF8138330 for ; Fri, 25 May 2018 09:35:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6163BE0809; Fri, 25 May 2018 09:35:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 3A0DBE0809 for ; Fri, 25 May 2018 09:35:34 +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 19140335C78 for ; Fri, 25 May 2018 09:35:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 354072A3 for ; Fri, 25 May 2018 09:35:29 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1527240920.71d24a3fbd8beda6755d42591454ba29221f29f0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch media-gfx/inkscape/inkscape-0.92.3.ebuild X-VCS-Directories: media-gfx/inkscape/files/ media-gfx/inkscape/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 71d24a3fbd8beda6755d42591454ba29221f29f0 X-VCS-Branch: master Date: Fri, 25 May 2018 09:35:29 +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-Archives-Salt: b6114dba-792f-47c0-8888-fc36beeb911c X-Archives-Hash: b1d8965437c54cf313053f7f464d055b commit: 71d24a3fbd8beda6755d42591454ba29221f29f0 Author: Lars Wendler gentoo org> AuthorDate: Fri May 25 09:33:55 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri May 25 09:35:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d24a3f media-gfx/inkscape: Fixed build against ~app-text/poppler-0.65.0 Bug: https://bugs.gentoo.org/656266 Package-Manager: Portage-2.3.39, Repoman-2.3.9 .../files/inkscape-0.92.3-poppler-0.65.patch | 29 ++++++++++++++++++++++ media-gfx/inkscape/inkscape-0.92.3.ebuild | 1 + 2 files changed, 30 insertions(+) diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch new file mode 100644 index 00000000000..86d9e48396d --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch @@ -0,0 +1,29 @@ +From 332a80f4847715546be9a00756f693b4aa1316e2 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Fri, 25 May 2018 00:30:17 +0200 +Subject: [PATCH] Fix compilation with poppler 0.65.0 + +replace unused includes with one that is actually used + +Signed-off-by: Jan Palus +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 6c498f9..caaeca1 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -37,8 +37,7 @@ extern "C" { + #include "util/units.h" + + #include "goo/gmem.h" +-#include "goo/GooTimer.h" +-#include "goo/GooHash.h" ++#include "goo/GooString.h" + #include "GlobalParams.h" + #include "CharTypes.h" + #include "Object.h" +-- +2.17.0 + diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild index 97020416d36..89ad5363774 100644 --- a/media-gfx/inkscape/inkscape-0.92.3.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild @@ -101,6 +101,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.48.4-epython.patch" "${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch" "${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch" + "${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch" ) S="${WORKDIR}/${MY_P}"