commit: 8b8838b33991886bdd0913f6b496f8f4f65da372
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 23:58:44 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:55:46 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8b8838b3
x11-libs/gdk-pixbuf: Bump version to 2.34.0
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42
.../gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch | 34 ++++++++++++++++++++++
...pixbuf-9999.ebuild => gdk-pixbuf-2.34.0.ebuild} | 26 +++++------------
x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild | 17 +++++------
3 files changed, 49 insertions(+), 28 deletions(-)
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
new file mode 100644
index 0000000..77ea7e7
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
@@ -0,0 +1,34 @@
+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-9999.ebuild
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild
similarity index 80%
copy from x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
copy to x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild
index 14c57b8..d674ae1 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,26 +7,19 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/";
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf";
LICENSE="LGPL-2+"
SLOT="2"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- 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"
-fi
-IUSE="+X debug +introspection jpeg jpeg2k tiff test"
+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 )
+ 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}] )
@@ -43,10 +36,6 @@ RDEPEND="${COMMON_DEPEND}
!<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=(
@@ -54,7 +43,8 @@ MULTILIB_CHOST_TOOLS=(
)
src_prepare() {
- [[ ${PV} = 9999 ]] && eautoreconf
+ # 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
@@ -125,7 +115,7 @@ pkg_postinst() {
pkg_postrm() {
gnome2_pkg_postrm
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ 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-9999.ebuild
b/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
index 14c57b8..faa412e 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/";
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf";
LICENSE="LGPL-2+"
SLOT="2"
@@ -21,12 +21,12 @@ if [[ ${PV} = 9999 ]]; then
else
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"
fi
-IUSE="+X debug +introspection jpeg jpeg2k tiff test"
+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 )
+ 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}] )
@@ -43,10 +43,6 @@ RDEPEND="${COMMON_DEPEND}
!<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=(
@@ -54,7 +50,8 @@ MULTILIB_CHOST_TOOLS=(
)
src_prepare() {
- [[ ${PV} = 9999 ]] && eautoreconf
+ # 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
@@ -125,7 +122,7 @@ pkg_postinst() {
pkg_postrm() {
gnome2_pkg_postrm
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
fi
}
