From 033c618b140895a8beef8837f3bd4303ed32538d Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Wed, 8 Aug 2018 23:31:38 -0500
Subject: cups-filters-1.20.4-2.parabola1: icu 62.1 / poppler 0.67.0 rebuild

---
 libre/cups-filters/PKGBUILD                  | 17 ++++++++++++-----
 libre/cups-filters/goostring-constness.patch | 25 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 libre/cups-filters/goostring-constness.patch

diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD
index c9916666a..7d410b1d1 100644
--- a/libre/cups-filters/PKGBUILD
+++ b/libre/cups-filters/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=cups-filters
 pkgver=1.20.4
-pkgrel=1
-pkgrel+=.parabola2
+pkgrel=2
+pkgrel+=.parabola1
 pkgdesc="OpenPrinting CUPS Filters"
 pkgdesc+=", without foomatic-db-nonfree recommendation"
 arch=('x86_64')
@@ -13,15 +13,22 @@ arch+=('i686' 'armv7h')
 url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 license=('custom')
 depends=('lcms2' 'poppler' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups>=2.2.6-2' 'udev')
-depends+=('poppler=0.64.0')
+depends+=('poppler=0.67.0')
 makedepends=('ghostscript' 'ttf-dejavu' 'python' 'mupdf-tools') # ttf-dejavu for make check
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'antiword: needed to convert MS Word documents (requires also docx2txt)')
 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
diff --git a/libre/cups-filters/goostring-constness.patch b/libre/cups-filters/goostring-constness.patch
new file mode 100644
index 000000000..ba0c365d7
--- /dev/null
+++ b/libre/cups-filters/goostring-constness.patch
@@ -0,0 +1,25 @@
+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 )
-- 
cgit v1.2.3