From 48ee4b0a22d7bf2d0c892e47e764913eea34ea71 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 11 Jul 2015 08:54:28 +0200 Subject: [PATCH 1/9] poppler: update to 0.34.0. --- common/shlibs | 2 +- srcpkgs/poppler/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index b3ec2799c4e..2e9adaa46b3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -354,7 +354,7 @@ libMagickCore-6.Q16.so.2 libmagick-6.8.8.4_1 libMagickWand-6.Q16.so.2 libmagick-6.8.8.4_1 libMagick++-6.Q16.so.6 libmagick-6.9.0.5_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.52 poppler-0.33.0_1 +libpoppler.so.53 poppler-0.34.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 diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index 1318efccdfb..40f16700e1d 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt{4,5}". # pkgname=poppler -version=0.33.0 +version=0.34.0 revision=1 build_style=gnu-configure configure_args="--enable-zlib --enable-libcurl --enable-libjpeg @@ -19,7 +19,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/$pkgname-$version.tar.xz" -checksum=a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6 +checksum=1ba4ba9a2f9eb1e62ee6d736f4d82be4fc5f6dd177dc2b03febbe2ef2e515cb0 # Package build options build_options="gir" From 09a2c30329058ff465aa35ae4f43e60852ef5688 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 11 Jul 2015 08:54:32 +0200 Subject: [PATCH 2/9] poppler-qt4: update to 0.34.0. --- srcpkgs/poppler-qt4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template index c6edde6e9a7..37efdb3ec9c 100644 --- a/srcpkgs/poppler-qt4/template +++ b/srcpkgs/poppler-qt4/template @@ -4,7 +4,7 @@ # A CYCLIC DEPENDENCY: qt -> cups -> poppler -> qt. # pkgname=poppler-qt4 -version=0.33.0 +version=0.34.0 revision=1 wrksrc="poppler-${version}" build_style=gnu-configure @@ -21,7 +21,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/poppler-$version.tar.xz" -checksum=a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6 +checksum=1ba4ba9a2f9eb1e62ee6d736f4d82be4fc5f6dd177dc2b03febbe2ef2e515cb0 post_install() { rm -f ${DESTDIR}/usr/lib/libpoppler.* From e04d189517edc0437f9e9bf446b11d15ecf77b74 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 15 Jul 2015 18:08:21 +0200 Subject: [PATCH 3/9] poppler-qt5: update to 0.34.0. --- srcpkgs/poppler-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/poppler-qt5/template b/srcpkgs/poppler-qt5/template index f39c73e0dc0..ed6ba6556f8 100644 --- a/srcpkgs/poppler-qt5/template +++ b/srcpkgs/poppler-qt5/template @@ -4,7 +4,7 @@ # A CYCLIC DEPENDENCY: qt5 -> cups -> poppler -> qt5. # pkgname=poppler-qt5 -version=0.33.0 +version=0.34.0 revision=1 wrksrc="poppler-${version}" build_style=gnu-configure @@ -21,7 +21,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/poppler-$version.tar.xz" -checksum=a5fa6d7f7dc5382b48caca82b147c54bdffda02698611af76db5326ba64995a6 +checksum=1ba4ba9a2f9eb1e62ee6d736f4d82be4fc5f6dd177dc2b03febbe2ef2e515cb0 post_install() { rm -f ${DESTDIR}/usr/lib/libpoppler.* From be0e6b65355bc81c8eb92fcc3c6884a5b43d0ca0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 15 Jul 2015 18:13:04 +0200 Subject: [PATCH 4/9] cups-filters: revbump to rebuild with poppler-0.34.0. --- srcpkgs/cups-filters/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index 0c310b7f717..e29f302c9ca 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -1,7 +1,7 @@ # Template file for 'cups-filters' pkgname=cups-filters version=1.0.71 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-rcdir=no --enable-avahi --with-browseremoteprotocols=DNSSD,CUPS" From d9ca9d5f050aa04ba34ff62f0730a54cc97a1f18 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 15 Jul 2015 18:13:36 +0200 Subject: [PATCH 5/9] evas_generic_loaders: revbump to rebuild with poppler-0.34.0. --- srcpkgs/evas_generic_loaders/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/evas_generic_loaders/template b/srcpkgs/evas_generic_loaders/template index afe51272b1d..a714406229a 100644 --- a/srcpkgs/evas_generic_loaders/template +++ b/srcpkgs/evas_generic_loaders/template @@ -1,7 +1,7 @@ # Template file for 'evas_generic_loaders' pkgname=evas_generic_loaders version=1.14.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="$(vopt_enable gstreamer) $(vopt_enable pdf poppler) $(vopt_enable ps spectre) $(vopt_enable svg) $(vopt_enable raw libraw)" From 9604dd7368cfe78c77a02dc40ea2c195f7c54859 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 15 Jul 2015 18:14:04 +0200 Subject: [PATCH 6/9] inkscape: revbump to rebuild with poppler-0.34.0. --- srcpkgs/inkscape/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 155c000044b..8573884928c 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=0.91 -revision=5 +revision=6 build_style=gnu-configure configure_args="--enable-lcms --enable-poppler-cairo --without-gnome-vfs --disable-static" From 214576e871132498f48b79b1e6351e542f8e014b Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 15 Jul 2015 18:14:23 +0200 Subject: [PATCH 7/9] ipe: revbump to rebuild with poppler-0.34.0. --- srcpkgs/ipe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index 4cd4b578760..f83e35aad66 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,7 +1,7 @@ # Template file for 'ipe' pkgname=ipe version=7.1.7 -revision=6 +revision=7 hostmakedepends="pkg-config git" makedepends="qt-devel lua-devel libjpeg-turbo-devel cairo-devel poppler-devel" short_desc="Drawing editor for creating figures in PDF or EPS formats" From 7869c6fd39f24535330694b3f59459ff5031251f Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 15 Jul 2015 18:46:54 +0200 Subject: [PATCH 8/9] ipe: fix xlint. --- srcpkgs/ipe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index f83e35aad66..a4f8f417e36 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -8,7 +8,7 @@ short_desc="Drawing editor for creating figures in PDF or EPS formats" maintainer="Christian Neukirchen " license="GPL-3, GPL-2" homepage="http://ipe7.sourceforge.net/" -distfiles="https://github.com/otfried/${pkgname}/raw/master/releases/${version%.*}/${pkgname}-${version}-src.tar.gz" +distfiles="https://github.com/otfried/${pkgname}/raw/master/releases/${version%.*}/${pkgname}-${version}-src.tar.gz" checksum=ec670cd7f0fa521271fc54bf9b663570d82280bdbe405be6de59535fec7c00d2 post_extract() { From a214eae68064357b74475afc9ba1edda1198db0c Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 16 Jul 2015 23:01:42 +0200 Subject: [PATCH 9/9] cups-filter: add compat patch for poppler 0.34. --- .../cups-filters/patches/poppler0340.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/cups-filters/patches/poppler0340.patch diff --git a/srcpkgs/cups-filters/patches/poppler0340.patch b/srcpkgs/cups-filters/patches/poppler0340.patch new file mode 100644 index 00000000000..ab858c0ac08 --- /dev/null +++ b/srcpkgs/cups-filters/patches/poppler0340.patch @@ -0,0 +1,38 @@ +Hack to make this build against poppler-0.34. Just disables color management in some places. +We should probably find a better solution. dilfridge@gentoo.org + + +diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx +--- filter/pdftoopvp/OPVPOutputDev.cxx 2015-06-26 17:45:26.000000000 +0200 ++++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:02:51.666737621 +0200 +@@ -1812,9 +1812,15 @@ + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, mat); + #else ++#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, + mat,gFalse); ++#else ++ maskSplash->drawImage(&imageSrc, NULL, &imgMaskData, ++ splashModeMono8, gFalse, maskWidth, maskHeight, ++ mat,gFalse); ++#endif + #endif + delete imgMaskData.imgStr; + maskStr->close(); +diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx +--- filter/pdftoopvp/oprs/OPRS.cxx 2015-06-26 17:45:26.000000000 +0200 ++++ filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:00:20.655740720 +0200 +@@ -241,7 +241,11 @@ + #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); + #else ++#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); ++#else ++ return splash->drawImage(src,NULL,srcData,srcMode,srcAlpha,w,h,mat,gFalse); ++#endif + #endif + } else { + return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);