From unknown Sat Jun 21 12:11:43 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#29580 <29580@debbugs.gnu.org> To: bug#29580 <29580@debbugs.gnu.org> Subject: Status: [PATCH] gnu: gtk+-2: Fix failing test. Reply-To: bug#29580 <29580@debbugs.gnu.org> Date: Sat, 21 Jun 2025 19:11:43 +0000 retitle 29580 [PATCH] gnu: gtk+-2: Fix failing test. reassign 29580 guix-patches submitter 29580 G=C3=A1bor Boskovits severity 29580 normal tag 29580 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 05 14:51:11 2017 Received: (at submit) by debbugs.gnu.org; 5 Dec 2017 19:51:11 +0000 Received: from localhost ([127.0.0.1]:48102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMJFG-0008Vi-PY for submit@debbugs.gnu.org; Tue, 05 Dec 2017 14:51:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMJFB-0008VA-5G for submit@debbugs.gnu.org; Tue, 05 Dec 2017 14:51:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eMJF4-00042p-JE for submit@debbugs.gnu.org; Tue, 05 Dec 2017 14:50:59 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:38508) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eMJF4-00042c-6U for submit@debbugs.gnu.org; Tue, 05 Dec 2017 14:50:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eMJF2-0005SC-UO for guix-patches@gnu.org; Tue, 05 Dec 2017 14:50:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eMJEy-0003y2-Vz for guix-patches@gnu.org; Tue, 05 Dec 2017 14:50:57 -0500 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:33925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eMJEy-0003xg-OO for guix-patches@gnu.org; Tue, 05 Dec 2017 14:50:52 -0500 Received: by mail-wr0-x22a.google.com with SMTP id y21so1572277wrc.1 for ; Tue, 05 Dec 2017 11:50:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=jW3cHJs8DHPcYBCnFPeS1Rz8y1WIPHt8zcZ6Sl5velY=; b=IPZCnHYWFaEQc2J4BFYXBss3ZKxMA8lcczcDOMfctYlht2+Ut8IDeVh5JEBwitnfHe plVoVJ6Z4uXfG2/giTL4ZafizNBcJv0QtoSgDp6Dt08pcZc8yXLCmcccm3vdzqlNqITB M37IY0Pwg6xAvGrcE6UaBRbTIBz2R0IxdvLHbfzoYFLSGAQKdAlznKAdE+PzsvM8eSI7 NyfYolRGhftmSSJXda3vG3Ar7PDy6Xw2z9fKDibHFYqgsSnHeao9olMC4KUJP5Z+w347 Wgb6bxGZLlKASijn1r62mQNg//PhTXDBE6Kk66CB/cmLldcJQAPYqhOp+oT+8lBgBA2Q gkhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jW3cHJs8DHPcYBCnFPeS1Rz8y1WIPHt8zcZ6Sl5velY=; b=fQolM2Xaiw3TK1qPpBxTp2Be9QC5EwrzBD5Mwl9ecSaXl5Z6j5qZGYAWQcz3x5L7nB qUmWL2me7DzOWaQSDqwU3RTDo7FGHLHXKaqiMP1WRBsiFTKGXbZMIN9UzADAI2mXRebn Q4HC9lkTE8h1bIhGgZqw2XE6xmbfWz0kHEO87tbz3lR3d2LWd9tlYVO7hsyE+3DnKLm9 3spG3opAdgxk4tt5StNFM6gegD0Cfpsq5JBiFy5RBu3q1rkfJs0kCZSDJgkzUKXgZlkA sJ160MyDxl/2y3FqMjqNqpc5ZG4FZJ7dxbTPlwEapMSzuuRVe19KOqUA+Jbn1XPxm7Gc 3jbA== X-Gm-Message-State: AJaThX7uNJyPZLoojjVPJltmDriMouI5T1iobzIJ5I4gwBZnL+VjmWiD VbD37z5oCke+ngbecgsEZR1yjdE= X-Google-Smtp-Source: AGs4zMaC8Q+MJLcmALkLauFfZa/gqfXiyPrFX5ftN3QjWwZXbwZiV70YJBufAs94A0GTPYiUqKDiVg== X-Received: by 10.223.171.85 with SMTP id r21mr16421718wrc.182.1512503451139; Tue, 05 Dec 2017 11:50:51 -0800 (PST) Received: from localhost.localdomain (5402C8A3.dsl.pool.telekom.hu. [84.2.200.163]) by smtp.gmail.com with ESMTPSA id 139sm1381189wmp.7.2017.12.05.11.50.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 11:50:50 -0800 (PST) From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= To: guix-patches@gnu.org Subject: [PATCH] gnu: gtk+-2: Fix failing test. Date: Tue, 5 Dec 2017 20:50:28 +0100 Message-Id: <20171205195028.32244-1-boskovits@gmail.com> X-Mailer: git-send-email 2.15.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?G=C3=A1bor=20Boskovits?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * 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 | 23 +++++++++++++++++++++++ 3 files changed, 26 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..7ed3a2fa1 --- /dev/null +++ b/gnu/packages/patches/gtk2-fix-failing-test.patch @@ -0,0 +1,23 @@ +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. + +--- + 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 05 15:00:10 2017 Received: (at 29580) by debbugs.gnu.org; 5 Dec 2017 20:00:10 +0000 Received: from localhost ([127.0.0.1]:48113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMJNw-0000Ik-8B for submit@debbugs.gnu.org; Tue, 05 Dec 2017 15:00:08 -0500 Received: from mail-io0-f182.google.com ([209.85.223.182]:44098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMJNt-0000GY-Ua for 29580@debbugs.gnu.org; Tue, 05 Dec 2017 15:00:06 -0500 Received: by mail-io0-f182.google.com with SMTP id w127so30236iow.11 for <29580@debbugs.gnu.org>; Tue, 05 Dec 2017 12:00:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=G9306ErIyssc1GnYN62jSOpftztiy4u5ZtWu6pUT03I=; b=Tm70geHnipmY+EXNaIPUNytMqJeXfFki2hlm0UAK7dDgtJU3VNbGgQFgz8X+U4smNT YPJ5EA7vyoCchKEzQrdFrB7Rp9pLtZZgTEo2jLWPUT2Se+ZUgyrzp+8JivJKAxmd1AbU ibZm0t9ff5rwYCGvPkZ8KsbpTfH6xOkaxAD0Pax9+6RWsZdj/UkDluQ8WqVS0gYemEde egY6nWgKtQ14A07+NZ8Ygqthz3Ys/Z9SbJdIKL8CvgkGLnLUOOR5f1DMoQOCwfg0Eh9Q hHYGudg5piwVh9i/OebhoHO8L+0d12108UuGkFhmJc5LySh4ZuU2ttgkT40YcCGDy7yd BeOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=G9306ErIyssc1GnYN62jSOpftztiy4u5ZtWu6pUT03I=; b=szNUmvIdtibPkm27arKtxeWMbj6zgsWH7KcYpo09BwZWZFLaeTB1tb76a9kHLfozhO AfWJixtBbUlS/Om0xl11W/5R3iqCPSjY/kzKsnTPsrjpKhsatb5CwGvtEjkdGrgTm5mN vTZDzGPzxBIroHNvz3Kxs23xtb3cQtHR2OAbltqFe6DnXUFqk7Exqv3w6A4ntHbx0S3a 3X968FsHzeTJqUmJVQmdlqWCH4mY14og86TgcVG0ZWzD5lnceRHKBzNbXvYRCVjda+tX YIj1GYASISgodF7TCryukprkaNk3nCR/jlLUAczjEQA5muuXOBBbGuAfzzDXdGPfiCte 89vw== X-Gm-Message-State: AJaThX4yl6TgSP0/+lQAGpGXBbnJ69iHnEiCbR7Ln7/r1+b6UEvNaaLw gPpcBkB4zW2v1/9/78Mtf6u1OySdpDtRqorXh9qVcc8= X-Google-Smtp-Source: AGs4zMavUToJ6Fq4NmzJuwlNGP4YQyDqDU+F1YfALQ/p86HiunhytOpv5XaXf6zHQx0kLG5TmmF1tafmMOm+ciRor90= X-Received: by 10.107.183.67 with SMTP id h64mr30410827iof.46.1512503999890; Tue, 05 Dec 2017 11:59:59 -0800 (PST) MIME-Version: 1.0 Received: by 10.79.36.209 with HTTP; Tue, 5 Dec 2017 11:59:59 -0800 (PST) In-Reply-To: References: <20171205195028.32244-1-boskovits@gmail.com> From: =?UTF-8?Q?G=C3=A1bor_Boskovits?= Date: Tue, 5 Dec 2017 20:59:59 +0100 Message-ID: Subject: Re: bug#29580: Acknowledgement ([PATCH] gnu: gtk+-2: Fix failing test.) To: 29580@debbugs.gnu.org Content-Type: multipart/alternative; boundary="94eb2c0b9c9ca2889b055f9d4730" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 29580 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --94eb2c0b9c9ca2889b055f9d4730 Content-Type: text/plain; charset="UTF-8" This is a patch to make gtk2 build on core-updates. Relevant details can be found on today irc logs. Just the most important points: gtk+-2 build fails on core-updates with a failing test: gtk/abitest.sh The cause of the failure is that the new version of glib currently on core-updates exposes a new marshaller, therefore the abi provided by the library is a superset of the expected abi, and this test requires exact match. Here is a snippet of communcation with upstream: 17:49 < EmmanueleBassi> gabriel_: It's fine to ignore 17:49 < EmmanueleBassi> gabriel_: GLib added a new marshaller in its public API 17:50 < EmmanueleBassi> gabriel_: 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 17:50 < EmmanueleBassi> There's the question as to whether GLib should have added a new marshaller in the public API in the first place [17:56] EmmanueleBassi> But that happened a long time ago So it seems, that this is fine to ignore this, and upstream is not interested in fixing it. My fix restricts the test to the gtk abi, which I think is the good thing to do. 2017-12-05 20:52 GMT+01:00 GNU bug Tracking System : > Thank you for filing a new bug report with debbugs.gnu.org. > > This is an automatically generated reply to let you know your message > has been received. > > Your message is being forwarded to the package maintainers and other > interested parties for their attention; they will reply in due course. > > Your message has been sent to the package maintainer(s): > guix-patches@gnu.org > > If you wish to submit further information on this problem, please > send it to 29580@debbugs.gnu.org. > > Please do not send mail to help-debbugs@gnu.org unless you wish > to report a problem with the Bug-tracking system. > > -- > 29580: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29580 > GNU Bug Tracking System > Contact help-debbugs@gnu.org with problems > --94eb2c0b9c9ca2889b055f9d4730 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
This is a patch to make gtk2 build on core-updates.
Re= levant details can be found on today irc logs.
Just the most impo= rtant points:

