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 25B4F138334 for ; Thu, 17 Jan 2019 00:36:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13254E0ACF; Thu, 17 Jan 2019 00:36:23 +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 E2CB1E0ACF for ; Thu, 17 Jan 2019 00:36:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 97488335D03 for ; Thu, 17 Jan 2019 00:36:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2991D517 for ; Thu, 17 Jan 2019 00:36:20 +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: <1547685364.d4bee1eec830bf722c8a566c554c2896a76d9f52.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/apvlv/files/, app-text/apvlv/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/apvlv/apvlv-0.1.5-r2.ebuild app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch X-VCS-Directories: app-text/apvlv/ app-text/apvlv/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d4bee1eec830bf722c8a566c554c2896a76d9f52 X-VCS-Branch: master Date: Thu, 17 Jan 2019 00:36:20 +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: 0d9290ec-20ef-48b8-b8ef-794063700464 X-Archives-Hash: a6db9b9b1b6252131441a72a025e5345 commit: d4bee1eec830bf722c8a566c554c2896a76d9f52 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 17 00:32:38 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 17 00:36:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bee1ee app-text/apvlv: Fix build with poppler-0.73 Closes: https://bugs.gentoo.org/675658 Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/apvlv/apvlv-0.1.5-r2.ebuild | 9 +++++---- app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch | 10 ++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild index 930aba29f21..bdcb3de1f18 100644 --- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild +++ b/app-text/apvlv/apvlv-0.1.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,9 +26,10 @@ DEPEND="${RDEPEND} PATCHES=( # preserve cflags - "${FILESDIR}/${PN}-0.1.5-cflags.patch" - "${FILESDIR}/${PN}-0.1.5-gcc6.patch" - "${FILESDIR}/${PN}-0.1.5-gcc7.patch" + "${FILESDIR}/${P}-cflags.patch" + "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}/${P}-gcc7.patch" + "${FILESDIR}/${P}-poppler-0.73.patch" ) src_configure() { diff --git a/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch b/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch new file mode 100644 index 00000000000..c3001d4b619 --- /dev/null +++ b/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch @@ -0,0 +1,10 @@ +--- a/src/ApvlvPdf.cc 2015-01-10 15:04:24.000000000 +0100 ++++ b/src/ApvlvPdf.cc 2019-01-17 01:29:54.479256848 +0100 +@@ -29,7 +29,6 @@ + #include "ApvlvPdf.h" + + #ifndef POPPLER_WITH_GDK +-#include + + static void + copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,