[arch-commits] Commit in cups-filters/trunk (PKGBUILD poppler_buildfix.diff)

[Andreas Radke]

    Date: Saturday, August 3, 2013 @ 09:52:29
  Author: andyrtr
Revision: 191975

upgpkg: cups-filters 1.0.35-4

add more upstream poppler fixes

Modified:
  cups-filters/trunk/PKGBUILD
  cups-filters/trunk/poppler_buildfix.diff

-----------------------+
 PKGBUILD              |    4 ++--
 poppler_buildfix.diff |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-02 17:22:54 UTC (rev 191974)
+++ PKGBUILD	2013-08-03 07:52:29 UTC (rev 191975)
@@ -3,7 +3,7 @@
 
 pkgname=cups-filters
 pkgver=1.0.35
-pkgrel=3
+pkgrel=4
 pkgdesc="OpenPrinting CUPS Filters"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
@@ -21,7 +21,7 @@
         poppler_buildfix.diff
         cups-browsed.service)
 md5sums=('26f150f1e9ce1f7b0f38ae4ebb01e23d'
-         'e915bb175a5a5c73c16c85dc298a896b'
+         'e898ddcb65fb08d96595eac24fe0b1ac'
          '9ef68d7c2a84713fd421f4e87dec0a6e')
 
 build() {

Modified: poppler_buildfix.diff
===================================================================
--- poppler_buildfix.diff	2013-08-02 17:22:54 UTC (rev 191974)
+++ poppler_buildfix.diff	2013-08-03 07:52:29 UTC (rev 191975)
@@ -226,3 +226,51 @@
      GooString *fileName = new GooString(argv[6]);
      /* argc == 7 filenmae is specified */
 
+=== modified file 'filter/pdftoijs.cxx'
+--- filter/pdftoijs.cxx	2013-08-01 15:48:06 +0000
++++ filter/pdftoijs.cxx	2013-08-02 13:52:04 +0000
+@@ -79,7 +79,11 @@
+ #endif
+ {
+   if (pos >= 0) {
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++    fprintf(stderr, "ERROR (%lld): ", pos);
++#else
+     fprintf(stderr, "ERROR (%d): ", pos);
++#endif
+   } else {
+     fprintf(stderr, "ERROR: ");
+   }
+
+=== modified file 'filter/pdftoraster.cxx'
+--- filter/pdftoraster.cxx	2013-08-02 11:13:38 +0000
++++ filter/pdftoraster.cxx	2013-08-02 13:52:04 +0000
+@@ -199,7 +199,11 @@
+ #endif
+ {
+   if (pos >= 0) {
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++    fprintf(stderr, "ERROR (%lld): ", pos);
++#else
+     fprintf(stderr, "ERROR (%d): ", pos);
++#endif
+   } else {
+     fprintf(stderr, "ERROR: ");
+   }
+
+=== modified file 'filter/pdftoopvp/pdftoopvp.cxx'
+--- filter/pdftoopvp/pdftoopvp.cxx	2013-08-01 15:48:06 +0000
++++ filter/pdftoopvp/pdftoopvp.cxx	2013-08-02 14:46:20 +0000
+@@ -121,7 +121,11 @@
+ #endif
+ {
+   if (pos >= 0) {
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
++    fprintf(stderr, "ERROR (%lld): ", pos);
++#else
+     fprintf(stderr, "ERROR (%d): ", pos);
++#endif
+   } else {
+     fprintf(stderr, "ERROR: ");
+   }
+