Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/apvlv/files/, app-text/apvlv/
Date: Thu, 17 Jan 2019 00:36:24
Message-Id: 1547685364.d4bee1eec830bf722c8a566c554c2896a76d9f52.asturm@gentoo
1 commit: d4bee1eec830bf722c8a566c554c2896a76d9f52
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 17 00:32:38 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 17 00:36:04 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bee1ee
7
8 app-text/apvlv: Fix build with poppler-0.73
9
10 Closes: https://bugs.gentoo.org/675658
11 Package-Manager: Portage-2.3.56, Repoman-2.3.12
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 app-text/apvlv/apvlv-0.1.5-r2.ebuild | 9 +++++----
15 app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch | 10 ++++++++++
16 2 files changed, 15 insertions(+), 4 deletions(-)
17
18 diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
19 index 930aba29f21..bdcb3de1f18 100644
20 --- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
21 +++ b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 +# Copyright 1999-2019 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28 @@ -26,9 +26,10 @@ DEPEND="${RDEPEND}
29
30 PATCHES=(
31 # preserve cflags
32 - "${FILESDIR}/${PN}-0.1.5-cflags.patch"
33 - "${FILESDIR}/${PN}-0.1.5-gcc6.patch"
34 - "${FILESDIR}/${PN}-0.1.5-gcc7.patch"
35 + "${FILESDIR}/${P}-cflags.patch"
36 + "${FILESDIR}/${P}-gcc6.patch"
37 + "${FILESDIR}/${P}-gcc7.patch"
38 + "${FILESDIR}/${P}-poppler-0.73.patch"
39 )
40
41 src_configure() {
42
43 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
44 new file mode 100644
45 index 00000000000..c3001d4b619
46 --- /dev/null
47 +++ b/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch
48 @@ -0,0 +1,10 @@
49 +--- a/src/ApvlvPdf.cc 2015-01-10 15:04:24.000000000 +0100
50 ++++ b/src/ApvlvPdf.cc 2019-01-17 01:29:54.479256848 +0100
51 +@@ -29,7 +29,6 @@
52 + #include "ApvlvPdf.h"
53 +
54 + #ifndef POPPLER_WITH_GDK
55 +-#include <goo/gtypes.h>
56 +
57 + static void
58 + copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,