From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1F20813888F for ; Wed, 14 Oct 2015 12:45:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3E0221C008; Wed, 14 Oct 2015 12:45:29 +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 6191F21C008 for ; Wed, 14 Oct 2015 12:45:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4868733BEE9 for ; Wed, 14 Oct 2015 12:45:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0265C922 for ; Wed, 14 Oct 2015 12:45:23 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1444826696.91c97a5dae6ab5ca1fead8aacba2c5e058f38212.tetromino@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.1-lowmem-test-glibc.patch x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild X-VCS-Directories: x11-libs/gdk-pixbuf/ x11-libs/gdk-pixbuf/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 91c97a5dae6ab5ca1fead8aacba2c5e058f38212 X-VCS-Branch: master Date: Wed, 14 Oct 2015 12:45:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5624fd38-ec59-4c10-b5ad-1527f9cc1c93 X-Archives-Hash: a0ec572bbb3d74a48ef4f01448637d5a commit: 91c97a5dae6ab5ca1fead8aacba2c5e058f38212 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Oct 14 12:39:32 2015 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Wed Oct 14 12:44:56 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c97a5d x11-libs/gdk-pixbuf: run glibc-specific test only on glibc Gentoo-Bug: 563052 Reported-by: Anthony Basile .../gdk-pixbuf-2.32.1-lowmem-test-glibc.patch | 60 ++++++++++++++++++++++ x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild | 4 +- 2 files changed, 63 insertions(+), 1 deletion(-) 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 new file mode 100644 index 0000000..3915dff --- /dev/null +++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch @@ -0,0 +1,60 @@ +From e1fd25a3d0c18bd941f685bbdf5aa3812403a48e Mon Sep 17 00:00:00 2001 +From: Natanael Copa +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 + #include + ++#ifdef __GLIBC__ + #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 index 54226b3..978be55 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild @@ -6,7 +6,7 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal +inherit autotools eutils flag-o-matic gnome2 multilib libtool multilib-minimal DESCRIPTION="Image loading library for GTK+" HOMEPAGE="http://www.gtk.org/" @@ -49,6 +49,8 @@ MULTILIB_CHOST_TOOLS=( 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