From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eMaZQ-0000p7-IV for guix-patches@gnu.org; Wed, 06 Dec 2017 09:21:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eMaZL-00053T-Im for guix-patches@gnu.org; Wed, 06 Dec 2017 09:21:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39966) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eMaZL-00053M-Et for guix-patches@gnu.org; Wed, 06 Dec 2017 09:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eMaZJ-0003Lf-KL for guix-patches@gnu.org; Wed, 06 Dec 2017 09:21:03 -0500 Subject: [bug#29580] [PATCH] gnu: gtk+-2: Fix failing test. References: <20171205195028.32244-1-boskovits@gmail.com> In-Reply-To: <20171205195028.32244-1-boskovits@gmail.com> Resent-Message-ID: From: =?UTF-8?Q?G=C3=A1bor?= Boskovits Date: Wed, 6 Dec 2017 15:19:03 +0100 Message-Id: <20171206141903.22449-1-boskovits@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: dannym@scratchpost.org, 29580@debbugs.gnu.org Cc: =?UTF-8?Q?G=C3=A1bor?= Boskovits * gnu/packages/gtk.scm (gtk+-2)[source]: Add patch. * gnu/packages/patches/gtk2-fix-failing-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 3 +- gnu/packages/patches/gtk2-fix-failing-test.patch | 39 ++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gtk2-fix-failing-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5a701075f..b37d76ab3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -713,6 +713,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-relocatable.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ + %D%/packages/patches/gtk2-fix-failing-test.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dfa7a59b1..3d9ffe8c8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -600,7 +600,8 @@ is part of the GNOME accessibility project.") "0n26jm09n03nqbd00d2ij63xrby3vik56sk5yj6w1vy768kr5hb8")) (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" - "gtk2-theme-paths.patch")))) + "gtk2-theme-paths.patch" + "gtk2-fix-failing-test.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs diff --git a/gnu/packages/patches/gtk2-fix-failing-test.patch b/gnu/packages/patches/gtk2-fix-failing-test.patch new file mode 100644 index 000000000..721dc012c --- /dev/null +++ b/gnu/packages/patches/gtk2-fix-failing-test.patch @@ -0,0 +1,39 @@ +From 12d8b4e8f2f9c9a7707d1d3fccba382732212e3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= +Date: Tue, 5 Dec 2017 20:06:36 +0100 +Subject: [PATCH] Fix test failing on new GLib versions. + +This test fails on newer GLib version, because GLib exports a new public marshaller. +The additional symbol making the test fail is: +g_cclosure_marshal_BOOLEAN__BOXED_BOXED + +The fix makes the test ignore non-gtk related abi. +This ensures if future marshallers are added to glib those will not pose a problem. + +The fix also ensures that the test still checks the gtk abi for identity, and +that the library provides a superset of the required abi. + +Upstream reponse to this problem was: + +GLib added a new marshaller in its public API +And the `abicheck.sh`in GTK+ 2.24 hasn't been updated because GTK+ 2.24 is in deep +maintenance mode and very few people test it against newer versions of GLib + +--- + gtk/abicheck.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh +index 0d033fb..53b7bfe 100755 +--- a/gtk/abicheck.sh ++++ b/gtk/abicheck.sh +@@ -1,5 +1,5 @@ + #! /bin/sh + + cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi +-nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi ++nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | egrep '^gtk_' | sort > actual-abi + diff -u expected-abi actual-abi && rm -f expected-abi actual-abi +-- +2.15.0 + -- 2.15.0