[arch-commits] Commit in cups-filters/repos (12 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Jan 12 08:15:23 UTC 2013
Date: Saturday, January 12, 2013 @ 03:15:22
Author: andyrtr
Revision: 175031
db-move: moved cups-filters from [testing] to [extra] (i686, x86_64)
Added:
cups-filters/repos/extra-i686/PKGBUILD
(from rev 175028, cups-filters/repos/testing-i686/PKGBUILD)
cups-filters/repos/extra-i686/cups-browsed.service
(from rev 175028, cups-filters/repos/testing-i686/cups-browsed.service)
cups-filters/repos/extra-i686/poppler_buildfix.diff
(from rev 175028, cups-filters/repos/testing-i686/poppler_buildfix.diff)
cups-filters/repos/extra-x86_64/PKGBUILD
(from rev 175028, cups-filters/repos/testing-x86_64/PKGBUILD)
cups-filters/repos/extra-x86_64/cups-browsed.service
(from rev 175028, cups-filters/repos/testing-x86_64/cups-browsed.service)
cups-filters/repos/extra-x86_64/poppler_buildfix.diff
(from rev 175028, cups-filters/repos/testing-x86_64/poppler_buildfix.diff)
Deleted:
cups-filters/repos/extra-i686/PKGBUILD
cups-filters/repos/extra-i686/cups-browsed.service
cups-filters/repos/extra-x86_64/PKGBUILD
cups-filters/repos/extra-x86_64/cups-browsed.service
cups-filters/repos/testing-i686/
cups-filters/repos/testing-x86_64/
------------------------------------+
extra-i686/PKGBUILD | 99 ++++++++++++++++++-----------------
extra-i686/cups-browsed.service | 20 +++----
extra-i686/poppler_buildfix.diff | 61 +++++++++++++++++++++
extra-x86_64/PKGBUILD | 99 ++++++++++++++++++-----------------
extra-x86_64/cups-browsed.service | 20 +++----
extra-x86_64/poppler_buildfix.diff | 61 +++++++++++++++++++++
6 files changed, 248 insertions(+), 112 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-01-12 08:15:19 UTC (rev 175030)
+++ extra-i686/PKGBUILD 2013-01-12 08:15:22 UTC (rev 175031)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=cups-filters
-pkgver=1.0.29
-pkgrel=1
-pkgdesc="OpenPrinting CUPS Filters"
-arch=('i686' 'x86_64')
-url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
-license=('GPL')
-depends=('lcms2' 'poppler>=0.20.5' 'qpdf')
-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)
-md5sums=('0640a02a3fb88d3dbdb224e3becd400d'
- '4c9f97eae201798000483c4e7109e690')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./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 175028, cups-filters/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-01-12 08:15:22 UTC (rev 175031)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at 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
+}
Deleted: extra-i686/cups-browsed.service
===================================================================
--- extra-i686/cups-browsed.service 2013-01-12 08:15:19 UTC (rev 175030)
+++ extra-i686/cups-browsed.service 2013-01-12 08:15:22 UTC (rev 175031)
@@ -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 175028, cups-filters/repos/testing-i686/cups-browsed.service)
===================================================================
--- extra-i686/cups-browsed.service (rev 0)
+++ extra-i686/cups-browsed.service 2013-01-12 08:15:22 UTC (rev 175031)
@@ -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
Copied: cups-filters/repos/extra-i686/poppler_buildfix.diff (from rev 175028, cups-filters/repos/testing-i686/poppler_buildfix.diff)
===================================================================
--- extra-i686/poppler_buildfix.diff (rev 0)
+++ extra-i686/poppler_buildfix.diff 2013-01-12 08:15:22 UTC (rev 175031)
@@ -0,0 +1,61 @@
+=== 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-01-12 08:15:19 UTC (rev 175030)
+++ extra-x86_64/PKGBUILD 2013-01-12 08:15:22 UTC (rev 175031)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=cups-filters
-pkgver=1.0.29
-pkgrel=1
-pkgdesc="OpenPrinting CUPS Filters"
-arch=('i686' 'x86_64')
-url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
-license=('GPL')
-depends=('lcms2' 'poppler>=0.20.5' 'qpdf')
-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)
-md5sums=('0640a02a3fb88d3dbdb224e3becd400d'
- '4c9f97eae201798000483c4e7109e690')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./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 175028, cups-filters/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-01-12 08:15:22 UTC (rev 175031)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at 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
+}
Deleted: extra-x86_64/cups-browsed.service
===================================================================
--- extra-x86_64/cups-browsed.service 2013-01-12 08:15:19 UTC (rev 175030)
+++ extra-x86_64/cups-browsed.service 2013-01-12 08:15:22 UTC (rev 175031)
@@ -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 175028, cups-filters/repos/testing-x86_64/cups-browsed.service)
===================================================================
--- extra-x86_64/cups-browsed.service (rev 0)
+++ extra-x86_64/cups-browsed.service 2013-01-12 08:15:22 UTC (rev 175031)
@@ -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
Copied: cups-filters/repos/extra-x86_64/poppler_buildfix.diff (from rev 175028, cups-filters/repos/testing-x86_64/poppler_buildfix.diff)
===================================================================
--- extra-x86_64/poppler_buildfix.diff (rev 0)
+++ extra-x86_64/poppler_buildfix.diff 2013-01-12 08:15:22 UTC (rev 175031)
@@ -0,0 +1,61 @@
+=== 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);
+ }
+
More information about the arch-commits
mailing list