gtk+-2 build fails on core-updates w= ith a failing test: gtk/abitest.sh

The cause of th= e failure is that the new version of glib currently on core-updates exposes= a new marshaller, therefore the abi provided by the library is a superset = of the expected abi, and this test requires exact match.

Here is a snippet of communcation with upstream:
17:49 < EmmanueleBassi> gabriel_: It= 9;s fine to ignore
17:49 < E= mmanueleBassi> gabriel_: GLib added a new marshaller in its public API
17:50 < EmmanueleBassi> ga= briel_: And the `abicheck.sh`in GTK+ 2.24 hasn't been updated because G= TK+ 2.24 is in deep maintenance mode and very few people test it against ne= wer versions of GLib 17:50 < EmmanueleBassi> There's the question= as to whether GLib should have added a new marshaller in the public API in= the first place
[17:56]=C2=A0<g_bor> Emm= anueleBassi> But that happened a long time ago

S= o it seems, that this is fine to ignore this, and upstream is not intereste= d in fixing it.

My fix restricts the test to the gtk abi,= which I think is the good thing to do.

2017-12-05 20:52 GMT+01:00 GNU bug Tracki= ng System <help-debbugs@gnu.org>:
Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
=C2=A0guix-patches@gnu.org

If you wish to submit further information on this problem, please
send it to 29580@debbugs.gnu.org.

