commit: af6992c3e16440dc97aab1a66edef8e5d513f298 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Dec 4 01:31:36 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Dec 4 02:37:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6992c3
x11-libs/gdk-pixbuf: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/gdk-pixbuf/Manifest | 2 - .../gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch | 34 ------ x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild | 116 --------------------- x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild | 108 ------------------- 4 files changed, 260 deletions(-) diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index 9f0ab30f81dd..9f22e8781787 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,3 +1 @@ DIST gdk-pixbuf-2.42.10.tar.xz 6519776 BLAKE2B b6bec388b70a971ea5b336001920fdf433bcbc539d54e62c7b6198e968f0bd3560ef9adc94215b64b01e7d5db69c95d5a1d32654b38b051fceb75e93666b3385 SHA512 ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a -DIST gdk-pixbuf-2.42.8.tar.xz 8503020 BLAKE2B 39960043c5aa980f311d2705c868c170c90c7b580ac9ae849a3fdfc6a5faffcc24be23b82ca8fefb1cd5c28d2a02bfb87b1c5c5d1eab7b897f5e551a57577f7c SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387 -DIST gdk-pixbuf-2.42.9.tar.xz 6596068 BLAKE2B f464a6b326aee185b30b24f66267ad7eacd12e8b3bd07e7cebfb42a496791561cdd71cd937282d72f1fc55ee1e86b531f7e737a2dd00f2187d705865be177919 SHA512 032869c98d22cc4add05198baec5a64d29af247a99a084d7c498f82f467fb2a2008a8d0d4564ee5d963f6965dc9b3ff61b6c07377f67fec70ddf14e5373abfb3 diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch deleted file mode 100644 index 77ea7e75521e..000000000000 --- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <bluen...@gentoo.org> -Date: Wed, 14 Oct 2015 16:18:19 -0400 -Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on - uClibc - -pixbuf-lowmem.c depends on GNU libc internals and does not build -on musl or uClibc. Commit e1fd25a fixes this issue for musl by -testing if __GLIBC__ is set. However, uClibc sets __GLIBC__ and -so this check is insufficient there. We expand the check so that -we run pixbuf-lowmem on glibc, while avoiding it on both musl and -uClibc. - -Signed-off-by: Anthony G. Basile <bluen...@gentoo.org> ---- - tests/pixbuf-lowmem.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c -index 9e9571f..ec7504f 100644 ---- a/tests/pixbuf-lowmem.c -+++ b/tests/pixbuf-lowmem.c -@@ -24,7 +24,7 @@ - #include <time.h> - #include <string.h> - --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - #define PRETEND_MEM_SIZE (16 * 1024 * 1024) - #define REMAINING_MEM_SIZE 100000 - --- -2.4.9 - diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild deleted file mode 100644 index b4f614c7b16c..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson-multilib multilib xdg - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"; - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="gtk-doc +introspection jpeg tiff" - -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review -DEPEND=" - >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -RDEPEND="${DEPEND} - !<x11-libs/gtk+-2.90.4:3 -" -BDEPEND=" - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.3 - dev-libs/glib:2 - dev-libs/libxslt - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) -) - -PATCHES=( - # Do not run lowmem test on uclibc - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 - "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch -) - -src_prepare() { - xdg_src_prepare - # This will avoid polluting the pkg-config file with versioned libpng, - # which is causing problems with libpng14 -> 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 "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng12', 'libpng13', 'libpng10' \]" meson.build || die "libpng check order has changed upstream" - sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng12', 'libpng13', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng12', 'libpng13', 'libpng10' \]/" -i meson.build || die -} - -multilib_src_configure() { - local emesonargs=( - -Dpng=enabled - $(meson_feature tiff) - $(meson_feature jpeg) - -Dbuiltin_loaders=png,jpeg - -Drelocatable=false - #native_windows_loaders - -Dinstalled_tests=false - -Dgio_sniffing=true - $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_native_use_feature introspection) - $(meson_native_true man) - ) - - meson_src_configure -} - -multilib_src_install_all() { - einstalldocs - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die - fi -} - -pkg_preinst() { - xdg_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 - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - xdg_pkg_postinst - multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - xdg_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.42.9.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild deleted file mode 100644 index 7f32ba6a4b85..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.9.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson-multilib multilib xdg - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"; - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="gtk-doc +introspection jpeg test tiff" -RESTRICT="!test? ( test )" - -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review -DEPEND=" - >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] - jpeg? ( media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] ) - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.3 - dev-libs/glib:2 - dev-libs/libxslt - dev-python/docutils - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) -) - -src_prepare() { - default - xdg_environment_reset - - # dev-python/docutils installs rst2man.py, not rst2man - sed -i -e "s/'rst2man'/'rst2man.py'/" docs/meson.build || die -} - -multilib_src_configure() { - local emesonargs=( - -Dpng=enabled - $(meson_feature tiff) - $(meson_feature jpeg) - -Dbuiltin_loaders=png,jpeg - -Drelocatable=false - #native_windows_loaders - $(meson_use test tests) - -Dinstalled_tests=false - -Dgio_sniffing=true - $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_native_use_feature introspection) - $(meson_native_true man) - ) - - meson_src_configure -} - -multilib_src_install_all() { - einstalldocs - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die - fi -} - -pkg_preinst() { - xdg_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 - gnome2_gdk_pixbuf_savelist -} - -pkg_postinst() { - xdg_pkg_postinst - multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - xdg_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache - fi -}
