* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/files/, x11-libs/gdk-pixbuf/
@ 2017-01-26 10:56 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2017-01-26 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 9a6d6221fad7b0e51264b3deb58896f5e43c75f1
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 10:30:39 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 10:55:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6d6221
x11-libs/gdk-pixbuf: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-libs/gdk-pixbuf/Manifest | 2 -
.../gdk-pixbuf-2.32.1-gint64-shift-overflow.patch | 81 -------------
.../gdk-pixbuf-2.32.1-lowmem-test-glibc.patch | 60 ----------
x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild | 127 ---------------------
x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild | 121 --------------------
5 files changed, 391 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 2423c52..46964d6 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 273956e..00000000
--- 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 cb50899..00000000
--- 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 cfc7013..00000000
--- 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 932c565..00000000
--- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/files/, x11-libs/gdk-pixbuf/
@ 2017-12-17 23:15 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2017-12-17 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 1586017e00dd18e91322c10ecd83e1aed5a6579e
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 22:43:21 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 23:13:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1586017e
x11-libs/gdk-pixbuf: version bump 2.36.10-r2 → 2.36.11
Package-Manager: Portage-2.3.19, Repoman-2.3.6
x11-libs/gdk-pixbuf/Manifest | 1 +
.../files/2.36.11-fix-libtiff-disable.patch | 26 +++++
x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild | 126 +++++++++++++++++++++
3 files changed, 153 insertions(+)
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 7c32f9080ef..90e497d040f 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,2 +1,3 @@
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
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 00000000000..23caca99a59
--- /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 <alex.kanavin@gmail.com>
+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.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
new file mode 100644
index 00000000000..80f31f97b24
--- /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}
+ !<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)
+)
+
+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
+ # Fix --without-libtiff having no effect (from master)
+ # https://bugzilla.gnome.org/show_bug.cgi?id=788770
+ "${FILESDIR}"/${PV}-fix-libtiff-disable.patch
+)
+
+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 '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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/files/, x11-libs/gdk-pixbuf/
@ 2019-01-14 19:52 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2019-01-14 19:52 UTC (permalink / raw
To: gentoo-commits
commit: a92cdbc6d2dfbbf011658e49c888153ccbcdbdf5
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 19:50:19 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 19:51:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a92cdbc6
x11-libs/gdk-pixbuf: remove old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
x11-libs/gdk-pixbuf/Manifest | 1 -
.../files/2.36.11-fix-libtiff-disable.patch | 26 -----
x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild | 127 ---------------------
3 files changed, 154 deletions(-)
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 8c610bda12c..3e4ce22587e 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,3 +1,2 @@
-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
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
deleted file mode 100644
index 23caca99a59..00000000000
--- a/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5c4edf2cc22468a8410c19cb8b236b227fca300a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-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.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
deleted file mode 100644
index 5cf84878340..00000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~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/glib-utils
- >=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)
-)
-
-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
- # Fix --without-libtiff having no effect (from master)
- # https://bugzilla.gnome.org/show_bug.cgi?id=788770
- "${FILESDIR}"/${PV}-fix-libtiff-disable.patch
-)
-
-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 '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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/files/, x11-libs/gdk-pixbuf/
@ 2022-12-04 2:41 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-12-04 2:41 UTC (permalink / raw
To: gentoo-commits
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" <blueness@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 <blueness@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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-04 2:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-14 19:52 [gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/files/, x11-libs/gdk-pixbuf/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2022-12-04 2:41 Matt Turner
2017-12-17 23:15 Gilles Dartiguelongue
2017-01-26 10:56 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox