From 2ce5d98a6ba2d339edf36c7212f57c10f4f47375 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 31 Jan 2012 18:25:49 +0100 Subject: [PATCH] poppler: update to 0.18.2, bump abi_depends. --- common/shlibs | 2 +- srcpkgs/poppler/depends | 2 +- srcpkgs/poppler/poppler-cpp.rshlibs | 2 +- srcpkgs/poppler/poppler-cpp.template | 5 +---- srcpkgs/poppler/poppler-glib.rshlibs | 2 +- srcpkgs/poppler/poppler-glib.template | 5 +---- srcpkgs/poppler/poppler-qt4.rshlibs | 2 +- srcpkgs/poppler/poppler-qt4.template | 5 +---- srcpkgs/poppler/poppler-utils.rshlibs | 2 +- srcpkgs/poppler/poppler-utils.template | 4 +--- srcpkgs/poppler/template | 13 ++++++------- 11 files changed, 16 insertions(+), 28 deletions(-) diff --git a/common/shlibs b/common/shlibs index 25a62b335f..ba7ab030b9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -316,7 +316,7 @@ libMagickWand.so.5 libmagick libmagick-devel libMagick++.so.5 libmagick libmagick-devel libltdl.so.7 libltdl libltdl-devel libpoppler-glib.so.8 poppler-glib poppler-glib-devel -libpoppler.so.18 poppler poppler-devel +libpoppler.so.19 poppler poppler-devel libpoppler-cpp.so.0 poppler-cpp poppler-cpp-devel libpoppler-qt4.so.3 poppler-qt4 poppler-qt4-devel libtcl8.5.so tcl tcl-devel diff --git a/srcpkgs/poppler/depends b/srcpkgs/poppler/depends index 20abab138f..33e01087ae 100644 --- a/srcpkgs/poppler/depends +++ b/srcpkgs/poppler/depends @@ -1,2 +1,2 @@ -abi_depends=">=0.18.0" +abi_depends=">=0.18.2" api_depends="${abi_depends}" diff --git a/srcpkgs/poppler/poppler-cpp.rshlibs b/srcpkgs/poppler/poppler-cpp.rshlibs index 0fe8fd69e3..4c5d7dbd27 100644 --- a/srcpkgs/poppler/poppler-cpp.rshlibs +++ b/srcpkgs/poppler/poppler-cpp.rshlibs @@ -1,4 +1,3 @@ -libpoppler.so.18 liblcms.so.1 libjpeg.so.8 libpng14.so.14 @@ -11,3 +10,4 @@ libm.so.6 libc.so.6 libgcc_s.so.1 libtiff.so.5 +libpoppler.so.19 diff --git a/srcpkgs/poppler/poppler-cpp.template b/srcpkgs/poppler/poppler-cpp.template index e4695089e4..2a15d09cc5 100644 --- a/srcpkgs/poppler/poppler-cpp.template +++ b/srcpkgs/poppler/poppler-cpp.template @@ -1,13 +1,10 @@ # Template file for 'poppler-cpp'. # -revision=2 short_desc="${short_desc} (C++ bindings)" long_desc="${long_desc} This package contains ${sourcepkg} C++ bindings." - -do_install() -{ +do_install() { vmove "usr/lib/libpoppler-cpp.so*" usr/lib } diff --git a/srcpkgs/poppler/poppler-glib.rshlibs b/srcpkgs/poppler/poppler-glib.rshlibs index 701a1fea29..66882179a8 100644 --- a/srcpkgs/poppler/poppler-glib.rshlibs +++ b/srcpkgs/poppler/poppler-glib.rshlibs @@ -1,4 +1,3 @@ -libpoppler.so.18 liblcms.so.1 libjpeg.so.8 libpng14.so.14 @@ -16,3 +15,4 @@ libm.so.6 libc.so.6 libgcc_s.so.1 libtiff.so.5 +libpoppler.so.19 diff --git a/srcpkgs/poppler/poppler-glib.template b/srcpkgs/poppler/poppler-glib.template index 119e387a5f..4a5748f6ae 100644 --- a/srcpkgs/poppler/poppler-glib.template +++ b/srcpkgs/poppler/poppler-glib.template @@ -1,14 +1,11 @@ # Template file for 'poppler-glib'. # -revision=2 short_desc="${short_desc} (GLib bindings)" long_desc="${long_desc} This package contains ${sourcepkg} GTK/GLib bindings." - -do_install() -{ +do_install() { vmove "usr/lib/libpoppler-glib.so*" usr/lib vmove usr/lib/girepository-1.0 usr/lib } diff --git a/srcpkgs/poppler/poppler-qt4.rshlibs b/srcpkgs/poppler/poppler-qt4.rshlibs index bac4fefb3c..3e9e93fa6b 100644 --- a/srcpkgs/poppler/poppler-qt4.rshlibs +++ b/srcpkgs/poppler/poppler-qt4.rshlibs @@ -1,4 +1,3 @@ -libpoppler.so.18 liblcms.so.1 libjpeg.so.8 libpng14.so.14 @@ -14,3 +13,4 @@ libm.so.6 libc.so.6 libgcc_s.so.1 libtiff.so.5 +libpoppler.so.19 diff --git a/srcpkgs/poppler/poppler-qt4.template b/srcpkgs/poppler/poppler-qt4.template index a941a890c7..74518295ee 100644 --- a/srcpkgs/poppler/poppler-qt4.template +++ b/srcpkgs/poppler/poppler-qt4.template @@ -1,13 +1,10 @@ # Template file for 'poppler-qt4'. # -revision=2 short_desc="${short_desc} (QT bindings)" long_desc="${long_desc} This package contains ${sourcepkg} QT 4 bindings." - -do_install() -{ +do_install() { vmove "usr/lib/libpoppler-qt4.so*" usr/lib } diff --git a/srcpkgs/poppler/poppler-utils.rshlibs b/srcpkgs/poppler/poppler-utils.rshlibs index 4054ebb078..e8ca48d8bc 100644 --- a/srcpkgs/poppler/poppler-utils.rshlibs +++ b/srcpkgs/poppler/poppler-utils.rshlibs @@ -1,4 +1,3 @@ -libpoppler.so.18 libstdc++.so.6 libpthread.so.0 libc.so.6 @@ -15,3 +14,4 @@ libgobject-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libgcc_s.so.1 i686 +libpoppler.so.19 diff --git a/srcpkgs/poppler/poppler-utils.template b/srcpkgs/poppler/poppler-utils.template index 675b45230a..4136c78be7 100644 --- a/srcpkgs/poppler/poppler-utils.template +++ b/srcpkgs/poppler/poppler-utils.template @@ -1,13 +1,11 @@ # Template file for 'poppler-utils'. # -revision=2 short_desc="${short_desc} (utilities)" long_desc="${long_desc} This package contains the ${sourcepkg} binary utilities." -do_install() -{ +do_install() { vmove usr/bin usr vmove usr/share/man usr/share } diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index d4476dbaed..14a93f1289 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -1,16 +1,15 @@ # Template build file for 'poppler'. pkgname=poppler -version=0.18.0 +version=0.18.2 homepage="http://poppler.freedesktop.org" distfiles="${homepage}/$pkgname-$version.tar.gz" build_style=gnu-configure configure_args="--enable-zlib --enable-libcurl --enable-libjpeg --enable-libtiff --disable-libopenjpeg" -revision=3 short_desc="PDF rendering library" maintainer="Juan RP " license="GPL-2" -checksum=9019b15ef10a878e607e4088a27fb4967f61cdfada7806d0fee97954f76648e8 +checksum=b15f6b461fd2ba59cf98e64751ba26edc4a9976f896fb2019d8b3b1aa8c95b52 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. @@ -27,8 +26,8 @@ subpackages="$subpackages $pkgname-qt4 $pkgname-qt4-devel" Add_dependency build pkg-config Add_dependency build gobject-introspection -Add_dependency build gtk+-devel -Add_dependency build lcms-devel -Add_dependency build qt-devel -Add_dependency build libcurl-devel Add_dependency build tiff-devel +Add_dependency build lcms-devel +Add_dependency build libcurl-devel +Add_dependency build gtk+-devel +Add_dependency build qt-devel