From 20093232cc850732f971b18c7e23e691cc0de690 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 9 Jun 2010 15:50:25 +0200 Subject: [PATCH] poppler: update to 0.14.0, bump abi_depends. --- srcpkgs/poppler-cpp | 1 + srcpkgs/poppler-cpp-devel | 1 + srcpkgs/poppler/depends | 2 +- srcpkgs/poppler/poppler-cpp-devel.template | 22 +++++++++++++++++++++ srcpkgs/poppler/poppler-cpp.template | 18 +++++++++++++++++ srcpkgs/poppler/poppler-devel.template | 2 -- srcpkgs/poppler/poppler-glib-devel.template | 2 -- srcpkgs/poppler/poppler-glib.template | 2 -- srcpkgs/poppler/poppler-qt4-devel.template | 2 -- srcpkgs/poppler/poppler-qt4.template | 2 -- srcpkgs/poppler/template | 11 +++++++---- xbps-src/common/mapping_shlib_binpkg.txt | 1 + 12 files changed, 51 insertions(+), 15 deletions(-) create mode 120000 srcpkgs/poppler-cpp create mode 120000 srcpkgs/poppler-cpp-devel create mode 100644 srcpkgs/poppler/poppler-cpp-devel.template create mode 100644 srcpkgs/poppler/poppler-cpp.template diff --git a/srcpkgs/poppler-cpp b/srcpkgs/poppler-cpp new file mode 120000 index 00000000000..5d4379bfb79 --- /dev/null +++ b/srcpkgs/poppler-cpp @@ -0,0 +1 @@ +poppler \ No newline at end of file diff --git a/srcpkgs/poppler-cpp-devel b/srcpkgs/poppler-cpp-devel new file mode 120000 index 00000000000..5d4379bfb79 --- /dev/null +++ b/srcpkgs/poppler-cpp-devel @@ -0,0 +1 @@ +poppler \ No newline at end of file diff --git a/srcpkgs/poppler/depends b/srcpkgs/poppler/depends index 24fd32278f2..3d77fdf442f 100644 --- a/srcpkgs/poppler/depends +++ b/srcpkgs/poppler/depends @@ -1,2 +1,2 @@ -abi_depends=">=0.10.6" +abi_depends=">=0.14.0" api_depends="${abi_depends}" diff --git a/srcpkgs/poppler/poppler-cpp-devel.template b/srcpkgs/poppler/poppler-cpp-devel.template new file mode 100644 index 00000000000..10ebf89cee4 --- /dev/null +++ b/srcpkgs/poppler/poppler-cpp-devel.template @@ -0,0 +1,22 @@ +# Template file for 'poppler-cpp-devel'. +# +short_desc="${sourcepkg} C++ bindings (development files)" +long_desc="${long_desc} + + This package contains development files for C++ bindings." + +Add_dependency run glibc-devel +Add_dependency run libstdc++-devel +Add_dependency run zlib-devel +Add_dependency run poppler-devel + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib/pkgconfig \ + ${DESTDIR}/usr/include/poppler + mv ${SRCPKGDESTDIR}/usr/include/poppler/cpp \ + ${DESTDIR}/usr/include/poppler + mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-cpp.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/poppler-cpp.pc \ + ${DESTDIR}/usr/lib/pkgconfig +} diff --git a/srcpkgs/poppler/poppler-cpp.template b/srcpkgs/poppler/poppler-cpp.template new file mode 100644 index 00000000000..422269d5611 --- /dev/null +++ b/srcpkgs/poppler/poppler-cpp.template @@ -0,0 +1,18 @@ +# Template file for 'poppler-cpp'. +# +short_desc="${short_desc} (C++ bindings)" +long_desc="${long_desc} + + This package contains ${sourcepkg} C++ bindings." + +Add_dependency run libgcc +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run zlib +Add_dependency run poppler + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-cpp.so* ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/poppler/poppler-devel.template b/srcpkgs/poppler/poppler-devel.template index 70cf8b53f7a..2e3638c529f 100644 --- a/srcpkgs/poppler/poppler-devel.template +++ b/srcpkgs/poppler/poppler-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run pkg-config Add_dependency run gtk+-devel Add_dependency run jpeg-devel diff --git a/srcpkgs/poppler/poppler-glib-devel.template b/srcpkgs/poppler/poppler-glib-devel.template index 3ab18bc56cf..c008b661938 100644 --- a/srcpkgs/poppler/poppler-glib-devel.template +++ b/srcpkgs/poppler/poppler-glib-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains development files for GTK+/Glib bindings." -revision=1 - Add_dependency run pango-devel Add_dependency run freetype-devel Add_dependency run fontconfig-devel diff --git a/srcpkgs/poppler/poppler-glib.template b/srcpkgs/poppler/poppler-glib.template index b613274eee1..d9fce774b9c 100644 --- a/srcpkgs/poppler/poppler-glib.template +++ b/srcpkgs/poppler/poppler-glib.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains ${sourcepkg} GTK/GLib bindings." -revision=1 - Add_dependency run libgcc Add_dependency run glibc Add_dependency run libstdc++ diff --git a/srcpkgs/poppler/poppler-qt4-devel.template b/srcpkgs/poppler/poppler-qt4-devel.template index 11f7eac6ff1..fbb2b476e46 100644 --- a/srcpkgs/poppler/poppler-qt4-devel.template +++ b/srcpkgs/poppler/poppler-qt4-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains development files for QT 4 bindings." -revision=1 - Add_dependency run glibc-devel Add_dependency run libstdc++-devel Add_dependency run zlib-devel diff --git a/srcpkgs/poppler/poppler-qt4.template b/srcpkgs/poppler/poppler-qt4.template index 47d5de14705..a4c79b7d46e 100644 --- a/srcpkgs/poppler/poppler-qt4.template +++ b/srcpkgs/poppler/poppler-qt4.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains ${sourcepkg} QT 4 bindings." -revision=1 - Add_dependency run libgcc Add_dependency run glibc Add_dependency run libstdc++ diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index fcb23057546..1c5dbf5c39d 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -1,14 +1,13 @@ # Template build file for 'poppler'. pkgname=poppler -version=0.12.4 -revision=2 +version=0.14.0 distfiles="http://poppler.freedesktop.org/$pkgname-$version.tar.gz" build_style=gnu_configure -configure_args="--enable-zlib --disable-poppler-qt +configure_args="--enable-zlib --disable-poppler-qt --enable-libcurl --enable-libjpeg --disable-libopenjpeg --disable-abiword-output" short_desc="PDF rendering library" maintainer="Juan RP " -checksum=2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a +checksum=aba6fff01a90b44ac6f4ed570d52a43c9790e0445ceaab59abe23d0c7c87bcaf 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. @@ -20,6 +19,7 @@ long_desc=" xpdf." subpackages="$pkgname-devel $pkgname-glib $pkgname-glib-devel $pkgname-utils" +subpackages="$subpackages $pkgname-cpp $pkgname-cpp-devel" subpackages="$subpackages $pkgname-qt4 $pkgname-qt4-devel" Add_dependency run libgcc @@ -31,6 +31,8 @@ Add_dependency run libpng Add_dependency run lcms Add_dependency run freetype Add_dependency run fontconfig +Add_dependency run libcurl + Add_dependency build pkg-config Add_dependency build gtk+-devel Add_dependency build jpeg-devel @@ -40,3 +42,4 @@ Add_dependency build fontconfig-devel Add_dependency build libpng-devel Add_dependency build zlib-devel Add_dependency build qt-devel +Add_dependency build libcurl-devel diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index c296bba86db..24de5ced0e3 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -305,6 +305,7 @@ libMagick++.so libmagick libmagick-devel libltdl.so libltdl libltdl-devel libpoppler-glib.so poppler-glib poppler-glib-devel libpoppler.so poppler poppler-devel +libpoppler-cpp.so poppler-cpp poppler-cpp-devel libtcl8.5.so tcl tcl-devel libsqlite3.so sqlite sqlite-devel libtclsqlite3.so sqlite-tcl sqlite-devel