From 5cfef3c94cd7e82136c69a0322f5ba21f7e64632 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Apr 2018 14:14:48 +0100 Subject: gentoo resync : 19.04.2018 --- x11-libs/gdk-pixbuf/Manifest | 5 +- .../gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch | 66 ----------- x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild | 124 --------------------- x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild | 2 +- 4 files changed, 2 insertions(+), 195 deletions(-) delete mode 100644 x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch delete mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild (limited to 'x11-libs/gdk-pixbuf') diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index cd31aa3a2268..1adba1fd6605 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,11 +1,8 @@ -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.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b -EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3795 BLAKE2B e3a6b029120e43a6395096782c3d73599ef953321e3f46480b7211199e7b7326017b0674f71cae3298a81c183b602545294de14d351edb0fee53970f4e8421fd SHA512 737a797da5cec04c2f61c6cf5df869f87e1050dd608cb2f1a670c28364c349f3aba6b51b45adeda36bb5f58f1a7a39c3b9d989d61c2b118c50a409a622d381c2 EBUILD gdk-pixbuf-2.36.11.ebuild 3884 BLAKE2B 8b406fc21b510a6f5fe4303f13a3c4cebc1948f491e6c3ac2648b0beed032b23437e76b96e4d18b4d1fab61c9763b85e95fb43307cb7e6b4e6ec77a3e5389bd7 SHA512 c0f6d46fec0dcb975a86dcac09e583d43126c845c59fe937a7c628f247a0b98ecee4c0e90ebafeeedb696758324824da4f42c3418531bb3c39b33732746c5469 -EBUILD gdk-pixbuf-2.36.12.ebuild 4080 BLAKE2B fb4b3b110c5cb0a687cc1727afd8d0b865562e13e4b58c481f8b364b54eaa1ae1a374b14121635d5f660881dafa92f8d7243ce611f63cfa83664bac89942a67f SHA512 f8c1641c0018e5f010350b458bae9a866b642fd9b19a94733909f68fbf0267fe32bca4203b50ad040905c897b7f133ec0285114b5bbc58ac7dc0ca52f23efc7b +EBUILD gdk-pixbuf-2.36.12.ebuild 4079 BLAKE2B 1555d52f4199eb8179f7c80908de72864cc7838834291aa5f91eb7277d4169b09dc2713fa4151a726fd153e060797e092329f1c81e81d5f1fd9a4bb2ffdad172 SHA512 da8d6d0f71832c055f8944f1145fcfa282e2720566ce92f4b49cbf40c049b0e9b854f92e7132fcb9bcfef58948f68ebe4f2e459c820b286bc681052a1ff3b97c MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a diff --git a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch deleted file mode 100644 index 80ed32f83f3c..000000000000 --- a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 66537d1ecf7e857a0a443c1ebf72baf6f19dd3e4 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 11 Sep 2017 19:11:50 +0200 -Subject: build: Fix TIFF loader compilation with autotools - -https://bugzilla.gnome.org/show_bug.cgi?id=786342 ---- - configure.ac | 7 +++---- - gdk-pixbuf/Makefile.am | 2 +- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0abe5ce..c07bd6f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -564,7 +564,6 @@ dnl Test for libjasper - *** --without-libjasper to configure]) - fi - --AC_SUBST(LIBTIFF) - AC_SUBST(LIBJPEG) - AC_SUBST(LIBPNG) - AC_SUBST(LIBJASPER) -@@ -676,7 +675,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" != 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) -@@ -684,7 +683,7 @@ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x) - if $dynworks ; then - STATIC_LIB_DEPS= - if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then -- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF" -+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $TIFF_LIBS" - fi - if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then - STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" -@@ -698,7 +697,7 @@ if $dynworks ; then - STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER" - fi - else -- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" -+ STATIC_LIB_DEPS="$TIFF_LIBS $LIBJPEG $LIBPNG $LIBJASPER" - fi - - # Checks to see whether we should include mediaLib -diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am -index 01b693c..720a058 100644 ---- a/gdk-pixbuf/Makefile.am -+++ b/gdk-pixbuf/Makefile.am -@@ -88,7 +88,7 @@ libpixbufloader_pnm_la_LIBADD = $(module_libs) - libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c - libpixbufloader_tiff_la_SOURCES = io-tiff.c - libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs) -+libpixbufloader_tiff_la_LIBADD = $(TIFF_LIBS) $(module_libs) - - # - # The XPM loader --- -cgit v0.12 - diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild deleted file mode 100644 index 645819ace7a7..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# 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 -} diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild index 0e686ea61619..710db4c581aa 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild @@ -11,7 +11,7 @@ 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" +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" # Remove SRC_URI when gnome bug #795069 is fixed -- cgit v1.2.3