From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 20 Jul 2018 13:27:52 +0000 (+0200)
Subject: net-print/cups-filters: Fixed build with =app-text/poppler-0.67.0
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=87416be42b779943a5915da5ca76f8df7cc95b3c;p=gentoo.git

net-print/cups-filters: Fixed build with =app-text/poppler-0.67.0

Package-Manager: Portage-2.3.43, Repoman-2.3.10
---

diff --git a/net-print/cups-filters/cups-filters-1.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild
index be4ec7dfe0fa..4774200f0269 100644
--- a/net-print/cups-filters/cups-filters-1.20.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.20.4.ebuild
@@ -49,6 +49,10 @@ DEPEND="${RDEPEND}
 	test? ( media-fonts/dejavu )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.20.4-poppler-0.67.0.patch"
+)
+
 src_prepare() {
 	default
 	[[ "${PV}" == "9999" ]] && eautoreconf
diff --git a/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch
new file mode 100644
index 000000000000..69376e1c84d2
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch
@@ -0,0 +1,28 @@
+From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 20 Jul 2018 15:20:11 +0200
+Subject: [PATCH] GooString needs to be const since >=poppler-0.64.0
+
+This only fails with >=poppler-0.67.0 but the change to const was done
+in 0.64.0
+---
+ filter/pdf.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/filter/pdf.cxx b/filter/pdf.cxx
+index 206ccf88..665eab09 100644
+--- a/filter/pdf.cxx
++++ b/filter/pdf.cxx
+@@ -734,6 +734,9 @@ extern "C" int pdf_fill_form(pdf_t *doc, opt_t *opt)
+         }
+ 
+         FormField *ff = fm_text->getField();
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 64
++        const
++#endif
+         GooString *field_name;
+         field_name = ff->getFullyQualifiedName();
+         if ( ! field_name )
+-- 
+2.18.0
+