From 6360c1a75ae912ef293018a33d8d262da4862eb0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 4 Sep 2013 10:38:37 +0200 Subject: [PATCH] poppler: update to 0.24.1 (soname bump). --- common/shlibs | 4 +--- srcpkgs/poppler-qt4/template | 12 ++++++------ srcpkgs/poppler/template | 31 +++++++++++++++++-------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/common/shlibs b/common/shlibs index 392ef55aa29..ac2b0a20c9d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -331,9 +331,7 @@ libMagickCore-6.Q16.so.1 libmagick-6.8.4.9_1 libMagickWand-6.Q16.so.1 libmagick-6.8.4.9_1 libMagick++-6.Q16.so.1 libmagick-6.8.4.9_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.26 poppler-0.20.2_1 -libpoppler.so.35 poppler-0.22.2_1 -libpoppler.so.36 poppler-0.22.3_1 +libpoppler.so.43 poppler-0.24.1_1 libpoppler-glib.so.8 poppler-glib-0.18.2_1 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1 libpoppler-qt4.so.4 poppler-qt4-0.22.3_1 diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template index f57726fb457..64534f41fc6 100644 --- a/srcpkgs/poppler-qt4/template +++ b/srcpkgs/poppler-qt4/template @@ -1,7 +1,7 @@ # Template file for 'poppler-qt4'. pkgname=poppler-qt4 -version=0.22.3 -revision=2 +version=0.24.1 +revision=1 wrksrc="poppler-${version}" build_style=gnu-configure configure_args="--enable-zlib --enable-libcurl --enable-libjpeg @@ -12,12 +12,12 @@ configure_args="--enable-zlib --enable-libcurl --enable-libjpeg hostmakedepends="pkg-config" makedepends="libpng-devel>=1.5.10 tiff-devel lcms2-devel libcurl-devel fontconfig-devel cairo-devel qt-devel>=4.8.2_2" -short_desc="PDF rendering library -- QT bindings" +short_desc="PDF rendering library - QT bindings" maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" -distfiles="${homepage}/poppler-$version.tar.gz" -checksum=916a931cbef951366014f13d5f4a574657ccc064ac41051df96dd58e22934431 +distfiles="${homepage}/poppler-$version.tar.xz" +checksum=5cefc01aa0184bd92b0b3999922b62cf09599ebb3d95f553c2f3de02738effc6 long_desc=" This is poppler, a PDF rendering library. It is a fork of the xpdf 3.0 PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. @@ -49,6 +49,6 @@ poppler-qt4-devel_package() { poppler-qt4_package() { depends="poppler-data qt>=4.8.2_2" pkg_install() { - vmove usr + vmove all } } diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index 768a2e5ad06..a55167f6e75 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -1,7 +1,7 @@ # Template build file for 'poppler'. pkgname=poppler -version=0.22.3 -revision=2 +version=0.24.1 +revision=1 build_style=gnu-configure configure_args="--enable-zlib --enable-libcurl --enable-libjpeg --enable-libtiff --disable-libopenjpeg --enable-cairo-output @@ -12,8 +12,8 @@ short_desc="PDF rendering library" maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" -distfiles="${homepage}/$pkgname-$version.tar.gz" -checksum=916a931cbef951366014f13d5f4a574657ccc064ac41051df96dd58e22934431 +distfiles="${homepage}/$pkgname-$version.tar.xz" +checksum=5cefc01aa0184bd92b0b3999922b62cf09599ebb3d95f553c2f3de02738effc6 long_desc=" This is poppler, a PDF rendering library. It is a fork of the xpdf 3.0 PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. @@ -25,9 +25,9 @@ long_desc=" if [ "$CROSS_BUILD" ]; then # needs glib-mkenums - hostmakedepends+=" automake libtool gtk-doc gettext-devel glib-devel" + hostmakedepends+=" libtool glib-devel" pre_configure() { - autoreconf -fi + libtoolize -f } fi @@ -49,30 +49,32 @@ fi poppler-cpp-devel_package() { depends="libstdc++-devel zlib-devel poppler-devel>=${version}" - short_desc+=" -- C++ bindings (development files)" + short_desc+=" - C++ bindings (development files)" pkg_install() { vmove usr/include/poppler/cpp vmove usr/lib/libpoppler-cpp.a + vmove usr/lib/libpoppler-cpp.so vmove usr/lib/pkgconfig/poppler-cpp.pc } } poppler-cpp_package() { - short_desc+=" -- C++ bindings" + short_desc+=" - C++ bindings" pkg_install() { - vmove "usr/lib/libpoppler-cpp.so*" + vmove "usr/lib/libpoppler-cpp.so.*" } } poppler-devel_package() { depends="libglib-devel poppler>=${version}" - short_desc+=" -- development files" + short_desc+=" - development files" pkg_install() { vmove "usr/include/poppler/*.h" vmove usr/include/poppler/splash vmove usr/include/poppler/fofi vmove usr/include/poppler/goo vmove usr/lib/libpoppler.a + vmove usr/lib/libpoppler.so vmove usr/lib/pkgconfig/poppler.pc vmove usr/lib/pkgconfig/poppler-splash.pc vmove usr/share/gtk-doc @@ -81,10 +83,11 @@ poppler-devel_package() { poppler-glib-devel_package() { depends="poppler-devel>=${version} poppler-glib>=${version}" - short_desc+=" -- GLib bindings (development files)" + short_desc+=" - GLib bindings (development files)" pkg_install() { vmove usr/include/poppler/glib vmove usr/lib/libpoppler-glib.a + vmove usr/lib/libpoppler-glib.so if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi @@ -94,9 +97,9 @@ poppler-glib-devel_package() { } poppler-glib_package() { - short_desc+=" -- GLib bindings" + short_desc+=" - GLib bindings" pkg_install() { - vmove "usr/lib/libpoppler-glib.so*" + vmove "usr/lib/libpoppler-glib.so.*" if [ "$build_option_gir" ]; then vmove usr/lib/girepository-1.0 fi @@ -104,7 +107,7 @@ poppler-glib_package() { } poppler-utils_package() { - short_desc+=" -- utilities" + short_desc+=" - utilities" pkg_install() { vmove usr/bin vmove usr/share/man