diff options
| -rw-r--r-- | libre/cups-filters-libre/PKGBUILD | 34 | ||||
| -rw-r--r-- | libre/cups-filters-libre/buildfix_dlopen.diff | 31 | ||||
| -rw-r--r-- | libre/cups-filters-libre/buildfix_poppler.diff | 224 |
3 files changed, 279 insertions, 10 deletions
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 662ed4d1a..1f4ba1f6e 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,37 +1,51 @@ -# $Id$ +# $Id: PKGBUILD 163769 2012-07-19 15:52:39Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.18 -pkgrel=3 +pkgver=1.0.19 +pkgrel=1 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') depends=('lcms2' 'poppler>=0.20.1') -makedepends=('ghostscript') +makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') backup=(etc/fonts/conf.d/99pdftoopvp.conf) -source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -md5sums=(63972b426b7224915cdbb42b2a937374'') - +options=(!libtool) +source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz + buildfix_poppler.diff + buildfix_dlopen.diff) +md5sums=('e3c9ad58ec005eda2f0ac2f3190a63b3' + 'b3d5b60a50568d06d1ef43c285ce7802' + '8b0c8874ef5c985287cada55db75d8d1') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") build() { cd "$srcdir/$_pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc + # https://bugs.linuxfoundation.org/show_bug.cgi?id=1055 + patch -Np0 -i ${srcdir}/buildfix_poppler.diff + patch -Np0 -i ${srcdir}/buildfix_dlopen.diff + autoreconf -v + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf make } +check() { + cd "$srcdir/$_pkgname-$pkgver" + make -k check +} + package() { cd "$srcdir/$_pkgname-$pkgver" - #make DESTDIR="$pkgdir/" install - make install BUILDROOT="$pkgdir/" + make DESTDIR="$pkgdir/" install # drop static lib rm -f ${pkgdir}/usr/lib/*.a } diff --git a/libre/cups-filters-libre/buildfix_dlopen.diff b/libre/cups-filters-libre/buildfix_dlopen.diff new file mode 100644 index 000000000..eea5f506c --- /dev/null +++ b/libre/cups-filters-libre/buildfix_dlopen.diff @@ -0,0 +1,31 @@ +=== modified file 'Makefile.am' +--- Makefile.am 2012-06-22 15:40:53 +0000 ++++ Makefile.am 2012-07-19 09:36:30 +0000 +@@ -329,7 +329,8 @@ + $(FREETYPE_LIBS) \ + $(FONTCONFIG_LIBS) \ + $(LIBPNG_LIBS) \ +- $(POPPLER_LIBS) ++ $(POPPLER_LIBS) \ ++ $(DLOPEN_LIBS) + + EXTRA_DIST += $(pkgfontconfig_DATA) + +=== modified file 'configure.ac' +--- configure.ac 2012-07-19 14:02:32 +0000 ++++ configure.ac 2012-07-19 14:39:25 +0000 +@@ -110,6 +110,13 @@ + AC_DEFINE(PDFTOPDF, [], [Needed for pdftopdf filter compilation]) + AC_DEFINE_DIR(BANNERTOPDF_DATADIR, "{CUPS_DATADIR}/data", [Directory where bannertopdf finds its data files (PDF templates)]) + ++AC_SEARCH_LIBS([dlopen], ++ [dl], ++ DLOPEN_LIBS="-ldl", ++ AC_MSG_ERROR([unable to find the dlopen() function]) ++) ++AC_SUBST(DLOPEN_LIBS) ++ + # ====================== + # Check system functions + # ====================== + diff --git a/libre/cups-filters-libre/buildfix_poppler.diff b/libre/cups-filters-libre/buildfix_poppler.diff new file mode 100644 index 000000000..6f3cbc0b3 --- /dev/null +++ b/libre/cups-filters-libre/buildfix_poppler.diff @@ -0,0 +1,224 @@ +=== modified file 'NEWS' +--- NEWS 2012-07-11 19:48:23 +0000 ++++ NEWS 2012-07-19 14:02:32 +0000 +@@ -1,6 +1,11 @@ +-NEWS - OpenPrinting CUPS Filters v1.0.19 - 2012-07-11 ++NEWS - OpenPrinting CUPS Filters v1.0.20 - 2012-07-19 + ----------------------------------------------------- + ++CHANGES IN V1.0.20 ++ ++ - Made the Poppler-based filters pdftopdf and pdftoopvp build with ++ both Poppler 0.18.x and 0.20.x (Bug #1055). ++ + CHANGES IN V1.0.19 + + - Fixes according to Coverity scan results (Bug #1054). + +=== modified file 'configure.ac' +--- configure.ac 2012-07-11 19:48:23 +0000 ++++ configure.ac 2012-07-19 14:02:32 +0000 +@@ -202,6 +202,7 @@ + # ================ + POPPLER_INCLUDEDIR=`pkg-config poppler --variable includedir` + AC_CHECK_HEADER([UGooString.h], [AC_DEFINE([HAVE_UGOOSTRING_H],,[Have UGooString.h])], []) ++AC_CHECK_HEADER([poppler/cpp/poppler-version.h], [AC_DEFINE([HAVE_CPP_POPPLER_VERSION_H],,[Define if you have Poppler's "cpp/poppler-version.h" header file.])], []) + # FIXME: + # Use proper c compile check not greps and then just link again poppler with all the features + # instead of this and all the libs. + +=== modified file 'filter/PDFError.h' +--- filter/PDFError.h 2012-03-29 14:06:07 +0000 ++++ filter/PDFError.h 2012-07-19 14:02:32 +0000 +@@ -31,6 +31,9 @@ + #include <config.h> + #include <stdarg.h> + #include <Error.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 + #define pdfError(pos,...) error(errInternal,pos,__VA_ARGS__) + +=== modified file 'filter/pdftoijs.cxx' +--- filter/pdftoijs.cxx 2012-06-04 16:46:44 +0000 ++++ filter/pdftoijs.cxx 2012-07-19 14:02:32 +0000 +@@ -30,6 +30,9 @@ + #include <config.h> + #include <stdio.h> + #include <stdlib.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + #include <goo/GooString.h> + #include <goo/gmem.h> + #include <Object.h> + +=== modified file 'filter/pdftoopvp/OPVPError.h' +--- filter/pdftoopvp/OPVPError.h 2012-03-29 14:06:07 +0000 ++++ filter/pdftoopvp/OPVPError.h 2012-07-19 14:02:32 +0000 +@@ -31,6 +31,9 @@ + #include <config.h> + #include <stdarg.h> + #include <Error.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 + #define opvpError(pos,...) error(errInternal,pos,__VA_ARGS__) + +=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' +--- filter/pdftoopvp/OPVPOutputDev.cxx 2012-03-29 09:42:35 +0000 ++++ filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-19 14:02:32 +0000 +@@ -8,6 +8,9 @@ + //======================================================================== + + #include <config.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + #ifdef USE_GCC_PRAGMAS + #pragma implementation + +=== modified file 'filter/pdftoopvp/oprs/OPVPSplash.cxx' +--- filter/pdftoopvp/oprs/OPVPSplash.cxx 2012-03-29 09:42:35 +0000 ++++ filter/pdftoopvp/oprs/OPVPSplash.cxx 2012-07-19 14:02:32 +0000 +@@ -5,6 +5,9 @@ + //======================================================================== + + #include <config.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + #ifdef USE_GCC_PRAGMAS + #pragma implementation + +=== modified file 'filter/pdftoopvp/oprs/OPVPSplashState.cxx' +--- filter/pdftoopvp/oprs/OPVPSplashState.cxx 2012-03-29 09:42:35 +0000 ++++ filter/pdftoopvp/oprs/OPVPSplashState.cxx 2012-07-19 14:02:32 +0000 +@@ -11,6 +11,9 @@ + #endif + + #include <string.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + #include "goo/gmem.h" + #include "splash/SplashPattern.h" + #include "splash/SplashScreen.h" + +=== modified file 'filter/pdftoopvp/oprs/OPVPSplashState.h' +--- filter/pdftoopvp/oprs/OPVPSplashState.h 2012-03-29 09:42:35 +0000 ++++ filter/pdftoopvp/oprs/OPVPSplashState.h 2012-07-19 14:02:32 +0000 +@@ -11,6 +11,9 @@ + #pragma interface + #endif + ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + #include "splash/SplashTypes.h" + #include "splash/SplashState.h" + #include "splash/Splash.h" + +=== modified file 'filter/pdftoopvp/oprs/OPVPSplashXPath.cxx' +--- filter/pdftoopvp/oprs/OPVPSplashXPath.cxx 2012-03-29 09:42:35 +0000 ++++ filter/pdftoopvp/oprs/OPVPSplashXPath.cxx 2012-07-19 14:02:32 +0000 +@@ -1,5 +1,8 @@ + #include <config.h> + #include <stdio.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + #include "splash/Splash.h" + #include "splash/SplashMath.h" + #include "OPVPSplashClip.h" + +=== modified file 'filter/pdftoopvp/oprs/OPVPSplashXPath.h' +--- filter/pdftoopvp/oprs/OPVPSplashXPath.h 2012-03-29 09:42:35 +0000 ++++ filter/pdftoopvp/oprs/OPVPSplashXPath.h 2012-07-19 14:02:32 +0000 +@@ -2,6 +2,9 @@ + #define OPVPSPLASHXPATH_H + + #include <config.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + #include "splash/SplashXPath.h" + #include "OPVPSplashPath.h" + #include "OPVPSplashState.h" + +=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' +--- filter/pdftoopvp/pdftoopvp.cxx 2012-06-04 16:46:44 +0000 ++++ filter/pdftoopvp/pdftoopvp.cxx 2012-07-19 14:02:32 +0000 +@@ -13,6 +13,9 @@ + #include <unistd.h> + #include <ctype.h> + #include <math.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + #include "goo/GooString.h" + #define GSTRING_H // for old GooString.h + #include "goo/gmem.h" + +=== modified file 'filter/pdftopdf/P2PError.h' +--- filter/pdftopdf/P2PError.h 2012-03-29 14:06:07 +0000 ++++ filter/pdftopdf/P2PError.h 2012-07-19 14:02:32 +0000 +@@ -31,6 +31,9 @@ + #include <config.h> + #include <stdarg.h> + #include <Error.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 + #define p2pError(pos,...) error(errInternal,pos,__VA_ARGS__) + +=== modified file 'filter/pdftopdf/P2PFont.cxx' +--- filter/pdftopdf/P2PFont.cxx 2012-03-29 09:42:35 +0000 ++++ filter/pdftopdf/P2PFont.cxx 2012-07-19 14:02:32 +0000 +@@ -32,6 +32,9 @@ + #include <sys/types.h> + #include <unistd.h> + #include <fcntl.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + #include "goo/gmem.h" + #include "P2PFont.h" + #include "GfxFont.h" + +=== modified file 'filter/pdftopdf/pdftopdf.cxx' +--- filter/pdftopdf/pdftopdf.cxx 2012-06-04 16:46:44 +0000 ++++ filter/pdftopdf/pdftopdf.cxx 2012-07-19 14:02:32 +0000 +@@ -29,6 +29,9 @@ + #include <config.h> + #include <stdio.h> + #include <stdlib.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + #include "goo/GooString.h" + #include "goo/gmem.h" + #include "Object.h" + +=== modified file 'filter/pdftoraster.cxx' +--- filter/pdftoraster.cxx 2012-06-04 16:46:44 +0000 ++++ filter/pdftoraster.cxx 2012-07-19 14:02:32 +0000 +@@ -31,6 +31,9 @@ + #include <config.h> + #include <stdio.h> + #include <stdlib.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + #include "goo/GooString.h" + #include "goo/gmem.h" + #include "Object.h" + |