From patchwork Sat Sep 11 17:07:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 32759 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 287CB27BBE3; Sat, 11 Sep 2021 18:14:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8A66A27BBE1 for ; Sat, 11 Sep 2021 18:14:46 +0100 (BST) Received: from localhost ([::1]:54714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mP6aT-0002kb-Ka for patchwork@mira.cbaines.net; Sat, 11 Sep 2021 13:14:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mP6Ty-0007W7-DB for guix-patches@gnu.org; Sat, 11 Sep 2021 13:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mP6Ty-0002d8-4G for guix-patches@gnu.org; Sat, 11 Sep 2021 13:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mP6Tx-0007iB-Vl for guix-patches@gnu.org; Sat, 11 Sep 2021 13:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50521] [PATCH core-updates-frozen] gnu: gtk+-2: Fix =?utf-8?b?4oCYYnVpbGRlcuKAmQ==?= test Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Sep 2021 17:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50521 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50521@debbugs.gnu.org Cc: Thiago Jung Bauermann X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163138007929627 (code B ref -1); Sat, 11 Sep 2021 17:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Sep 2021 17:07:59 +0000 Received: from localhost ([127.0.0.1]:41346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mP6Tu-0007hn-RW for submit@debbugs.gnu.org; Sat, 11 Sep 2021 13:07:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:40048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mP6Tt-0007hf-9I for submit@debbugs.gnu.org; Sat, 11 Sep 2021 13:07:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mP6Ts-0007PN-UL for guix-patches@gnu.org; Sat, 11 Sep 2021 13:07:57 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:14096 helo=ext-mx-out001.mykolab.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mP6To-0002VW-Ue for guix-patches@gnu.org; Sat, 11 Sep 2021 13:07:55 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id AD9C3652 for ; Sat, 11 Sep 2021 19:07:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1631380066; x=1633194467; bh=OtnRYUFuJirjoEep6JuMim4G6+UXUoMgiryQ4EPFIvo=; b=U6OS+P5IuWNQ hfWwKItQwVLbCD79B/5fn+WRqoraS/8D54hNzyfEzHcDoonWuq/3UBqN4hXvLY4U kUBphSf07lv4DJii/H426a92vBLGMLykr/0+kFsCoo99qJoNRzDnGSHPiSsllNoC aPy4phkhMzavVPHPJhIvPiln9hfWfQvc5a8XfnqVlAOHdq7Y5479+vKF/uqtPia9 x2zv1K//+R44X1hUcnEhbMy9XPCrTfcDGMrWMlCA0WyoGcmTbKSOGoTgaRBPlb4e xq3ME9KO2Sgv0nEJPhX7+22cYa5zbcXNPt9ZLdgjBo0YFRXoY0CMYmVmXd5fYfNL URduEa89X/jJ7krB+VPdGdob9o8+oC7Nzmud+wedtvfvN6SuRuP8I3pWQXehFWSv xMcbwNRI31wTcJOen9mDS/pMCsENnm7OBkvwIGf4nbkIubMick1SyLJOaSFVdYW2 zvBg6rtrl4Q8768amDRyDURQ5k938JTf7cauGsi3aWljZFUtPPXbrpit701DrRom tdXSnEAWf026vFf4Bz24zdrJ0xpkmntPcjqqYYyslDAP9qs5yEPumc5MJByc5g50 FqIANhbQmq59x6PojTaICVySMXJWLhr7WGwHTU6QoZJ+6LxAKBUHdC4CA4Rg6k2f wxTZL0sa+NT3nJftBh25eC7I+XUmNwA= X-Virus-Scanned: amavisd-new at mykolab.com Received: from ext-mx-out001.mykolab.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C7gG9gWXhu3m for ; Sat, 11 Sep 2021 19:07:46 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id AF9B14D1 for ; Sat, 11 Sep 2021 19:07:46 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 6B7581F3; Sat, 11 Sep 2021 19:07:46 +0200 (CEST) Date: Sat, 11 Sep 2021 14:07:32 -0300 Message-Id: <20210911170732.137404-1-bauermann@kolabnow.com> MIME-Version: 1.0 Received-SPF: pass client-ip=95.128.36.42; envelope-from=bauermann@kolabnow.com; helo=ext-mx-out001.mykolab.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches The signal callbacks in the ‘builder’ testcase have wrong prototypes. This causes it to fail the “/Builder/Signal Autoconnect” 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 = \ %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.patch" "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/packages/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, but the +callbacks found in testsuite/gtk/builder.c are passing a GParamSpec by value +as the second argument. This confuses and angers the compiler on ppc64el, +resulting in segfaults after return from the function due to stack-smashing +by the (completely-unused) argument. + +https://bugzilla.gnome.org/show_bug.cgi?id=721700 +--- + +This is a backport to v2.24.33 of upstream commit: + +https://gitlab.gnome.org/GNOME/gtk/-/commit/256561db2f0b34e01047f8882b3e0cb8c6d9dbab + + 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 = 0; + static int object_after = 0; + + 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 == 0); +@@ -142,7 +142,7 @@ signal_normal (GtkWindow *window, GParamSpec spec) + } + + 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 == 1); +@@ -152,7 +152,7 @@ signal_after (GtkWindow *window, GParamSpec spec) + } + + 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 == 0); +@@ -162,7 +162,7 @@ signal_object (GtkButton *button, GParamSpec spec) + } + + 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 == 1); +@@ -172,28 +172,28 @@ signal_object_after (GtkButton *button, GParamSpec spec) + } + + void /* exported for GtkBuilder */ +-signal_first (GtkButton *button, GParamSpec spec) ++signal_first (GtkButton *button, GParamSpec *spec) + { + g_assert (normal == 0); + normal = 10; + } + + void /* exported for GtkBuilder */ +-signal_second (GtkButton *button, GParamSpec spec) ++signal_second (GtkButton *button, GParamSpec *spec) + { + g_assert (normal == 10); + normal = 20; + } + + void /* exported for GtkBuilder */ +-signal_extra (GtkButton *button, GParamSpec spec) ++signal_extra (GtkButton *button, GParamSpec *spec) + { + g_assert (normal == 20); + normal = 30; + } + + void /* exported for GtkBuilder */ +-signal_extra2 (GtkButton *button, GParamSpec spec) ++signal_extra2 (GtkButton *button, GParamSpec *spec) + { + g_assert (normal == 30); + normal = 40;