Date: Saturday, March 9, 2013 @ 10:03:22 Author: andyrtr Revision: 179658
archrelease: copy trunk to extra-i686, extra-x86_64 Added: cups-filters/repos/extra-i686/PKGBUILD (from rev 179657, cups-filters/trunk/PKGBUILD) cups-filters/repos/extra-i686/cups-browsed.service (from rev 179657, cups-filters/trunk/cups-browsed.service) cups-filters/repos/extra-x86_64/PKGBUILD (from rev 179657, cups-filters/trunk/PKGBUILD) cups-filters/repos/extra-x86_64/cups-browsed.service (from rev 179657, cups-filters/trunk/cups-browsed.service) Deleted: cups-filters/repos/extra-i686/PKGBUILD cups-filters/repos/extra-i686/cups-browsed.service cups-filters/repos/extra-i686/poppler_buildfix.diff cups-filters/repos/extra-x86_64/PKGBUILD cups-filters/repos/extra-x86_64/cups-browsed.service cups-filters/repos/extra-x86_64/poppler_buildfix.diff ------------------------------------+ extra-i686/PKGBUILD | 102 ++++++++++++++++------------------- extra-i686/cups-browsed.service | 20 +++--- extra-i686/poppler_buildfix.diff | 61 -------------------- extra-x86_64/PKGBUILD | 102 ++++++++++++++++------------------- extra-x86_64/cups-browsed.service | 20 +++--- extra-x86_64/poppler_buildfix.diff | 61 -------------------- 6 files changed, 118 insertions(+), 248 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-03-09 09:03:03 UTC (rev 179657) +++ extra-i686/PKGBUILD 2013-03-09 09:03:22 UTC (rev 179658) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgname=cups-filters -pkgver=1.0.29 -pkgrel=3 -pkgdesc="OpenPrinting CUPS Filters" -arch=('i686' 'x86_64') -url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -license=('GPL') -depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0') -makedepends=('ghostscript' 'ttf-dejavu') # 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') -backup=(etc/fonts/conf.d/99pdftoopvp.conf) -options=(!libtool) -source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz - cups-browsed.service - poppler_buildfix.diff) -md5sums=('0640a02a3fb88d3dbdb224e3becd400d' - '4c9f97eae201798000483c4e7109e690' - 'bd97d1d9dbd4feec3a0330fd9fb7a03c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # fix build with poppler 0.22 - patch -Np0 -i ${srcdir}/poppler_buildfix.diff - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-rcdir=no \ - --enable-avahi \ - --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - # drop static lib - rm -f ${pkgdir}/usr/lib/*.a - - # add missing systemd support - install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service -} Copied: cups-filters/repos/extra-i686/PKGBUILD (from rev 179657, cups-filters/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-03-09 09:03:22 UTC (rev 179658) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgname=cups-filters +pkgver=1.0.30 +pkgrel=1 +pkgdesc="OpenPrinting CUPS Filters" +arch=('i686' 'x86_64') +url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" +license=('GPL') +depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0') +makedepends=('ghostscript' 'ttf-dejavu') # 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') +backup=(etc/fonts/conf.d/99pdftoopvp.conf + etc/cups/cups-browsed.conf) +options=(!libtool) +source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz + cups-browsed.service) +md5sums=('0d338e63f445e98d29c963620e5b1420' + '4c9f97eae201798000483c4e7109e690') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-rcdir=no \ + --enable-avahi \ + --with-browseremoteprotocols=DNSSD,CUPS \ + --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + # drop static lib + rm -f ${pkgdir}/usr/lib/*.a + + # add missing systemd support + install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service +} Deleted: extra-i686/cups-browsed.service =================================================================== --- extra-i686/cups-browsed.service 2013-03-09 09:03:03 UTC (rev 179657) +++ extra-i686/cups-browsed.service 2013-03-09 09:03:22 UTC (rev 179658) @@ -1,10 +0,0 @@ -[Unit] -Description=Make remote CUPS printers available locally -After=cups.service avahi-daemon.service -Wants=cups.service avahi-daemon.service - -[Service] -ExecStart=/usr/sbin/cups-browsed - -[Install] -WantedBy=multi-user.target Copied: cups-filters/repos/extra-i686/cups-browsed.service (from rev 179657, cups-filters/trunk/cups-browsed.service) =================================================================== --- extra-i686/cups-browsed.service (rev 0) +++ extra-i686/cups-browsed.service 2013-03-09 09:03:22 UTC (rev 179658) @@ -0,0 +1,10 @@ +[Unit] +Description=Make remote CUPS printers available locally +After=cups.service avahi-daemon.service +Wants=cups.service avahi-daemon.service + +[Service] +ExecStart=/usr/sbin/cups-browsed + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/poppler_buildfix.diff =================================================================== --- extra-i686/poppler_buildfix.diff 2013-03-09 09:03:03 UTC (rev 179657) +++ extra-i686/poppler_buildfix.diff 2013-03-09 09:03:22 UTC (rev 179658) @@ -1,61 +0,0 @@ -=== modified file 'NEWS' ---- NEWS 2013-01-02 18:23:25 +0000 -+++ NEWS 2013-01-09 10:42:32 +0000 -@@ -1,6 +1,11 @@ - NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02 - ----------------------------------------------------- - -+CHANGES IN V1.0.30 -+ -+ - pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani -+ from BBR Inc. (Bug #1089). -+ - CHANGES IN V1.0.29 - - - Fixed ./configure option "--with-rcdir=no". Thanks to Jiri - -=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' ---- filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-20 08:32:55 +0000 -+++ filter/pdftoopvp/OPVPOutputDev.cxx 2013-01-09 10:42:32 +0000 -@@ -1804,8 +1804,14 @@ - maskSplash = new Splash(maskBitmap, gFalse); - maskColor[0] = 0; - maskSplash->clear(maskColor); -+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) - maskSplash->drawImage(&imageSrc, &imgMaskData, - splashModeMono8, gFalse, maskWidth, maskHeight, mat); -+#else -+ maskSplash->drawImage(&imageSrc, &imgMaskData, -+ splashModeMono8, gFalse, maskWidth, maskHeight, -+ mat,gFalse); -+#endif - delete imgMaskData.imgStr; - maskStr->close(); - gfree(imgMaskData.lookup); - -=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx' ---- filter/pdftoopvp/oprs/OPRS.cxx 2012-09-10 19:56:59 +0000 -+++ filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000 -@@ -5,6 +5,9 @@ - //======================================================================== - - #include <config.h> -+#ifdef HAVE_CPP_POPPLER_VERSION_H -+#include "cpp/poppler-version.h" -+#endif - - #ifdef USE_GCC_PRAGMAS - #pragma implementation -@@ -235,7 +238,11 @@ - SplashColorMode srcMode, GBool srcAlpha, - int w, int h, SplashCoord *mat) { - if (rasterMode) { -+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) - return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); -+#else -+ return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); -+#endif - } else { - return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); - } - Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-03-09 09:03:03 UTC (rev 179657) +++ extra-x86_64/PKGBUILD 2013-03-09 09:03:22 UTC (rev 179658) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgname=cups-filters -pkgver=1.0.29 -pkgrel=3 -pkgdesc="OpenPrinting CUPS Filters" -arch=('i686' 'x86_64') -url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -license=('GPL') -depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0') -makedepends=('ghostscript' 'ttf-dejavu') # 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') -backup=(etc/fonts/conf.d/99pdftoopvp.conf) -options=(!libtool) -source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz - cups-browsed.service - poppler_buildfix.diff) -md5sums=('0640a02a3fb88d3dbdb224e3becd400d' - '4c9f97eae201798000483c4e7109e690' - 'bd97d1d9dbd4feec3a0330fd9fb7a03c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # fix build with poppler 0.22 - patch -Np0 -i ${srcdir}/poppler_buildfix.diff - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-rcdir=no \ - --enable-avahi \ - --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - # drop static lib - rm -f ${pkgdir}/usr/lib/*.a - - # add missing systemd support - install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service -} Copied: cups-filters/repos/extra-x86_64/PKGBUILD (from rev 179657, cups-filters/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-03-09 09:03:22 UTC (rev 179658) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgname=cups-filters +pkgver=1.0.30 +pkgrel=1 +pkgdesc="OpenPrinting CUPS Filters" +arch=('i686' 'x86_64') +url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" +license=('GPL') +depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0') +makedepends=('ghostscript' 'ttf-dejavu') # 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') +backup=(etc/fonts/conf.d/99pdftoopvp.conf + etc/cups/cups-browsed.conf) +options=(!libtool) +source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz + cups-browsed.service) +md5sums=('0d338e63f445e98d29c963620e5b1420' + '4c9f97eae201798000483c4e7109e690') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-rcdir=no \ + --enable-avahi \ + --with-browseremoteprotocols=DNSSD,CUPS \ + --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + # drop static lib + rm -f ${pkgdir}/usr/lib/*.a + + # add missing systemd support + install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service +} Deleted: extra-x86_64/cups-browsed.service =================================================================== --- extra-x86_64/cups-browsed.service 2013-03-09 09:03:03 UTC (rev 179657) +++ extra-x86_64/cups-browsed.service 2013-03-09 09:03:22 UTC (rev 179658) @@ -1,10 +0,0 @@ -[Unit] -Description=Make remote CUPS printers available locally -After=cups.service avahi-daemon.service -Wants=cups.service avahi-daemon.service - -[Service] -ExecStart=/usr/sbin/cups-browsed - -[Install] -WantedBy=multi-user.target Copied: cups-filters/repos/extra-x86_64/cups-browsed.service (from rev 179657, cups-filters/trunk/cups-browsed.service) =================================================================== --- extra-x86_64/cups-browsed.service (rev 0) +++ extra-x86_64/cups-browsed.service 2013-03-09 09:03:22 UTC (rev 179658) @@ -0,0 +1,10 @@ +[Unit] +Description=Make remote CUPS printers available locally +After=cups.service avahi-daemon.service +Wants=cups.service avahi-daemon.service + +[Service] +ExecStart=/usr/sbin/cups-browsed + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/poppler_buildfix.diff =================================================================== --- extra-x86_64/poppler_buildfix.diff 2013-03-09 09:03:03 UTC (rev 179657) +++ extra-x86_64/poppler_buildfix.diff 2013-03-09 09:03:22 UTC (rev 179658) @@ -1,61 +0,0 @@ -=== modified file 'NEWS' ---- NEWS 2013-01-02 18:23:25 +0000 -+++ NEWS 2013-01-09 10:42:32 +0000 -@@ -1,6 +1,11 @@ - NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02 - ----------------------------------------------------- - -+CHANGES IN V1.0.30 -+ -+ - pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani -+ from BBR Inc. (Bug #1089). -+ - CHANGES IN V1.0.29 - - - Fixed ./configure option "--with-rcdir=no". Thanks to Jiri - -=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' ---- filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-20 08:32:55 +0000 -+++ filter/pdftoopvp/OPVPOutputDev.cxx 2013-01-09 10:42:32 +0000 -@@ -1804,8 +1804,14 @@ - maskSplash = new Splash(maskBitmap, gFalse); - maskColor[0] = 0; - maskSplash->clear(maskColor); -+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) - maskSplash->drawImage(&imageSrc, &imgMaskData, - splashModeMono8, gFalse, maskWidth, maskHeight, mat); -+#else -+ maskSplash->drawImage(&imageSrc, &imgMaskData, -+ splashModeMono8, gFalse, maskWidth, maskHeight, -+ mat,gFalse); -+#endif - delete imgMaskData.imgStr; - maskStr->close(); - gfree(imgMaskData.lookup); - -=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx' ---- filter/pdftoopvp/oprs/OPRS.cxx 2012-09-10 19:56:59 +0000 -+++ filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000 -@@ -5,6 +5,9 @@ - //======================================================================== - - #include <config.h> -+#ifdef HAVE_CPP_POPPLER_VERSION_H -+#include "cpp/poppler-version.h" -+#endif - - #ifdef USE_GCC_PRAGMAS - #pragma implementation -@@ -235,7 +238,11 @@ - SplashColorMode srcMode, GBool srcAlpha, - int w, int h, SplashCoord *mat) { - if (rasterMode) { -+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) - return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); -+#else -+ return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); -+#endif - } else { - return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); - } -