diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-28 11:48:15 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-04 14:16:32 +0000 |
commit | 5bc867d927fb73c38721b35a8453054747d373f8 (patch) | |
tree | d9080e009fc34ca2e9b93aefc2671b7e521e0331 | |
parent | e19e52fe9e24760c7e05b1dd5b04114965ae7586 (diff) | |
download | alpine_aports-5bc867d927fb73c38721b35a8453054747d373f8.tar.bz2 alpine_aports-5bc867d927fb73c38721b35a8453054747d373f8.tar.xz alpine_aports-5bc867d927fb73c38721b35a8453054747d373f8.zip |
testing/cups-filters: upgrade to 1.0.34
(cherry picked from commit ad2d0bcdbeda6e0ab7ea8d9218c18a946fa1ef97)
-rw-r--r-- | testing/cups-filters/APKBUILD | 19 | ||||
-rw-r--r-- | testing/cups-filters/cups-filters-1.0.29-poppler_022.patch | 58 |
2 files changed, 13 insertions, 64 deletions
diff --git a/testing/cups-filters/APKBUILD b/testing/cups-filters/APKBUILD index ab3766e091..b87ecc1e66 100644 --- a/testing/cups-filters/APKBUILD +++ b/testing/cups-filters/APKBUILD | |||
@@ -1,20 +1,19 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=cups-filters | 2 | pkgname=cups-filters |
3 | pkgver=1.0.29 | 3 | pkgver=1.0.34 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="OpenPrinting CUPS filters and backends" | 5 | pkgdesc="OpenPrinting CUPS filters and backends" |
6 | url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format" | 6 | url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format" |
7 | arch="all" | 7 | arch="all" |
8 | license="GPLv2 and GPLv2+ and GPLv3 and MIT" | 8 | license="GPLv2 and GPLv2+ and GPLv3 and MIT" |
9 | depends="poppler-utils" | 9 | depends="poppler-utils bc" |
10 | depends_dev="" | 10 | depends_dev="" |
11 | makedepends="$depends_dev cups-dev libjpeg-turbo-dev poppler-dev zlib-dev | 11 | makedepends="$depends_dev cups-dev libjpeg-turbo-dev poppler-dev zlib-dev |
12 | libpng-dev tiff-dev lcms-dev freetype-dev ghostscript-dev fontconfig-dev | 12 | libpng-dev tiff-dev lcms-dev freetype-dev ghostscript-dev fontconfig-dev |
13 | qpdf-dev avahi-dev" | 13 | qpdf-dev avahi-dev" |
14 | install="" | 14 | install="" |
15 | subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" | 15 | subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" |
16 | source="http://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz | 16 | source="http://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz" |
17 | cups-filters-1.0.29-poppler_022.patch" | ||
18 | 17 | ||
19 | _builddir="$srcdir"/cups-filters-$pkgver | 18 | _builddir="$srcdir"/cups-filters-$pkgver |
20 | prepare() { | 19 | prepare() { |
@@ -49,11 +48,19 @@ package() { | |||
49 | 48 | ||
50 | } | 49 | } |
51 | 50 | ||
51 | dev() { | ||
52 | default_dev | ||
53 | # cupsfilters.drv needs pcl.h | ||
54 | install -Dm644 "$_builddir"/filter/pcl.h \ | ||
55 | "$pkgdir"/usr/share/cups/ppdc/pcl.h | ||
56 | } | ||
57 | |||
52 | libs() { | 58 | libs() { |
53 | pkgdesc="OpenPrinting CUPS filters and backends - cupsfilters and fontembed libraries" | 59 | pkgdesc="OpenPrinting CUPS filters and backends - cupsfilters and fontembed libraries" |
54 | install -d "$subpkgdir"/usr/lib | 60 | install -d "$subpkgdir"/usr/lib |
55 | mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ | 61 | mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ |
56 | } | 62 | } |
57 | 63 | ||
58 | md5sums="01e2d9abc4ea69521334a0ee2f70d98a cups-filters-1.0.29.tar.xz | 64 | md5sums="e4d605cd35ea5a42c13f7fc1e1f273de cups-filters-1.0.34.tar.xz" |
59 | 82281b049a5ef4aca479cac104de1af0 cups-filters-1.0.29-poppler_022.patch" | 65 | sha256sums="24995edfd31fc58a0c5be09631650dfacea8664e0e0d2b61c3859bf992d9b371 cups-filters-1.0.34.tar.xz" |
66 | sha512sums="1cb8e0e5998f09512276bcca17d8635223ed3717573460b351fdd5a11bcb0fc4dd46771afc1ff9c2f87d007f8035c78704dea7afc2d67978d09c035ed58cebd6 cups-filters-1.0.34.tar.xz" | ||
diff --git a/testing/cups-filters/cups-filters-1.0.29-poppler_022.patch b/testing/cups-filters/cups-filters-1.0.29-poppler_022.patch deleted file mode 100644 index e75f38fa3c..0000000000 --- a/testing/cups-filters/cups-filters-1.0.29-poppler_022.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | diff -urbB cups-filters-1.0.29/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0-20130119/filter/pdftoopvp/oprs/OPRS.cxx | ||
2 | --- cups-filters-1.0.29/filter/pdftoopvp/oprs/OPRS.cxx 2012-09-10 14:52:00.000000000 -0500 | ||
3 | +++ cups-filters-1.0-20130119/filter/pdftoopvp/oprs/OPRS.cxx 2013-01-18 18:40:36.000000000 -0600 | ||
4 | @@ -5,6 +5,9 @@ | ||
5 | //======================================================================== | ||
6 | |||
7 | #include <config.h> | ||
8 | +#ifdef HAVE_CPP_POPPLER_VERSION_H | ||
9 | +#include "cpp/poppler-version.h" | ||
10 | +#endif | ||
11 | |||
12 | #ifdef USE_GCC_PRAGMAS | ||
13 | #pragma implementation | ||
14 | @@ -235,7 +238,11 @@ | ||
15 | SplashColorMode srcMode, GBool srcAlpha, | ||
16 | int w, int h, SplashCoord *mat) { | ||
17 | if (rasterMode) { | ||
18 | +#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) | ||
19 | return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); | ||
20 | +#else | ||
21 | + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); | ||
22 | +#endif | ||
23 | } else { | ||
24 | return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); | ||
25 | } | ||
26 | diff -urbB cups-filters-1.0.29/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0-20130119/filter/pdftoopvp/OPVPOutputDev.cxx | ||
27 | --- cups-filters-1.0.29/filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-20 03:22:23.000000000 -0500 | ||
28 | +++ cups-filters-1.0-20130119/filter/pdftoopvp/OPVPOutputDev.cxx 2013-01-18 18:40:36.000000000 -0600 | ||
29 | @@ -1804,8 +1804,14 @@ | ||
30 | maskSplash = new Splash(maskBitmap, gFalse); | ||
31 | maskColor[0] = 0; | ||
32 | maskSplash->clear(maskColor); | ||
33 | +#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) | ||
34 | maskSplash->drawImage(&imageSrc, &imgMaskData, | ||
35 | splashModeMono8, gFalse, maskWidth, maskHeight, mat); | ||
36 | +#else | ||
37 | + maskSplash->drawImage(&imageSrc, &imgMaskData, | ||
38 | + splashModeMono8, gFalse, maskWidth, maskHeight, | ||
39 | + mat,gFalse); | ||
40 | +#endif | ||
41 | delete imgMaskData.imgStr; | ||
42 | maskStr->close(); | ||
43 | gfree(imgMaskData.lookup); | ||
44 | diff -urbB cups-filters-1.0.29/NEWS cups-filters-1.0-20130119/NEWS | ||
45 | --- cups-filters-1.0.29/NEWS 2013-01-02 12:23:13.000000000 -0600 | ||
46 | +++ cups-filters-1.0-20130119/NEWS 2013-01-18 18:40:36.000000000 -0600 | ||
47 | @@ -1,6 +1,11 @@ | ||
48 | NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02 | ||
49 | ----------------------------------------------------- | ||
50 | |||
51 | +CHANGES IN V1.0.30 | ||
52 | + | ||
53 | + - pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani | ||
54 | + from BBR Inc. (Bug #1089). | ||
55 | + | ||
56 | CHANGES IN V1.0.29 | ||
57 | |||
58 | - Fixed ./configure option "--with-rcdir=no". Thanks to Jiri | ||