From 6bb9f70659da1393a5d2e880e41f24702ece5b60 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 23 Aug 2018 14:24:07 -0300 Subject: [PATCH] cups-filters: update to 1.21.0. --- .../patches/fix-poppler-0.67.patch | 26 ------------------- srcpkgs/cups-filters/template | 10 +++---- 2 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/cups-filters/patches/fix-poppler-0.67.patch diff --git a/srcpkgs/cups-filters/patches/fix-poppler-0.67.patch b/srcpkgs/cups-filters/patches/fix-poppler-0.67.patch deleted file mode 100644 index d08123f06c..0000000000 --- a/srcpkgs/cups-filters/patches/fix-poppler-0.67.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -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 ---- filter/pdf.cxx -+++ 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 ) - diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index 3882c1cdc9..14f0ea64c4 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -1,13 +1,13 @@ # Template file for 'cups-filters' pkgname=cups-filters -version=1.20.4 -revision=2 +version=1.21.0 +revision=1 build_style=gnu-configure configure_args="--disable-static --with-rcdir=no --enable-avahi --with-browseremoteprotocols=DNSSD,CUPS" -hostmakedepends="ghostscript glib-devel mupdf-tools poppler-utils pkg-config" +hostmakedepends="ghostscript glib-devel mupdf-tools pkg-config poppler-utils" makedepends="avahi-glib-libs-devel cups-devel fontconfig-devel - ghostscript-devel lcms2-devel libqpdf-devel poppler-cpp-devel" + ghostscript-devel lcms2-devel libqpdf-devel libqpdf-devel poppler-cpp-devel" depends="bc ghostscript libcups-filters-${version}_${revision} poppler-utils" checkdepends="dejavu-fonts-ttf" conf_files="/etc/cups/cups-browsed.conf" @@ -16,7 +16,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT" homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters" distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz" -checksum=33756e9fa8562cde050ecbec13f4c84b1c61c4f79a525e02382787c528ab536a +checksum=d1e975eaece2884ffa726f8d57dc249bd220e09cc5bd48ef7a0892987a07493b lib32disabled=yes