[arch-commits] Commit in cups-filters/repos (3 files)

[Evangelos Foutras]

    Date: Monday, August 6, 2018 @ 16:50:14
  Author: foutrelis
Revision: 331017

archrelease: copy trunk to staging-x86_64

Added:
  cups-filters/repos/staging-x86_64/
  cups-filters/repos/staging-x86_64/PKGBUILD
    (from rev 331016, cups-filters/trunk/PKGBUILD)
  cups-filters/repos/staging-x86_64/goostring-constness.patch
    (from rev 331016, cups-filters/trunk/goostring-constness.patch)

---------------------------+
 PKGBUILD                  |   63 ++++++++++++++++++++++++++++++++++++++++++++
 goostring-constness.patch |   25 +++++++++++++++++
 2 files changed, 88 insertions(+)

Copied: cups-filters/repos/staging-x86_64/PKGBUILD (from rev 331016, cups-filters/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-08-06 16:50:14 UTC (rev 331017)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=cups-filters
+pkgver=1.20.4
+pkgrel=2
+pkgdesc="OpenPrinting CUPS Filters"
+arch=('x86_64')
+url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+license=('custom')
+depends=('lcms2' 'poppler' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups>=2.2.6-2' 'systemd')
+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'
+	    '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
+        goostring-constness.patch)
+sha256sums=('33756e9fa8562cde050ecbec13f4c84b1c61c4f79a525e02382787c528ab536a'
+            '12e342e64d5654b3ab124ace762ed776f924af0bc8bbae223ea01285cd1fa044')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../goostring-constness.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr  \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --with-rcdir=no \
+    --enable-avahi \
+    --with-browseremoteprotocols=DNSSD,CUPS \
+    --enable-auto-setup-driverless \
+    --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir/" install
+  
+  # add upstream systemd support file
+  install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  sed -i "s|cups.service|org.cups.cupsd.service|g" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  
+  # use cups group from cups pkg FS#56818
+  chgrp -R 209 ${pkgdir}/etc/cups
+
+  # license
+  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m644 "${srcdir}"/${pkgname}-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+}

Copied: cups-filters/repos/staging-x86_64/goostring-constness.patch (from rev 331016, cups-filters/trunk/goostring-constness.patch)
===================================================================
--- staging-x86_64/goostring-constness.patch	                        (rev 0)
+++ staging-x86_64/goostring-constness.patch	2018-08-06 16:50:14 UTC (rev 331017)
@@ -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 )