From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 17 Jan 2019 00:32:38 +0000 (+0100)
Subject: app-text/apvlv: Fix build with poppler-0.73
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d4bee1eec830bf722c8a566c554c2896a76d9f52;p=gentoo.git

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 <asturm@gentoo.org>
---

diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
index 930aba29f219..bdcb3de1f18e 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 000000000000..c3001d4b6196
--- /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 <goo/gtypes.h>
+ 
+ static void
+ copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,