Please do not send mail to help-deb= bugs@gnu.org unless you wish
to report a problem with the Bug-tracking system.

--
29580: http://debbugs.gnu.org/cgi/bugreport= .cgi?bug=3D29580
GNU Bug Tracking System
Contact help-debbugs@gnu.org wi= th problems

--94eb2c0b9c9ca2889b055f9d4730-- From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 05 18:26:19 2017 Received: (at 29580) by debbugs.gnu.org; 5 Dec 2017 23:26:19 +0000 Received: from localhost ([127.0.0.1]:48229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMMbT-0000QQ-9T for submit@debbugs.gnu.org; Tue, 05 Dec 2017 18:26:19 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:57838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMMbQ-0000QG-S9 for 29580@debbugs.gnu.org; Tue, 05 Dec 2017 18:26:17 -0500 Received: from localhost (178.113.162.72.wireless.dyn.drei.com [178.113.162.72]) by dd1012.kasserver.com (Postfix) with ESMTPSA id E9CFE1CA0725; Wed, 6 Dec 2017 00:26:12 +0100 (CET) Date: Wed, 6 Dec 2017 00:26:08 +0100 From: Danny Milosavljevic To: =?ISO-8859-1?Q?G=E1bor?= Boskovits Subject: Re: [bug#29580] [PATCH] gnu: gtk+-2: Fix failing test. Message-ID: <20171206002608.1c4dcb7d@scratchpost.org> In-Reply-To: <20171205195028.32244-1-boskovits@gmail.com> References: <20171205195028.32244-1-boskovits@gmail.com> X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 29580 Cc: 29580@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Please add a comment to the patch file at the top as to how it fixes the tests (I take it there are other symbols not starting with "gtk_" which are now filtered out - which ones?) From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 06 09:20:08 2017 Received: (at 29580) by debbugs.gnu.org; 6 Dec 2017 14:20:08 +0000 Received: from localhost ([127.0.0.1]:48647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMaYQ-0003KR-M5 for submit@debbugs.gnu.org; Wed, 06 Dec 2017 09:20:06 -0500 Received: from mail-wr0-f170.google.com ([209.85.128.170]:41071) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMaYM-0003Jr-Mf for 29580@debbugs.gnu.org; Wed, 06 Dec 2017 09:20:06 -0500 Received: by mail-wr0-f170.google.com with SMTP id z18so4070118wrb.8 for <29580@debbugs.gnu.org>; Wed, 06 Dec 2017 06:20:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=k5XPokkj3Wmsos5gnVkKXmJnjKVtX67JXB+NJlSxGA0=; b=itYKZF2KH7kwladAxkJCihCpdqLG7c8GdJj73tmCYbkeiHRa5JGS2Dymc1Izq7y4YV EOUhf8eR7VabG4Lal/9sYjGyBEQBXHajBQFdbwi/dAyqGEQm6t2T658zXTjEoKllVd5r g2I6I80WvD8x87adydA3tf/m6jJZ5Ce4OEMtthfZAIw//fuCwnf5yNyCDcW/hzDGBX4F 4uUhCgGJcJQo2AB7gambc9Xn7iq7Pxjp6yo6VvRBhMUhQUI8v7/SrCzHC8QHSuKy/eIL kFj4wkiH1bBpOHjprL14w3ff8s6axAh0ag/D+2Ti8pFFe3DMG1Mr/gWmKv1QMgjfB5MM yuZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=k5XPokkj3Wmsos5gnVkKXmJnjKVtX67JXB+NJlSxGA0=; b=ON0IdJnvNhqN/NO9b97KEAc0bQCNwq1Hv0nZOgEoMu/X6bhL9WVA8fEY51BqiGu0q1 Y8tOUfZ0Rjvq4irB+AknTEIA4e3UTzdSYdTLqKb5JrnTQSrEmzTJNPFb9mxtfQpW0wVX H6MOmTv75oU5sAkwgksJgxGCy9MBP6DwZxVd/FN7tR8HzDXuZhUjAxoL88QarabLmHI3 /hXedmkd0PU1xOwmtrApyDsqxXYYxyfgzwwQUtcvN5XKUkNHscLD5WcbvvTSTFnLWpWp lUql+rao+N7FC9VdG4WJFEHqgPBh+e6YBW5ZPcK+xfEXdB1bPG1k/OFwnI9+XcpUhvQy mnQg== X-Gm-Message-State: AJaThX6ps40a+Dz3M4RXRvN24x9HDxvkyKXA27vZAsJCIkaL9Xt5Sn/L Y+BdYhR6Kur05Y7emjnh8Q== X-Google-Smtp-Source: AGs4zMZj+BYniFUMQmW92blUGiDMLHw9LcgvgGJ16BoufuRZYpZ2r3eLNn/P0SStkt5ojAM4da8VKg== X-Received: by 10.223.181.132 with SMTP id c4mr18622570wre.42.1512569996893; Wed, 06 Dec 2017 06:19:56 -0800 (PST) Received: from localhost.localdomain (540137C1.dsl.pool.telekom.hu. [84.1.55.193]) by smtp.gmail.com with ESMTPSA id p200sm3247561wmd.9.2017.12.06.06.19.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Dec 2017 06:19:53 -0800 (PST) From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= To: dannym@scratchpost.org, 29580@debbugs.gnu.org Subject: [PATCH] gnu: gtk+-2: Fix failing test. Date: Wed, 6 Dec 2017 15:19:03 +0100 Message-Id: <20171206141903.22449-1-boskovits@gmail.com> X-Mailer: git-send-email 2.15.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 29580 Cc: =?UTF-8?q?G=C3=A1bor=20Boskovits?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) * 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 06 14:42:08 2017 Received: (at 29580) by debbugs.gnu.org; 6 Dec 2017 19:42:08 +0000 Received: from localhost ([127.0.0.1]:49480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMfa4-0002wK-Gx for submit@debbugs.gnu.org; Wed, 06 Dec 2017 14:42:08 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:51132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMfa2-0002wB-Ms for 29580@debbugs.gnu.org; Wed, 06 Dec 2017 14:42:08 -0500 Received: from localhost (77.118.197.212.wireless.dyn.drei.com [77.118.197.212]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 256FD1CA0039; Wed, 6 Dec 2017 20:42:03 +0100 (CET) Date: Wed, 6 Dec 2017 20:41:59 +0100 From: Danny Milosavljevic To: =?ISO-8859-1?Q?G=E1bor?= Boskovits Subject: Re: [PATCH] gnu: gtk+-2: Fix failing test. Message-ID: <20171206204159.2d460b7d@scratchpost.org> In-Reply-To: <20171206141903.22449-1-boskovits@gmail.com> References: <20171206141903.22449-1-boskovits@gmail.com> X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 29580 Cc: 29580@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) The patch doesn't apply using "git am" for me. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 07 12:02:58 2017 Received: (at 29580-done) by debbugs.gnu.org; 7 Dec 2017 17:02:58 +0000 Received: from localhost ([127.0.0.1]:50900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMzZZ-0007Ff-Rc for submit@debbugs.gnu.org; Thu, 07 Dec 2017 12:02:58 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMzZV-0007FR-5h for 29580-done@debbugs.gnu.org; Thu, 07 Dec 2017 12:02:56 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id CCDA62074D; Thu, 7 Dec 2017 12:02:52 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Thu, 07 Dec 2017 12:02:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=qKOqNJqV4teQM27ZmY3v7zzw0/an3fpiWPAe2npe3qY=; b=b9ObIE2c QWyrb+xlomF4j5m3KEKJMbiMAAeju+LhDQPzh/wVjLG4XqnzkeqlibA+Oco40IjB GEXvSL9j5hyl9lWoJIoxsSIVKROpsfyEZulR96w/dtPve6ZxXrKFgcGlj1EUOpPS YlI8I2KKr4xwxiQH9ZMxWN4EXzMDAMsodqtDPXy8PAAhM7GyPSLcrXL0gVa82yiN ngSnuKLJJWSa9BtokNX167q64qQ3+POUlQvBH06Amc5EMwZYqC6gPAGEeSJUIg1+ VAj+oxpnL8MVOxjs8yVBNpci0/bgnFp51jotwimvsPQhCJoil1X7a4bpIUU6NT5Q 4mjE2nDYCZjgZA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=qKOqNJqV4teQM27ZmY3v7zzw0/an3 fpiWPAe2npe3qY=; b=cSSwJQgUN7qqWpwVGN3jw91E1uLS63Oz7KnE0rhbcQRpZ ZSqwAWEHXe6zs19Vxq34/+1d3LBbUhAI/trUKNtjFG2PthmiYtRaEKqhuButNbJO +RRmkxukf+jzu9RG/ZWz+ADcTmcdryoooosQkGoLyz5kz3KOqHzicDkCTMRLOY4I d+8BdaICPK5DDaoHiMoLlBY1HUGXnIAEnjmMAjhi4btdunHPu/30jlT/Ff0Ubxlm mTYabLL18IKwYNvIgTlLnObQAtRO9hGq8JkGQo4PknbEsa9uI+fJdMyGL4dDICnj eNopHBavjh5ve8vJaxidhooBjtJzGlyeOdmUYb/kg== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id 4D55E7FAD2; Thu, 7 Dec 2017 12:02:52 -0500 (EST) From: Marius Bakke To: =?utf-8?Q?G=C3=A1bor?= Boskovits , dannym@scratchpost.org, 29580-done@debbugs.gnu.org Subject: Re: [bug#29580] [PATCH] gnu: gtk+-2: Fix failing test. In-Reply-To: <20171206141903.22449-1-boskovits@gmail.com> References: <20171205195028.32244-1-boskovits@gmail.com> <20171206141903.22449-1-boskovits@gmail.com> User-Agent: Notmuch/0.25.2 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) 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" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 29580-done Cc: =?utf-8?Q?G=C3=A1bor?= Boskovits X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= 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----- --=-=-=-- From unknown Sat Jun 21 12:11:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 05 Jan 2018 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator