diff options
| -rw-r--r-- | cups-filters/.md5sum | 1 | ||||
| -rw-r--r-- | cups-filters/Pkgfile | 6 | ||||
| -rw-r--r-- | cups-filters/cups-filters-poppler_0.31.patch | 84 |
3 files changed, 89 insertions, 2 deletions
diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index c5f40e7d1..5edaef256 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,3 @@ f182d7717ed0a939a4f50e572939afdd cups-browsed 20dea125408bfebd25a58a884a78a13c cups-filters-1.0.65.tar.xz +9bda1352feb57b1107be202f803d186b cups-filters-poppler_0.31.patch diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 4e7dc0d26..1e5a5cff6 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -5,13 +5,15 @@ name=cups-filters version=1.0.65 -release=1 +release=2 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz - cups-browsed) + cups-browsed cups-filters-poppler_0.31.patch) build () { cd $name-$version + patch -p0 -i $SRC/$name-poppler_0.31.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \ diff --git a/cups-filters/cups-filters-poppler_0.31.patch b/cups-filters/cups-filters-poppler_0.31.patch new file mode 100644 index 000000000..b582825d0 --- /dev/null +++ b/cups-filters/cups-filters-poppler_0.31.patch @@ -0,0 +1,84 @@ +# https://bugs.linuxfoundation.org/show_bug.cgi?id=1254 +# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7332 + +=== modified file 'NEWS' +--- NEWS 2015-02-14 00:35:53 +0000 ++++ NEWS 2015-02-18 03:17:28 +0000 +@@ -1,6 +1,12 @@ + NEWS - OpenPrinting CUPS Filters v1.0.65 - 2015-02-13 + ----------------------------------------------------- + ++CHANGES IN V1.0.66 ++ ++ - pdftoopvp: Added conditionals to also build with Poppler 0.31.0 ++ and newer. Thanks to Armin K. (krejzi at email dot com) for the ++ patch (Bug #1254). ++ + CHANGES IN V1.0.65 + + - cups-browsed: Listen for NetworkManager changes (Red Hat bug #975933). + +=== modified file 'filter/pdftoijs.cxx' +--- filter/pdftoijs.cxx 2013-08-02 13:52:04 +0000 ++++ filter/pdftoijs.cxx 2015-02-18 03:17:28 +0000 +@@ -436,7 +436,11 @@ + } + + out = new SplashOutputDev(cmode,rowpad/* row padding */, +- reverseVideo,paperColor,gTrue,gFalse); ++ reverseVideo,paperColor,gTrue ++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30 ++ ,gFalse ++#endif ++ ); + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 + out->startDoc(doc); + #else + +=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' +--- filter/pdftoopvp/OPVPOutputDev.cxx 2014-03-10 11:24:29 +0000 ++++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-18 03:17:28 +0000 +@@ -278,7 +278,11 @@ + gFalse, + gFalse, + #endif ++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30 + globalParams->getAntialias()); ++#else ++ gFalse); ++#endif + for (i = 0; i < nT3Fonts; ++i) { + delete t3FontCache[i]; + } + +=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' +--- filter/pdftoopvp/pdftoopvp.cxx 2013-08-02 14:46:20 +0000 ++++ filter/pdftoopvp/pdftoopvp.cxx 2015-02-18 03:17:28 +0000 +@@ -614,7 +614,9 @@ + ok = gFalse; + } + } ++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30 + globalParams->setAntialias("no"); ++#endif + if (quiet) { + globalParams->setErrQuiet(quiet); + } + +=== modified file 'filter/pdftoraster.cxx' +--- filter/pdftoraster.cxx 2014-09-26 18:46:49 +0000 ++++ filter/pdftoraster.cxx 2015-02-18 03:17:28 +0000 +@@ -2100,7 +2100,11 @@ + } + + out = new SplashOutputDev(cmode,rowpad/* row padding */, +- gFalse,paperColor,gTrue,gFalse); ++ gFalse,paperColor,gTrue ++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR <= 30 ++ ,gFalse ++#endif ++ ); + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 + out->startDoc(doc); + #else + |