From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WI0JJcMBjmFaJQAAgWs5BA (envelope-from ) for ; Fri, 12 Nov 2021 06:55:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id IJCsIMMBjmGAeAAA1q6Kng (envelope-from ) for ; Fri, 12 Nov 2021 05:55:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 35D2EDFD0 for ; Fri, 12 Nov 2021 06:55:15 +0100 (CET) Received: from localhost ([::1]:36624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlPWs-0003kx-Df for larch@yhetil.org; Fri, 12 Nov 2021 00:55:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlPWg-0003kb-VS for guix-patches@gnu.org; Fri, 12 Nov 2021 00:55:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlPWg-0007Nd-Mp for guix-patches@gnu.org; Fri, 12 Nov 2021 00:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mlPWg-0001Kf-ME for guix-patches@gnu.org; Fri, 12 Nov 2021 00:55:02 -0500 Subject: bug#50521: [PATCH core-updates-frozen] gnu: gtk+-2: Fix =?UTF-8?Q?=E2=80=98builder=E2=80=99?= test Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 12 Nov 2021 05:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 50521 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thiago Jung Bauermann Cc: 50521-done@debbugs.gnu.org Mail-Followup-To: 50521@debbugs.gnu.org, maxim.cournoyer@gmail.com, bauermann@kolabnow.com Received: via spool by 50521-done@debbugs.gnu.org id=D50521.16366964635057 (code D ref 50521); Fri, 12 Nov 2021 05:55:02 +0000 Received: (at 50521-done) by debbugs.gnu.org; 12 Nov 2021 05:54:23 +0000 Received: from localhost ([127.0.0.1]:43009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlPW2-0001JU-VN for submit@debbugs.gnu.org; Fri, 12 Nov 2021 00:54:23 -0500 Received: from mail-qv1-f46.google.com ([209.85.219.46]:36460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlPW0-0001JG-UB for 50521-done@debbugs.gnu.org; Fri, 12 Nov 2021 00:54:21 -0500 Received: by mail-qv1-f46.google.com with SMTP id kl8so1106713qvb.3 for <50521-done@debbugs.gnu.org>; Thu, 11 Nov 2021 21:54:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=z+T9eEwKelFqOBPExoTsRQtzKdfld/I6um/OMzJ3d4I=; b=Xss7TuOwyz4ONYjAkyIHbTfc83/Pokd6lylI2Ybr0P9sHP3eDj/tUdxjQ3XpH3+kBi lnGFxb4LpL/+/CW+TFCCsaliZwZpcE4Du8gvx0NFRXiKoHjNSO3fohvM5yqJ2y1uwUp+ y6sdcG+tp4qETLKmJoZvIof/LkkmLgsO1Qww0mJ0RbIVGNPuGRa12edUsyDnWD/1pzre 4TwjIzFm5y4hePH/x5PDG23lJ9vAHf9brJ3RdvWQaZnFyRjQI4vZXHJtBHk6c23j+Vg5 B09D6VHxcLuKMLpFeL5x9oIy12NM+YOzwPbYVJ4lcXtGFYHTUjzytQOTDn/5eck9YleX RrEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=z+T9eEwKelFqOBPExoTsRQtzKdfld/I6um/OMzJ3d4I=; b=qZXHxf82PP3u7ut5M5pImuHmPaaZsvM6yN1iYxSYF5ayvcEnlQqkDOhraUU7AKzbF7 Bo/4uZwdlk2XCPM06QB7As2LYuIDv61L3hDcEvtvzWwswh0tm8uN6omj8sxJ73xKcOEC quGJj20CT1QtWyXqKie3VT2Vf9GqudazK4dRC1ecBUfROyQ1+iufOh0ShlytabjtFZDF ieaCGOQz3W9JtcORrFSxnwpWaGXrzas7JwH3/yAKLMFnrNR+AP3Ptn5lBDgVfc/2gf0b 2cAi6I1l9l3xcdKUj8IMT267zAL0R8KNuBe3NaQ1pd7nZTyQ3GVij3gAiZA/tzsUAAuV /jOA== X-Gm-Message-State: AOAM532DEQM36OERdyAZhO9gSUiLYtH0ae/pkW5SEba0QIFwDiXA3yQB kg2mntyT7JaCffRwwV5c8qpaCsdXW9HOzaKk X-Google-Smtp-Source: ABdhPJyRCcTfCumwm1aagArQu5kkT+2cAMPWS4hzYSPbf8I3LDp3Oc04sT0KiJFGrDaBzrHI7J/9iw== X-Received: by 2002:a05:6214:226c:: with SMTP id gs12mr12674785qvb.49.1636696455267; Thu, 11 Nov 2021 21:54:15 -0800 (PST) Received: from hurd (dsl-10-133-155.b2b2c.ca. [72.10.133.155]) by smtp.gmail.com with ESMTPSA id az14sm2266301qkb.125.2021.11.11.21.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Nov 2021 21:54:14 -0800 (PST) From: Maxim Cournoyer References: <20210911170732.137404-1-bauermann@kolabnow.com> Date: Fri, 12 Nov 2021 00:54:06 -0500 In-Reply-To: <20210911170732.137404-1-bauermann@kolabnow.com> (Thiago Jung Bauermann's message of "Sat, 11 Sep 2021 14:07:32 -0300") Message-ID: <87pmr5q5q9.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1636696515; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=z+T9eEwKelFqOBPExoTsRQtzKdfld/I6um/OMzJ3d4I=; b=c8GbX1VThWt/iH6lIlXic39PvfyniUwlNikn2YKIXvSOuQ7uftECb8O2EX6L0gsYBCdEs0 /mP9rFjXif8nl79r+7CRyAP573meW+VQre37oKfpw4cE3RpGhmtGmUPMIYb+P9z3RsP2ur NkycoZ2syuyAndGx0hQw7wMhSypz8frUJG/KxYRpJ/4rAs94wRQAFLNf3igegK/wLG+ZDY 5jPxCnf0Th/0aPBFJbWHovlN45cEwOTCo9vVP1gvUhEETf7f1kSX4sCCMirzd1mRTUE8Lk 0++u1+PRI1s894Sl8O4KI4uOhsOjW38Fzrq8VJOEJ88vd/ZmKPvvxea1ET7xPw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636696515; a=rsa-sha256; cv=none; b=qFQwct7gN74UeB/wvHc6DjpifYuTohxUi0wuQcyQFTEKy/ga4AU6xDv78v0NwhF6y4NK05 MN7LjUK8QKlDhMfREwNt8wXsJj7A7NANLsELXZo2llVBwt8accNX0Wp+jQA6eqthTqr1WM 1ZJD6TffPHIBYLQBZpVZHtOCTA8Tuv2CQXc/TPfTn+EWgyRy6NL0YkdZ2A0qbNy5ybZ+AJ lUGk871mXvTT7TDv2YGcEyNk7yZPKtkUTM6HLt3SCM6dLKOzyioQyWVSlsgpE89bHUh70W m85zeoI2KB0NeWiQUZMLmgFv6djkeClmdVQVJb10X2AVD7NfBBY/AVsyK8yMgQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Xss7TuOw; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Xss7TuOw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 35D2EDFD0 X-Spam-Score: -1.73 X-Migadu-Scanner: scn1.migadu.com X-TUID: uq9kYkUEIFgj Hello, Thiago Jung Bauermann writes: > The signal callbacks in the =E2=80=98builder=E2=80=99 testcase have wrong= prototypes. > This causes it to fail the =E2=80=9C/Builder/Signal Autoconnect=E2=80=9D = test on > powerpc64le-linux. > > Solve the problem by backporting the upstream fix that was applied to > GTK+ 3.0. > > * gnu/packages/patches/gtk2-fix-builder-test.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/gtk.scm (gtk+-2): Use it. > --- > > Hello, > > This fixes the build of gtk+-2 on powerpc64le-linux. > > Thanks, > Thiago > > gnu/local.mk | 1 + > gnu/packages/gtk.scm | 3 +- > .../patches/gtk2-fix-builder-test.patch | 94 +++++++++++++++++++ > 3 files changed, 97 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/gtk2-fix-builder-test.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 07e6787642e9..6d19a6332ba0 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1205,6 +1205,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/guile-emacs-fix-configure.patch \ > %D%/packages/patches/guile-ssh-fix-test-suite.patch \ > %D%/packages/patches/guile-ssh-read-error.patch \ > + %D%/packages/patches/gtk2-fix-builder-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 24c24d56530f..c7a682b37548 100644 > --- a/gnu/packages/gtk.scm > +++ b/gnu/packages/gtk.scm > @@ -847,7 +847,8 @@ is part of the GNOME accessibility project.") > "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc")) > (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patc= h" > "gtk2-respect-GUIX_GTK2_IM_MODULE= _FILE.patch" > - "gtk2-theme-paths.patch")))) > + "gtk2-theme-paths.patch" > + "gtk2-fix-builder-test.patch")))) > (build-system gnu-build-system) > (outputs '("out" "bin" "doc")) > (propagated-inputs > diff --git a/gnu/packages/patches/gtk2-fix-builder-test.patch b/gnu/packa= ges/patches/gtk2-fix-builder-test.patch > new file mode 100644 > index 000000000000..8c41e596fe95 > --- /dev/null > +++ b/gnu/packages/patches/gtk2-fix-builder-test.patch > @@ -0,0 +1,94 @@ > +From e45e11238036e06c8fe78bea1691b256ca41837b Mon Sep 17 00:00:00 2001 > +From: Steve Langasek > +Date: Tue, 7 Jan 2014 13:55:28 +0100 > +Subject: [PATCH] fix prototypes of signal callbacks in the test suite > + > +The signal callbacks are defined to take pointers as their arguments, bu= t the > +callbacks found in testsuite/gtk/builder.c are passing a GParamSpec by v= alue > +as the second argument. This confuses and angers the compiler on ppc64e= l, > +resulting in segfaults after return from the function due to stack-smash= ing > +by the (completely-unused) argument. > + > +https://bugzilla.gnome.org/show_bug.cgi?id=3D721700 > +--- > + > +This is a backport to v2.24.33 of upstream commit: > + > +https://gitlab.gnome.org/GNOME/gtk/-/commit/256561db2f0b34e01047f8882b3e= 0cb8c6d9dbab > + > + gtk/tests/builder.c | 16 ++++++++-------- > + 1 file changed, 8 insertions(+), 8 deletions(-) > + > +diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c > +index 8529dacc2f6e..23d5096062fa 100644 > +--- a/gtk/tests/builder.c > ++++ b/gtk/tests/builder.c > +@@ -132,7 +132,7 @@ static int object =3D 0; > + static int object_after =3D 0; > +=20 > + void /* exported for GtkBuilder */ > +-signal_normal (GtkWindow *window, GParamSpec spec) > ++signal_normal (GtkWindow *window, GParamSpec *spec) > + { > + g_assert (GTK_IS_WINDOW (window)); > + g_assert (normal =3D=3D 0); > +@@ -142,7 +142,7 @@ signal_normal (GtkWindow *window, GParamSpec spec) > + } > +=20 > + void /* exported for GtkBuilder */ > +-signal_after (GtkWindow *window, GParamSpec spec) > ++signal_after (GtkWindow *window, GParamSpec *spec) > + { > + g_assert (GTK_IS_WINDOW (window)); > + g_assert (normal =3D=3D 1); > +@@ -152,7 +152,7 @@ signal_after (GtkWindow *window, GParamSpec spec) > + } > +=20 > + void /* exported for GtkBuilder */ > +-signal_object (GtkButton *button, GParamSpec spec) > ++signal_object (GtkButton *button, GParamSpec *spec) > + { > + g_assert (GTK_IS_BUTTON (button)); > + g_assert (object =3D=3D 0); > +@@ -162,7 +162,7 @@ signal_object (GtkButton *button, GParamSpec spec) > + } > +=20 > + void /* exported for GtkBuilder */ > +-signal_object_after (GtkButton *button, GParamSpec spec) > ++signal_object_after (GtkButton *button, GParamSpec *spec) > + { > + g_assert (GTK_IS_BUTTON (button)); > + g_assert (object =3D=3D 1); > +@@ -172,28 +172,28 @@ signal_object_after (GtkButton *button, GParamSpec= spec) > + } > +=20 > + void /* exported for GtkBuilder */ > +-signal_first (GtkButton *button, GParamSpec spec) > ++signal_first (GtkButton *button, GParamSpec *spec) > + { > + g_assert (normal =3D=3D 0); > + normal =3D 10; > + } > +=20 > + void /* exported for GtkBuilder */ > +-signal_second (GtkButton *button, GParamSpec spec) > ++signal_second (GtkButton *button, GParamSpec *spec) > + { > + g_assert (normal =3D=3D 10); > + normal =3D 20; > + } > +=20 > + void /* exported for GtkBuilder */ > +-signal_extra (GtkButton *button, GParamSpec spec) > ++signal_extra (GtkButton *button, GParamSpec *spec) > + { > + g_assert (normal =3D=3D 20); > + normal =3D 30; > + } > +=20 > + void /* exported for GtkBuilder */ > +-signal_extra2 (GtkButton *button, GParamSpec spec) > ++signal_extra2 (GtkButton *button, GParamSpec *spec) > + { > + g_assert (normal =3D=3D 30); > + normal =3D 40; Now in core-updates-frozen with commit 4b4e35a771cbcc7b72d28e9a4c6a0d6de2000175. Thank you! Closing. Maxim