Date: Thursday, September 5, 2019 @ 08:23:18 Author: andyrtr Revision: 361633
archrelease: copy trunk to extra-x86_64 Added: cups-filters/repos/extra-x86_64/PKGBUILD (from rev 361632, cups-filters/trunk/PKGBUILD) cups-filters/repos/extra-x86_64/qpdf-9.0.0-buildfix.diff (from rev 361632, cups-filters/trunk/qpdf-9.0.0-buildfix.diff) Deleted: cups-filters/repos/extra-x86_64/PKGBUILD --------------------------+ PKGBUILD | 118 ++++++++++++++++++++++++--------------------- qpdf-9.0.0-buildfix.diff | 12 ++++ 2 files changed, 75 insertions(+), 55 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-09-05 08:23:13 UTC (rev 361632) +++ PKGBUILD 2019-09-05 08:23:18 UTC (rev 361633) @@ -1,55 +0,0 @@ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgname=cups-filters -pkgver=1.25.4 -pkgrel=1 -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) -sha256sums=('cc6bffcbbc0bf827d796f206f070abf7105275c1cb07a2e19a95820e18ba8153') - -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/extra-x86_64/PKGBUILD (from rev 361632, cups-filters/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-09-05 08:23:18 UTC (rev 361633) @@ -0,0 +1,63 @@ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgname=cups-filters +pkgver=1.25.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 + qpdf-9.0.0-buildfix.diff) +sha256sums=('cc6bffcbbc0bf827d796f206f070abf7105275c1cb07a2e19a95820e18ba8153' + 'd9fe460d971ad2dc868d0633d9e7dd1ea9c0df66c050bf1dcd8c8f43ea9198d6') + +prepare() { + cd $pkgname-$pkgver + # fix build with qpdf 9.x + patch -Np1 -i ../qpdf-9.0.0-buildfix.diff +} + +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/extra-x86_64/qpdf-9.0.0-buildfix.diff (from rev 361632, cups-filters/trunk/qpdf-9.0.0-buildfix.diff) =================================================================== --- qpdf-9.0.0-buildfix.diff (rev 0) +++ qpdf-9.0.0-buildfix.diff 2019-09-05 08:23:18 UTC (rev 361633) @@ -0,0 +1,12 @@ +diff --git a/filter/pdf.cxx b/filter/pdf.cxx +index 5b212ca9..f12607f8 100644 +--- a/filter/pdf.cxx ++++ b/filter/pdf.cxx +@@ -20,6 +20,7 @@ + #include "pdf.h" + #include <vector> + #include <string> ++#include <cstring> + #include <qpdf/QPDF.hh> + #include <qpdf/QPDFObjectHandle.hh> + #include <qpdf/QPDFWriter.hh>