[arch-commits] Commit in poppler/trunk (PKGBUILD git-fixes.patch)
Jan de Groot
jgc at archlinux.org
Mon Nov 7 10:15:32 UTC 2011
Date: Monday, November 7, 2011 @ 05:15:32
Author: jgc
Revision: 142253
upgpkg: poppler 0.18.1-1
Update to 0.18.1
Add files for test suite, add check() function
Soname bump for libpoppler.so.18, requires rebuild (https://www.archlinux.org/todo/108/)
Added:
poppler/trunk/git-fixes.patch
Modified:
poppler/trunk/PKGBUILD
-----------------+
PKGBUILD | 24 ++++++++----
git-fixes.patch | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-11-07 09:31:56 UTC (rev 142252)
+++ PKGBUILD 2011-11-07 10:15:32 UTC (rev 142253)
@@ -3,24 +3,27 @@
pkgbase=poppler
pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.18.0
-pkgrel=2
+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
- fix_cairo.patch::http://cgit.freedesktop.org/poppler/poppler/patch/?id=66ab373365b8f9060ff3d117bb677520e32c7e8e)
-md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77'
- '8f4a296fdd98446858d5ea74d7c496ab')
+ 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
- autoreconf
+ patch -Np1 -i "${srcdir}/git-fixes.patch"
- patch -Np1 -i "${srcdir}/fix_cairo.patch"
+ autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
@@ -32,6 +35,13 @@
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')
Added: git-fixes.patch
===================================================================
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-11-07 10:15:32 UTC (rev 142253)
@@ -0,0 +1,107 @@
+From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc at 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 at 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 at 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
More information about the arch-commits
mailing list