From 6c664fc2212b042b869e1454c4ace12b2976e711 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 4 Mar 2018 22:52:42 +0000 Subject: [PATCH] poppler: update to 0.62.0. (soname bump) removed poppler-qt4 --- common/shlibs | 3 +-- srcpkgs/poppler-qt4/patches | 1 - srcpkgs/poppler-qt4/template | 43 ------------------------------------ srcpkgs/poppler-qt4/update | 1 - srcpkgs/poppler/template | 6 ++--- 5 files changed, 4 insertions(+), 50 deletions(-) delete mode 120000 srcpkgs/poppler-qt4/patches delete mode 100644 srcpkgs/poppler-qt4/template delete mode 100644 srcpkgs/poppler-qt4/update diff --git a/common/shlibs b/common/shlibs index 88a226f1e4a..04ddd22c1fc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -337,10 +337,9 @@ libMagickCore-6.Q16.so.5 libmagick-6.9.9.0_1 libMagickWand-6.Q16.so.5 libmagick-6.9.9.0_1 libMagick++-6.Q16.so.8 libmagick-6.9.9.0_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.72 poppler-0.61.1_1 +libpoppler.so.73 poppler-0.62.0_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 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1 libtcl8.6.so tcl-8.6.0_1 libtk8.6.so tk-8.6.1_3 diff --git a/srcpkgs/poppler-qt4/patches b/srcpkgs/poppler-qt4/patches deleted file mode 120000 index 63a7fef5e20..00000000000 --- a/srcpkgs/poppler-qt4/patches +++ /dev/null @@ -1 +0,0 @@ -../poppler/patches/ \ No newline at end of file diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template deleted file mode 100644 index 79b01639bbc..00000000000 --- a/srcpkgs/poppler-qt4/template +++ /dev/null @@ -1,43 +0,0 @@ -# Template file for 'poppler-qt4' -# -# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler"; IT IS SPLITTED TO AVOID -# A CYCLIC DEPENDENCY: qt -> cups -> poppler -> qt. -# -pkgname=poppler-qt4 -version=0.61.1 -revision=1 -wrksrc="poppler-${version}" -build_style=cmake -configure_args="-DENABLE_XPDF_HEADERS=on -DENABLE_GLIB=off - -DENABLE_QT4=on -DENABLE_QT5=off -DENABLE_UTILS=off -DENABLE_CPP=off" -hostmakedepends="pkg-config qt-devel" -makedepends="libpng-devel tiff-devel lcms2-devel libcurl-devel - fontconfig-devel cairo-devel libopenjpeg2-devel qt-devel" -short_desc="PDF rendering library - Qt4 bindings" -maintainer="Juan RP " -license="GPL-2" -homepage="http://poppler.freedesktop.org" -distfiles="${homepage}/poppler-$version.tar.xz" -checksum=1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 - -if [ "$CROSS_BUILD" ]; then - configure_args+=" -DTHREADS_PTHREAD_ARG=2" -fi - -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 -} - -poppler-qt4-devel_package() { - depends="poppler-devel>=${version} ${sourcepkg}-${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include/poppler/qt4 - vmove usr/lib/libpoppler-qt4.so - vmove usr/lib/pkgconfig/poppler-qt4.pc - rm -rf ${DESTDIR}/usr/include - } -} diff --git a/srcpkgs/poppler-qt4/update b/srcpkgs/poppler-qt4/update deleted file mode 100644 index 53821bc929c..00000000000 --- a/srcpkgs/poppler-qt4/update +++ /dev/null @@ -1 +0,0 @@ -pkgname=poppler diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index 416b754b890..b334aca0745 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -1,9 +1,9 @@ # Template file for 'poppler' # -# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt{4,5}". +# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=0.61.1 +version=0.62.0 revision=1 build_style=cmake configure_args="-DENABLE_XPDF_HEADERS=on $(vopt_if gir -DENABLE_GLIB=on) @@ -17,7 +17,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/$pkgname-$version.tar.xz" -checksum=1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 +checksum=5b9a73dfd4d6f61d165ada1e4f0abd2d420494bf9d0b1c15d0db3f7b83a729c6 if [ "$CROSS_BUILD" ]; then configure_args+=" -DTHREADS_PTHREAD_ARG=2"