user/cups-filters: support Poppler 0.69.0+

2 files changed, 81 insertions, 2 deletions

diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD
index f38c8e920..83a95a7ed 100644
--- a/user/cups-filters/APKBUILD
+++ b/user/cups-filters/APKBUILD
@@ -12,7 +12,9 @@ makedepends="cups-dev libjpeg-turbo-dev poppler-dev zlib-dev libpng-dev
 	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"
+source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz
+	poppler-69-support.patch
+	"
 
 build() {
 	cd "$builddir"
@@ -63,4 +65,5 @@ libs() {
 	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="2b00023ac4177046e3ab3c5b563b7bd92bb49e57e645e6e67e7b9358d00919e2d4ca43ef5d57684523d97f1f1df5d1014fc0a3a895476ce285ccb3ed2e3bc758  cups-filters-1.21.3.tar.xz"
+sha512sums="2b00023ac4177046e3ab3c5b563b7bd92bb49e57e645e6e67e7b9358d00919e2d4ca43ef5d57684523d97f1f1df5d1014fc0a3a895476ce285ccb3ed2e3bc758  cups-filters-1.21.3.tar.xz
+6db4cd5d809c7f9511db9cf8cf6b293e5b9143e8d4d7d954a1f7f206a1cbe8baedcc6306c1f8dc7df6dee74ce8c88ffec3dd7efa1f22c32ea37168971013c1ff  poppler-69-support.patch"
diff --git a/user/cups-filters/poppler-69-support.patch b/user/cups-filters/poppler-69-support.patch
new file mode 100644
index 000000000..e9516d1bb
--- /dev/null
+++ b/user/cups-filters/poppler-69-support.patch
@@ -0,0 +1,76 @@
+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;
+ }