diff --git a/common/shlibs b/common/shlibs index bec392dae00..cfb58455321 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/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); 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" 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)" 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" diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index 4cd4b578760..a4f8f417e36 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,14 +1,14 @@ # 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" 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() { 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.* 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.* 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"