summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-01-13 20:58:50 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-01-13 20:58:50 +0000
commit23346cf0d7b29b36aadc4261f9adf6d745fa42dc (patch)
tree4eef876f5c95600e352e262bf97b0ea1f10684db
parent2766b15a6bb9d511169f291284b250561eb10390 (diff)
downloadpackages-23346cf0d7b29b36aadc4261f9adf6d745fa42dc.tar.gz
packages-23346cf0d7b29b36aadc4261f9adf6d745fa42dc.tar.bz2
packages-23346cf0d7b29b36aadc4261f9adf6d745fa42dc.tar.xz
packages-23346cf0d7b29b36aadc4261f9adf6d745fa42dc.zip
user/cups-filters: bump to 1.21.6, add gs dep
-rw-r--r--user/cups-filters/APKBUILD14
-rw-r--r--user/cups-filters/poppler-69-support.patch76
2 files changed, 5 insertions, 85 deletions
diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD
index b4704aa7a..98205aecb 100644
--- a/user/cups-filters/APKBUILD
+++ b/user/cups-filters/APKBUILD
@@ -1,20 +1,18 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=cups-filters
-pkgver=1.21.3
-pkgrel=1
+pkgver=1.21.6
+pkgrel=0
pkgdesc="OpenPrinting CUPS filters and backends"
url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
arch="all"
license="GPL-2.0-only AND GPL-2.0+ AND GPL-3.0-only AND MIT"
-depends="poppler-utils bc ttf-freefont"
+depends="gnu-ghostscript poppler-utils bc ttf-freefont"
makedepends="cups-dev libjpeg-turbo-dev poppler-dev zlib-dev libpng-dev
tiff-dev lcms2-dev freetype-dev fontconfig-dev qpdf-dev dbus-dev linux-headers
coreutils gnutls-dev python3"
checkdepends="ttf-dejavu"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz
- poppler-69-support.patch
- "
+source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz"
build() {
cd "$builddir"
@@ -32,7 +30,6 @@ build() {
--without-rcdir \
--without-rclevels \
--disable-avahi \
- --disable-ghostscript \
--disable-mutool \
--with-test-font-path='/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf'
# workaround parallel build issue by building libcupsfilters.la first
@@ -65,5 +62,4 @@ libs() {
mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
}
-sha512sums="2b00023ac4177046e3ab3c5b563b7bd92bb49e57e645e6e67e7b9358d00919e2d4ca43ef5d57684523d97f1f1df5d1014fc0a3a895476ce285ccb3ed2e3bc758 cups-filters-1.21.3.tar.xz
-6db4cd5d809c7f9511db9cf8cf6b293e5b9143e8d4d7d954a1f7f206a1cbe8baedcc6306c1f8dc7df6dee74ce8c88ffec3dd7efa1f22c32ea37168971013c1ff poppler-69-support.patch"
+sha512sums="804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a cups-filters-1.21.6.tar.xz"
diff --git a/user/cups-filters/poppler-69-support.patch b/user/cups-filters/poppler-69-support.patch
deleted file mode 100644
index e9516d1bb..000000000
--- a/user/cups-filters/poppler-69-support.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 6b0747c1630dd973acd138f927dbded4ea45e360 Mon Sep 17 00:00:00 2001
-From: Olivier Schonken <olivier.schonken@gmail.com>
-Date: Fri, 5 Oct 2018 12:05:31 +0200
-Subject: [PATCH] Poppler removed memCheck and gMemReport functions
-
-Only use gMemReport and memCheck functions if poppler version less
-than 0.69.0
-
-The poppler project removed the memCheck and gMemReport functions in
-commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM
-from Object since this uses RAII now and hence cannot leak.
-(The existing tracking also is not thread-safe and hence unreliable.)
-
-and
-
-f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging
-from gmem since external tools and compiler instrumentation achieve the
-same effect.
-
-This commit solves https://github.com/OpenPrinting/cups-filters/issues/62
-
-Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
----
- filter/pdftoijs.cxx | 2 ++
- filter/pdftoopvp/pdftoopvp.cxx | 2 ++
- filter/pdftoraster.cxx | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx
-index 22bc33f4..dd6b6fa0 100644
---- a/filter/pdftoijs.cxx
-+++ b/filter/pdftoijs.cxx
-@@ -503,9 +503,11 @@ int main(int argc, char *argv[]) {
- ppdClose(ppd);
- free(outputfile);
-
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
- // Check for memory leaks
- Object::memCheck(stderr);
- gMemReport(stderr);
-+#endif
-
- return exitCode;
- }
-diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx
-index 024941ab..bf25983b 100644
---- a/filter/pdftoopvp/pdftoopvp.cxx
-+++ b/filter/pdftoopvp/pdftoopvp.cxx
-@@ -763,9 +763,11 @@ fprintf(stderr,"JobInfo=%s\n",jobInfo);
- err0:
- delete globalParams;
-
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
- // check for memory leaks
- Object::memCheck(stderr);
- gMemReport(stderr);
-+#endif
-
- }
- /* muntrace(); */
-diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx
-index 0c63ab8d..4ebf02b0 100644
---- a/filter/pdftoraster.cxx
-+++ b/filter/pdftoraster.cxx
-@@ -2162,9 +2162,11 @@ int main(int argc, char *argv[]) {
- cmsDeleteTransform(colorTransform);
- }
-
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
- // Check for memory leaks
- Object::memCheck(stderr);
- gMemReport(stderr);
-+#endif
-
- return exitCode;
- }