From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eMzZi-0004Rv-8W for guix-patches@gnu.org; Thu, 07 Dec 2017 12:03:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eMzZf-0004BJ-48 for guix-patches@gnu.org; Thu, 07 Dec 2017 12:03:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:42221) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eMzZe-0004Ay-W3 for guix-patches@gnu.org; Thu, 07 Dec 2017 12:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eMzZe-0007G1-NN for guix-patches@gnu.org; Thu, 07 Dec 2017 12:03:02 -0500 Subject: bug#29580: [PATCH] gnu: gtk+-2: Fix failing test. Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Marius Bakke In-Reply-To: <20171206141903.22449-1-boskovits@gmail.com> References: <20171205195028.32244-1-boskovits@gmail.com> <20171206141903.22449-1-boskovits@gmail.com> Date: Thu, 07 Dec 2017 18:02:50 +0100 Message-ID: <87efo6o4hx.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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: =?UTF-8?Q?G=C3=A1bor?= Boskovits , dannym@scratchpost.org, 29580-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable G=C3=A1bor Boskovits writes: > * 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 =3D \ > %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_F= ILE.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/packa= ges/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: =3D?UTF-8?q?G=3DC3=3DA1bor=3D20Boskovits?=3D > +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 G= Lib Thanks for investigating. The patch did not apply for me on core-updates, so I had to do the gnu/local.mk change "manually". > + > +--- > + 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 > +=20 > + cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES = ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVAT= E//' | sort > expected-abi > +-nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egr= ep -v '^(__bss_start|_edata|_end)' | sort > actual-abi > ++nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egr= ep -v '^(__bss_start|_edata|_end)' | egrep '^gtk_' | sort > actual-abi > + diff -u expected-abi actual-abi && rm -f expected-abi actual-abi Maybe we should rename this patch to more accurately reflect what's going on? Something like "gtk+2-abi-check-ignore-glib.patch". WDYT? Regardless I've pushed this as 92b61d3e1bb50f0c1d087bc8d57cc00c3ce360df. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlopdDoACgkQoqBt8qM6 VPpToAgA1ZS1jit/UT7riD3yvoXJfhrIj6LFIXtp1oViIOSD6aaiSjviYsQruq0L 2ahhq8YauU9JwdrUxRX3aB7RJy+6Gyol+R39DEcb3dQgoRmUyf/djFmTcwxmCnyb P7qVjUZ3ZwyD5wBXF49UEsLxhSSReiHk3HXrsotYihj0tdfwQsWYHmI5z+vDWDTZ MxvOnRVfw83xpfBGSfhlMb52jHgvmL9huhRR9cM/B/1ssD5MaiKIUtDDyv1e67Ow 1fpq/EH5SKrHsZyWfbd/9g3tWLWFpKpI9/Zbv4Td7FZRXEkBVsHLYubAS757LE4e OrK556q57qlUa3cUUulR3+xHCse2zw== =y+ze -----END PGP SIGNATURE----- --=-=-=--