From f3368e443424bfff2736953bdfa18c10abef48a4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 17 May 2012 09:33:37 +0200 Subject: [PATCH] poppler: split out -qt4 subpkgs into its own pkg to avoid circular dep with qt/cups. --- srcpkgs/poppler-qt4 | 1 - srcpkgs/poppler-qt4-devel | 1 - srcpkgs/poppler-qt4/depends | 1 + .../poppler-qt4-devel.template | 10 ++++----- .../poppler-qt4.rshlibs | 8 +++---- srcpkgs/poppler-qt4/template | 21 +++++++++++++++++++ srcpkgs/poppler/poppler-qt4.template | 12 ----------- srcpkgs/poppler/template | 5 ++--- 8 files changed, 33 insertions(+), 26 deletions(-) delete mode 120000 srcpkgs/poppler-qt4 delete mode 120000 srcpkgs/poppler-qt4-devel create mode 120000 srcpkgs/poppler-qt4/depends rename srcpkgs/{poppler => poppler-qt4}/poppler-qt4-devel.template (63%) rename srcpkgs/{poppler => poppler-qt4}/poppler-qt4.rshlibs (100%) create mode 100644 srcpkgs/poppler-qt4/template delete mode 100644 srcpkgs/poppler/poppler-qt4.template diff --git a/srcpkgs/poppler-qt4 b/srcpkgs/poppler-qt4 deleted file mode 120000 index 5d4379bfb7..0000000000 --- a/srcpkgs/poppler-qt4 +++ /dev/null @@ -1 +0,0 @@ -poppler \ No newline at end of file diff --git a/srcpkgs/poppler-qt4-devel b/srcpkgs/poppler-qt4-devel deleted file mode 120000 index 5d4379bfb7..0000000000 --- a/srcpkgs/poppler-qt4-devel +++ /dev/null @@ -1 +0,0 @@ -poppler \ No newline at end of file diff --git a/srcpkgs/poppler-qt4/depends b/srcpkgs/poppler-qt4/depends new file mode 120000 index 0000000000..2f90cc7131 --- /dev/null +++ b/srcpkgs/poppler-qt4/depends @@ -0,0 +1 @@ +../poppler/depends \ No newline at end of file diff --git a/srcpkgs/poppler/poppler-qt4-devel.template b/srcpkgs/poppler-qt4/poppler-qt4-devel.template similarity index 63% rename from srcpkgs/poppler/poppler-qt4-devel.template rename to srcpkgs/poppler-qt4/poppler-qt4-devel.template index 05509d45a8..45b43df59c 100644 --- a/srcpkgs/poppler/poppler-qt4-devel.template +++ b/srcpkgs/poppler-qt4/poppler-qt4-devel.template @@ -5,13 +5,13 @@ long_desc="${long_desc} This package contains development files for QT 4 bindings." -Add_dependency run poppler-devel ">=${version}" +Add_dependency run poppler-qt4 ">=${version}" -revision=1 +revision=2 -do_install() -{ +do_install() { vmove usr/include/poppler/qt4 usr/include/poppler vmove usr/lib/libpoppler-qt4.a usr/lib - vmove usr/lib/pkgconfig/poppler-qt4.pc usr/lib + vmove usr/lib/pkgconfig/poppler-qt4.pc usr/lib/pkgconfig + rm -rf ${SRCPKGDESTDIR}/usr/include } diff --git a/srcpkgs/poppler/poppler-qt4.rshlibs b/srcpkgs/poppler-qt4/poppler-qt4.rshlibs similarity index 100% rename from srcpkgs/poppler/poppler-qt4.rshlibs rename to srcpkgs/poppler-qt4/poppler-qt4.rshlibs index 3e9e93fa6b..49d20c1099 100644 --- a/srcpkgs/poppler/poppler-qt4.rshlibs +++ b/srcpkgs/poppler-qt4/poppler-qt4.rshlibs @@ -4,13 +4,13 @@ libpng14.so.14 libcurl.so.4 libfreetype.so.6 libfontconfig.so.1 -libQtGui.so.4 -libQtXml.so.4 -libQtCore.so.4 libz.so.1 +libtiff.so.5 libstdc++.so.6 libm.so.6 libc.so.6 libgcc_s.so.1 -libtiff.so.5 libpoppler.so.19 +libQtGui.so.4 +libQtXml.so.4 +libQtCore.so.4 diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template new file mode 100644 index 0000000000..c537584fff --- /dev/null +++ b/srcpkgs/poppler-qt4/template @@ -0,0 +1,21 @@ +# Template file for 'poppler-qt4'. +. ${XBPS_SRCPKGDIR}/poppler/template + +pkgname=poppler-qt4 +wrksrc="poppler-${version}" +short_desc="${short_desc} -- QT bindings" +long_desc="${long_desc} + + This package contains the poppler QT 4 bindings." +configure_args="${configure_args} --disable-poppler-glib --enable-poppler-qt4 +--disable-poppler-cpp --disable-utils --disable-gtk-test" +subpackages="poppler-qt4-devel" + +Add_dependency build qt-devel + +post_install() { + rm -f ${DESTDIR}/usr/lib/libpoppler.* + for f in poppler-cairo poppler-splash poppler; do + rm -f ${DESTDIR}/usr/lib/pkgconfig/${f}.pc + done +} diff --git a/srcpkgs/poppler/poppler-qt4.template b/srcpkgs/poppler/poppler-qt4.template deleted file mode 100644 index 030c28da8a..0000000000 --- a/srcpkgs/poppler/poppler-qt4.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'poppler-qt4'. -# -short_desc="${short_desc} (QT bindings)" -long_desc="${long_desc} - - This package contains ${sourcepkg} QT 4 bindings." - -revision=1 - -do_install() { - vmove "usr/lib/libpoppler-qt4.so*" usr/lib -} diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index a2fa82378d..915bbc3590 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -7,7 +7,7 @@ distfiles="${homepage}/$pkgname-$version.tar.gz" build_style=gnu-configure configure_args="--enable-zlib --enable-libcurl --enable-libjpeg --enable-libtiff --disable-libopenjpeg --enable-cairo-output ---enable-xpdf-headers" +--enable-xpdf-headers --disable-poppler-qt4" short_desc="PDF rendering library" maintainer="Juan RP " license="GPL-2" @@ -24,7 +24,7 @@ long_desc=" subpackages="$pkgname-glib $pkgname-glib-devel $pkgname-utils" subpackages="$subpackages $pkgname-cpp $pkgname-cpp-devel" -subpackages="$subpackages $pkgname-qt4 $pkgname-qt4-devel $pkgname-devel" +subpackages="$subpackages $pkgname-devel" Add_dependency build pkg-config Add_dependency build gobject-introspection @@ -32,4 +32,3 @@ 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