From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-865605-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id CB3F41388C0
for <garchives@archives.gentoo.org>; Fri, 26 Feb 2016 12:26:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4982721C00A;
Fri, 26 Feb 2016 12:26:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C468B21C00A
for <gentoo-commits@lists.gentoo.org>; Fri, 26 Feb 2016 12:26:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 534D5340C69
for <gentoo-commits@lists.gentoo.org>; Fri, 26 Feb 2016 12:26:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 60A2C154D
for <gentoo-commits@lists.gentoo.org>; Fri, 26 Feb 2016 12:26:50 +0000 (UTC)
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" <blueness@gentoo.org>
Message-ID: <1456490198.0cde5cef33c8cae17a2c4f96ffecc8d47422cea1.blueness@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/, x11-libs/gdk-pixbuf/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
X-VCS-Directories: x11-libs/gdk-pixbuf/files/ x11-libs/gdk-pixbuf/
X-VCS-Committer: blueness
X-VCS-Committer-Name: Anthony G. Basile
X-VCS-Revision: 0cde5cef33c8cae17a2c4f96ffecc8d47422cea1
X-VCS-Branch: master
Date: Fri, 26 Feb 2016 12:26:50 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: aab85d4c-2229-4479-964d-b67d648b626a
X-Archives-Hash: 0886f8f4a681216261d67b37f4ebcfbe
commit: 0cde5cef33c8cae17a2c4f96ffecc8d47422cea1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 12:36:18 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 12:36:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cde5cef
x11-libs/gdk-pixbuf: fix build on uClibc, bug #563052
Upstream doesn't understand the proper use of __GLIBC__ and __UCLIBC__,
which I am trying to convince them of.
See: https://bugzilla.gnome.org/show_bug.cgi?id=756590
Package-Manager: portage-2.2.26
.../gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch | 34 ++++++++++++++++++++++
x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild | 3 ++
x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild | 3 ++
3 files changed, 40 insertions(+)
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" <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.32.3-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild
index a8fa239..5ca298a 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3-r1.ebuild
@@ -43,6 +43,9 @@ MULTILIB_CHOST_TOOLS=(
)
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
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
index 27a8968..b7f6597 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
@@ -43,6 +43,9 @@ MULTILIB_CHOST_TOOLS=(
)
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