[arch-commits] Commit in cups-filters/trunk (PKGBUILD goostring-constness.patch)

[Evangelos Foutras]

    Date: Monday, August 6, 2018 @ 16:49:30
  Author: foutrelis
Revision: 331015

Fix build with poppler 0.67.0

Added:
  cups-filters/trunk/goostring-constness.patch
Modified:
  cups-filters/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   11 +++++++++--
 goostring-constness.patch |   25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-06 16:37:32 UTC (rev 331014)
+++ PKGBUILD	2018-08-06 16:49:30 UTC (rev 331015)
@@ -16,9 +16,16 @@
 	    'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'antiword: needed to convert MS Word documents (requires also docx2txt (AUR)')
 backup=(etc/cups/cups-browsed.conf)
-source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)
-sha256sums=('33756e9fa8562cde050ecbec13f4c84b1c61c4f79a525e02382787c528ab536a')
+source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz
+        goostring-constness.patch)
+sha256sums=('33756e9fa8562cde050ecbec13f4c84b1c61c4f79a525e02382787c528ab536a'
+            '12e342e64d5654b3ab124ace762ed776f924af0bc8bbae223ea01285cd1fa044')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../goostring-constness.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr  \

Added: goostring-constness.patch
===================================================================
--- goostring-constness.patch	                        (rev 0)
+++ goostring-constness.patch	2018-08-06 16:49:30 UTC (rev 331015)
@@ -0,0 +1,25 @@
+From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c at 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 )