diff options
author | root <root@rshg054.dnsready.net> | 2011-11-08 23:14:49 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-11-08 23:14:49 +0000 |
commit | ddba9670c1518d9b420db6a6dca01a4a4a4136c7 (patch) | |
tree | 8b5ba5ea49ecb6848eba27d2eb609100de5e760a /staging/poppler | |
parent | effb26c3b1f00bf8bea4e2562f07f9a06eb67606 (diff) |
Tue Nov 8 23:14:49 UTC 2011
Diffstat (limited to 'staging/poppler')
-rw-r--r-- | staging/poppler/PKGBUILD | 83 | ||||
-rw-r--r-- | staging/poppler/git-fixes.patch | 107 |
2 files changed, 190 insertions, 0 deletions
diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD new file mode 100644 index 000000000..a07f2f24f --- /dev/null +++ b/staging/poppler/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 142254 2011-11-07 10:16:14Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=poppler +pkgname=('poppler' 'poppler-glib' 'poppler-qt') +pkgver=0.18.1 +pkgrel=1 +arch=(i686 x86_64) +license=('GPL') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://poppler.freedesktop.org/" +_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz + http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 + git-fixes.patch) +md5sums=('d30e883a27423c936ef338ce1d967e2d' + '9dc64c254a31e570507bdd4ad4ba629a' + 'a73ba6515aa73cb20c480692da52c79e') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' configure.ac + patch -Np1 -i "${srcdir}/git-fixes.patch" + + autoreconf -fi + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-cairo-output \ + --enable-xpdf-headers \ + --enable-libjpeg --enable-zlib \ + --enable-poppler-qt4 \ + --enable-poppler-glib + make +} + +check() { + cd "${srcdir}" + ln -sf test-${_testtag} test + cd ${pkgbase}-${pkgver} + make check +} + +package_poppler() { + pkgdesc="PDF rendering library based on xpdf 3.0" + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') + conflicts=("poppler-qt3<${pkgver}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -e 's/^glib_subdir =.*/glib_subdir =/' \ + -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc +} + +package_poppler-glib() { + pkgdesc="Poppler glib bindings" + depends=("poppler=${pkgver}" 'glib2') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/glib" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* + rm -f "${pkgdir}/usr/bin/poppler-glib-demo" +} + +package_poppler-qt() { + pkgdesc="Poppler Qt bindings" + depends=("poppler=${pkgver}" 'qt') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/qt4" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} diff --git a/staging/poppler/git-fixes.patch b/staging/poppler/git-fixes.patch new file mode 100644 index 000000000..a18a31aec --- /dev/null +++ b/staging/poppler/git-fixes.patch @@ -0,0 +1,107 @@ +From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun, 30 Oct 2011 15:02:19 +0000 +Subject: pdftocairo: Make sure beginDocument() is always called + +This fixes a crash when rendering only odd/even pages in a printing +format. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index e458ee5..1b67c90 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) { + lastPage = firstPage; + } + ++ // Make sure firstPage is always used so that beginDocument() is called ++ if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ firstPage++; ++ + cairoOut = new CairoOutputDev(); + cairoOut->startDoc(doc->getXRef(), doc->getCatalog()); + if (sz != 0) +-- +cgit v0.9.0.2-2-gbebe +From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun, 30 Oct 2011 15:08:46 +0000 +Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable + +This fixes an error in my previous commit. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index 1b67c90..d0d1ec6 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) { + } + + // Make sure firstPage is always used so that beginDocument() is called +- if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1)) + firstPage++; + + cairoOut = new CairoOutputDev(); +-- +cgit v0.9.0.2-2-gbebe +From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001 +From: Rex Dieter <rdieter@math.unl.edu> +Date: Tue, 01 Nov 2011 08:40:53 +0000 +Subject: Fix pkg-config files + +We were using $FOO_REQUIRED instead of @FOO_REQUIRED@ +--- +diff --git a/configure.ac b/configure.ac +index 3a120ca..c4f5b92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then + POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="" + + GLIB_REQUIRED=2.18 ++ AC_SUBST(GLIB_REQUIRED) + AC_ARG_ENABLE(poppler-glib, + AC_HELP_STRING([--disable-poppler-glib], + [Don't compile poppler glib wrapper.]), +diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in +index 55a2278..5fcb6f2 100644 +--- a/poppler-glib-uninstalled.pc.in ++++ b/poppler-glib-uninstalled.pc.in +@@ -1,7 +1,7 @@ + Name: poppler-glib + Description: GLib wrapper for poppler - uninstalled + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + + Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la + Cflags: -I${pc_top_builddir}/${pcfiledir}/glib +diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake +index 3264ed6..e15e669 100644 +--- a/poppler-glib.pc.cmake ++++ b/poppler-glib.pc.cmake +@@ -6,7 +6,7 @@ includedir=${prefix}/include + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @POPPLER_VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in +index 04d9bb9..9ba8978 100644 +--- a/poppler-glib.pc.in ++++ b/poppler-glib.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +-- +cgit v0.9.0.2-2-gbebe |