From 0fb71e0215ed52863e462cccef73c01aff44d43d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Dec 2017 15:11:02 +0000 Subject: gentoo resync : 18.12.2017 --- x11-libs/gdk-pixbuf/Manifest | 4 +- .../files/2.36.11-fix-libtiff-disable.patch | 26 +++++ x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild | 119 ------------------- x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild | 126 +++++++++++++++++++++ 4 files changed, 155 insertions(+), 120 deletions(-) create mode 100644 x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch delete mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild create mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild (limited to 'x11-libs/gdk-pixbuf') diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index 2fd54c647814..a94536cb95e2 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,8 +1,10 @@ AUX 2.36.10-fix-tiff-loader.patch 2300 BLAKE2B 19724c9585802d8a30bbb67247366e43614d8926ed3cc826f37b74420cbdd93b90be011571ae2cbfc8e7b4cf7d6c7f17410819f412e3b331ead9b5e186ce50fd SHA512 e1c04c53b74cc62c63f144b3f9b1ac4246709c809d92ac29dda973ce17232c87fdde6dbceb1295b87d1dad93eb1b2dcf55038c6072bdaac021d96cef3129bd59 +AUX 2.36.11-fix-libtiff-disable.patch 879 BLAKE2B bc50115c3255892187a3e78b5f02770690776913284cb4c421c26e937f62079c0e554f0c10d9decfe66a207a21abb4c2abb720053f0e80c886c56491a0744e38 SHA512 b894e172b24cdcbd487f1d8bcee44a49ea867eb5775d6163605a64d3beffae7056c6d77acc96eee20728075b40c9d52b75e9e7024b16fd804f49720eef6f9225 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d DIST gdk-pixbuf-2.36.10.tar.xz 5772196 BLAKE2B 542df9a5b9d3e790cb592b714a402633eaf37ecd4a21d597f307bdc3f5a0a35e3c3d9e3f6c822e163d0d64b9de62d7b120cb2b174f3109bdffc5e08225506f0c SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35 +DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3 DIST gdk-pixbuf-2.36.9.tar.xz 5769124 BLAKE2B 7e21831659cd0bca44de4858fe37887a8a2ea494fffed5015fd35155873fe820336b762be8e8057c4f41c48dbe7c6b55e8eba9fbbee8692a9b72e7fe6b0dd24e SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261 EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3797 BLAKE2B 0fdf831d2b2f8f3649019e73cadc44d38492f2e08403b5fba0847058d54d55094105d24d76519b5d43a39c60c52f5815f864e05540792ba20c6b7eb0f902c8e8 SHA512 8c93298741e57d623a4b0109126c654b6f670ac57895fb649c56e57c3e4d120f06b46976d35711ac03eb823aa9acc54528dc6c68cf4cab6b7340818b84eeff5c -EBUILD gdk-pixbuf-2.36.10.ebuild 3671 BLAKE2B 02f2bed33fb3c7cafb0e986204243e11d5b30763590e472cfe83314cfc8d4305c49fae377928b673684ad49e00af5920468b58d5fc40d421a89442df02dbbc86 SHA512 8a2b3fa2f1f7dc063e7939ba745b3d10b497da1d5d13ff336e9fe487d2cc31125b428278178dd187c57302409fddfa175f5bbbd6b5f796d6abf77f34f5b3655e +EBUILD gdk-pixbuf-2.36.11.ebuild 3893 BLAKE2B 470bfec07a8c38410284dc44907d4aa09ef02c2a57a7f900174933dec7c002eaaf3cb1da49e4ac969ac0aadc66803ce77da970974dbeb37d12ebf87dab9640fe SHA512 98af3703315a23eecb103d3fab88dfc8369ad72d5e7f5ab50d2f037307c571f23347e968565c3cc9ca18bcbeb41a82ff1f8a1823e70c1f3de8568fa542e1eda5 EBUILD gdk-pixbuf-2.36.9.ebuild 3662 BLAKE2B 72352663cd372208aac722a3cee1ac2280d332b28168d6f181eebbca4b83acd2ac25e81e001975e9bd4ff3b0312f533dc5a4df486694d42426afb370d861184c SHA512 5622f0a3df9ba6972958d63d08ee0bd6b73c933bca2c05dd2e65a89e3f44076c5d042cec3f519523a8bb778d98a2051d6a5adaffab04238a3f6415741be67694 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a diff --git a/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch b/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch new file mode 100644 index 000000000000..23caca99a594 --- /dev/null +++ b/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch @@ -0,0 +1,26 @@ +From 5c4edf2cc22468a8410c19cb8b236b227fca300a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 10 Oct 2017 14:33:18 +0300 +Subject: [PATCH] build: Fix --without-libtiff not having an effect + +https://bugzilla.gnome.org/show_bug.cgi?id=788770 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b45f407b5..9f5d6fbee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -676,7 +676,7 @@ if test x$gio_can_sniff = x; then + AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data]) + fi + +-AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x) ++AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno) + AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x) + AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x) + AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x) +-- +2.15.0 + diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild deleted file mode 100644 index a0c235ef3cb6..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit flag-o-matic gnome2 multilib multilib-minimal - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X debug +introspection jpeg jpeg2k tiff test" - -COMMON_DEPEND=" - >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}] - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) -" -DEPEND="${COMMON_DEPEND} - >=dev-util/gtk-doc-am-1.20 - >=sys-devel/gettext-0.19 - virtual/pkgconfig -" -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise -RDEPEND="${COMMON_DEPEND} - ! libpng15 upgrade - # See upstream bug #667068 - # First check that the pattern is present, to catch upstream changes on bumps, - # because sed doesn't return failure code if it doesn't do any replacements - grep -q 'l in libpng16' configure || die "libpng check order has changed upstream" - sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die - [[ ${CHOST} == *-solaris* ]] && append-libs intl - - gnome2_src_prepare -} - -multilib_src_configure() { - # png always on to display icons - ECONF_SOURCE="${S}" \ - gnome2_src_configure \ - $(usex debug --enable-debug=yes "") \ - $(use_with jpeg libjpeg) \ - $(use_with jpeg2k libjasper) \ - $(use_with tiff libtiff) \ - $(multilib_native_use_enable introspection) \ - $(use_with X x11) \ - --with-libpng - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die - fi -} - -multilib_src_install() { - # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # Make sure loaders.cache belongs to gdk-pixbuf alone - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - } - - multilib_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - multilib_foreach_abi gnome2_pkg_postinst - - # Migration snippet for when this was handled by gtk+ - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache - fi -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild new file mode 100644 index 000000000000..80f31f97b247 --- /dev/null +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit flag-o-matic gnome2 multilib multilib-minimal + +DESCRIPTION="Image loading library for GTK+" +HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="X debug +introspection jpeg jpeg2k tiff test" + +COMMON_DEPEND=" + >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}] + >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) + tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) +" +DEPEND="${COMMON_DEPEND} + >=dev-util/gtk-doc-am-1.20 + >=sys-devel/gettext-0.19 + virtual/pkgconfig +" +# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise +RDEPEND="${COMMON_DEPEND} + ! libpng15 upgrade + # See upstream bug #667068 + # First check that the pattern is present, to catch upstream changes on bumps, + # because sed doesn't return failure code if it doesn't do any replacements + grep -q 'l in libpng16' configure || die "libpng check order has changed upstream" + sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die + [[ ${CHOST} == *-solaris* ]] && append-libs intl + + gnome2_src_prepare +} + +multilib_src_configure() { + # png always on to display icons + ECONF_SOURCE="${S}" \ + gnome2_src_configure \ + $(usex debug --enable-debug=yes "") \ + $(use_with jpeg libjpeg) \ + $(use_with jpeg2k libjasper) \ + $(use_with tiff libtiff) \ + $(multilib_native_use_enable introspection) \ + $(use_with X x11) \ + --with-libpng + + # work-around gtk-doc out-of-source brokedness + if multilib_is_native_abi; then + ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die + fi +} + +multilib_src_install() { + # Parallel install fails when no gdk-pixbuf is already installed, bug #481372 + MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install +} + +pkg_preinst() { + gnome2_pkg_preinst + + multilib_pkg_preinst() { + # Make sure loaders.cache belongs to gdk-pixbuf alone + local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + } + + multilib_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + + multilib_foreach_abi gnome2_pkg_postinst + + # Migration snippet for when this was handled by gtk+ + if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then + elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders + elog "to do that you can use qfile from portage-utils:" + elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)" + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache + fi +} -- cgit v1.2.3