diff options
author | Mart Raudsepp <leio@gentoo.org> | 2017-01-26 12:30:39 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2017-01-26 12:55:51 +0200 |
commit | 9a6d6221fad7b0e51264b3deb58896f5e43c75f1 (patch) | |
tree | a37a1f04e9aefe026123653c80293299f8e7a034 /x11-libs/gdk-pixbuf | |
parent | sys-apps/accountsservice: Remove old (diff) | |
download | gentoo-9a6d6221fad7b0e51264b3deb58896f5e43c75f1.tar.gz gentoo-9a6d6221fad7b0e51264b3deb58896f5e43c75f1.tar.bz2 gentoo-9a6d6221fad7b0e51264b3deb58896f5e43c75f1.zip |
x11-libs/gdk-pixbuf: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'x11-libs/gdk-pixbuf')
-rw-r--r-- | x11-libs/gdk-pixbuf/Manifest | 2 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch | 81 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch | 60 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild | 127 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild | 121 |
5 files changed, 0 insertions, 391 deletions
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index 2423c52afcbd..46964d6b5975 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,4 +1,2 @@ -DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2 WHIRLPOOL 566b73752c1e478fdf7011c3d2222ea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2 -DIST gdk-pixbuf-2.32.3.tar.xz 2430720 SHA256 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031 SHA512 9eb9b87c8104cff9292bebc41c411d2ba4b7fcd9d24c1b99e6dfc8281b5a202a53045dd3095666e3614eba59d417a7c0f69789b2a9dd52ed53bb5df4a0dfd117 WHIRLPOOL 053c48d7f0890ed0f324225ccf4d16f9afd4fd70b878acc6b9ec1bfd9c0c732bc290447cce25ba37cbbdded89a183d112b6e9b4b53141c62690bf45846f675e1 DIST gdk-pixbuf-2.34.0.tar.xz 2709320 SHA256 d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 SHA512 874aed9af0352592674f2bebd4d9b0a945932a410c9f0b776f45766c2f18d442a39c684cca69b1aca6d14f67f18e690489f388ff58699dbd0efbd13244a1a8b5 WHIRLPOOL c2f7b1ac0d2fa13a00c1bed37a66b9b13564e1cef5262db656c640b0256f821658f8e6d0e1e5a300a2af83847b15518d7e0c72995df877970bf44ad28e5fd416 DIST gdk-pixbuf-2.36.2.tar.xz 4877452 SHA256 3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d SHA512 34a569aee7a26af701edbc9bf895617dc59d1a7f98292c832885cff88733cb7f581253a5caeecf265712a07f975b7c7dfeda4050e7a81cb5c9de19b4b82d17ba WHIRLPOOL fb2871f32084a2c40cea9cd662167645d5458dd4b96faa9967356a5a95b3a173f8d54c41608dfae0344460ffd87441be0f3c465eef7dbae979e5c2d8fb92ff27 diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch deleted file mode 100644 index 273956ea402e..000000000000 --- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 2fb6bce8b3fdae67b8cdd93f253dad3743fc01b8 Mon Sep 17 00:00:00 2001 -From: Mike Gorse <mgorse@suse.com> -Date: Tue, 6 Oct 2015 11:46:24 -0500 -Subject: [PATCH] pixops: use gint64 in more places to avoid overflow when - shifting - ---- - gdk-pixbuf/pixops/pixops.c | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c -index b0abecd..6a4a096 100644 ---- a/gdk-pixbuf/pixops/pixops.c -+++ b/gdk-pixbuf/pixops/pixops.c -@@ -354,11 +354,11 @@ pixops_composite_nearest (guchar *dest_buf, - double scale_y, - int overall_alpha) - { -- int i; -- int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -- int xmax, xstart, xstop, x_pos, y_pos; -+ gint64 i; -+ gint64 x; -+ gint64 x_step = (1 << SCALE_SHIFT) / scale_x; -+ gint64 y_step = (1 << SCALE_SHIFT) / scale_y; -+ gint64 xmax, xstart, xstop, x_pos, y_pos; - const guchar *p; - unsigned int a0; - -@@ -524,13 +524,13 @@ pixops_composite_color_nearest (guchar *dest_buf, - guint32 color1, - guint32 color2) - { -- int i, j; -- int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -+ gint64 i, j; -+ gint64 x; -+ gint64 x_step = (1 << SCALE_SHIFT) / scale_x; -+ gint64 y_step = (1 << SCALE_SHIFT) / scale_y; - int r1, g1, b1, r2, g2, b2; - int check_shift = get_check_shift (check_size); -- int xmax, xstart, xstop, x_pos, y_pos; -+ gint64 xmax, xstart, xstop, x_pos, y_pos; - const guchar *p; - unsigned int a0; - -@@ -1338,20 +1338,20 @@ pixops_process (guchar *dest_buf, - PixopsLineFunc line_func, - PixopsPixelFunc pixel_func) - { -- int i, j; -- int x, y; /* X and Y position in source (fixed_point) */ -+ gint64 i, j; -+ gint64 x, y; /* X and Y position in source (fixed_point) */ - - guchar **line_bufs; - int *filter_weights; - -- int x_step; -- int y_step; -+ gint64 x_step; -+ gint64 y_step; - - int check_shift; -- int scaled_x_offset; -+ gint64 scaled_x_offset; - -- int run_end_x; -- int run_end_index; -+ gint64 run_end_x; -+ gint64 run_end_index; - - x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */ - y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */ --- -2.6.1 - diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch deleted file mode 100644 index cb508993638f..000000000000 --- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e1fd25a3d0c18bd941f685bbdf5aa3812403a48e Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 6 Oct 2015 09:11:38 +0200 -Subject: [PATCH] Run only pixbuf-lowmem test on GNU libc - -The test case depends on GNU libc specific internals so we only run it -on GNU libc. - -This fixes build on Linux with musl libc. - -https://bugzilla.gnome.org/show_bug.cgi?id=756078 ---- - tests/Makefile.am | 5 ----- - tests/pixbuf-lowmem.c | 8 ++++++++ - 2 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1f09711..2a0325a 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -19,13 +19,8 @@ LDADD = \ - noinst_PROGRAMS += \ - pixbuf-read \ - pixbuf-random \ -- $(NULL) -- --if OS_LINUX --noinst_PROGRAMS += \ - pixbuf-lowmem \ - $(NULL) --endif - - test_programs = \ - animation \ -diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c -index ae71788..9e9571f 100644 ---- a/tests/pixbuf-lowmem.c -+++ b/tests/pixbuf-lowmem.c -@@ -24,6 +24,7 @@ - #include <time.h> - #include <string.h> - -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - #define PRETEND_MEM_SIZE (16 * 1024 * 1024) - #define REMAINING_MEM_SIZE 100000 - -@@ -225,3 +226,10 @@ main (int argc, char **argv) - - return 0; - } -+#else -+int -+main (int argc, char **argv) -+{ -+ return 0; -+} -+#endif --- -2.6.1 - diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild deleted file mode 100644 index cfc70135c728..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils flag-o-matic gnome2 multilib libtool multilib-minimal - -DESCRIPTION="Image loading library for GTK+" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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.37.6: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} - !<gnome-base/gail-1000 - !<gnome-base/librsvg-2.31.0 - !<x11-libs/gtk+-2.21.3:2 - !<x11-libs/gtk+-2.90.4:3 - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) -) - -src_prepare() { - # Upstream patches from 2.32.x - epatch "${FILESDIR}"/${P}-gint64-shift-overflow.patch - epatch "${FILESDIR}"/${P}-lowmem-test-glibc.patch #563052, needs eautoreconf - eautoreconf - - # 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 '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.32.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild deleted file mode 100644 index 932c56583700..000000000000 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils flag-o-matic gnome2 multilib libtool 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 ~x86-freebsd ~x86-interix ~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.37.6: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} - !<gnome-base/gail-1000 - !<gnome-base/librsvg-2.31.0 - !<x11-libs/gtk+-2.21.3:2 - !<x11-libs/gtk+-2.90.4:3 -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) -) - -src_prepare() { - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 - epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch - - # 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 '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 -} |