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 <[email protected]>
johu · Jan 17, 2019 · d4bee1e · d4bee1e
1 parent e9e00e8
commit d4bee1e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git 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
@@ -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,