commit 878f9178ca2c865734224e699f22c27e04ca8f38 Author: Juergen Daubert <jue@jue.li> Date: Fri Jul 20 16:45:55 2018 +0200 cups-filters: fix build with poppler 0.67.0 diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 9b59ebe91..5bee4b140 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,3 @@ 7540a6989be0042429f41770b1cdf215 cups-browsed 173045bbc4bca59230543f225b8fa16c cups-filters-1.20.4.tar.xz +5b3af5450c2afbf62782c183ba8e504f poppler-0.67.0.patch diff --git a/cups-filters/.signature b/cups-filters/.signature index 8a48cea34..81c8f5096 100644 --- a/cups-filters/.signature +++ b/cups-filters/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SHu8LpeBLctFEWlb/Z6K3RhtA6vdkNQVUidEfp9LE6xpUCowtSLa0+OMc77LMmWAwi6tUfrvP3id8yYzHEJ8A0= -SHA256 (Pkgfile) = 5515a1d302689f572ce89e7f1078a8f8a5207a6b5ee3b094562a79bde708eac3 +RWSE3ohX2g5d/TooB11Lhl8RzjBUD8smYaHxdObxyufEHsh8RI+sV+pd/ngJEfWb5C/DgEm1+qIUjRf1Rs3vBCSbtvy/qlxpGg0= +SHA256 (Pkgfile) = 927a648cba01542fea1b37dac5a2c70ba0b6a66f28e6cf8c48778a7a0530686d SHA256 (.footprint) = 32c7827b0a711a571ef4e2b7eb7812ed42a3b8f8e590cdbe949fa60a5b3978d5 SHA256 (cups-filters-1.20.4.tar.xz) = 33756e9fa8562cde050ecbec13f4c84b1c61c4f79a525e02382787c528ab536a +SHA256 (poppler-0.67.0.patch) = 12e342e64d5654b3ab124ace762ed776f924af0bc8bbae223ea01285cd1fa044 SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index e8cbd6eb2..01e0172ab 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -5,13 +5,15 @@ name=cups-filters version=1.20.4 -release=1 +release=2 source=(https://www.openprinting.org/download/$name/$name-$version.tar.xz - cups-browsed) + poppler-0.67.0.patch cups-browsed) build () { cd $name-$version + patch -p1 -i $SRC/poppler-0.67.0.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --without-php \ @@ -21,7 +23,7 @@ build () { --without-rcdir \ --with-browseremoteprotocols=cups - make + make -j1 make DESTDIR=$PKG install install -D -m 0755 $SRC/cups-browsed $PKG/etc/rc.d/cups-browsed diff --git a/cups-filters/poppler-0.67.0.patch b/cups-filters/poppler-0.67.0.patch new file mode 100644 index 000000000..ba0c365d7 --- /dev/null +++ b/cups-filters/poppler-0.67.0.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 )