From patchwork Tue May 13 12:52:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 62863 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BA3DC3ABD7 for ; Tue, 13 May 2025 12:52:22 +0000 (UTC) Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by mx.groups.io with SMTP id smtpd.web10.75189.1747140740467011372 for ; Tue, 13 May 2025 05:52:20 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.81, mailfrom: f_l_k@t-online.de) Received: from fwd76.aul.t-online.de (fwd76.aul.t-online.de [10.223.144.102]) by mailout03.t-online.de (Postfix) with SMTP id 7B7EFE77 for ; Tue, 13 May 2025 14:52:18 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.170.233]) by fwd76.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1uEp7J-3FhvG50; Tue, 13 May 2025 14:52:17 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCH 1/3] gdm: fix gcc 15 issue Date: Tue, 13 May 2025 14:52:07 +0200 Message-ID: <20250513125209.1088462-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1747140737-89ADE5CE-4E13EDBD/0/0 CLEAN NORMAL X-TOI-MSGID: 0ab24d63-2724-426f-b147-d2b87b2154ca List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 May 2025 12:52:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117397 add a backport patch to fix: | In file included from ../gdm-48.0/common/gdm-settings-direct.c:38: | ../gdm-48.0/common/gdm-settings-utils.h:47:77: error: expected ';', ',' or ')' before 'bool' | 47 | gboolean *bool); | | ^~~~ Signed-off-by: Markus Volk --- ...aca75e16aeafc171751028406b54f5ed8397.patch | 56 +++++++++++++++++++ meta-gnome/recipes-gnome/gdm/gdm_48.0.bb | 1 + 2 files changed, 57 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gdm/gdm/a3e0aca75e16aeafc171751028406b54f5ed8397.patch diff --git a/meta-gnome/recipes-gnome/gdm/gdm/a3e0aca75e16aeafc171751028406b54f5ed8397.patch b/meta-gnome/recipes-gnome/gdm/gdm/a3e0aca75e16aeafc171751028406b54f5ed8397.patch new file mode 100644 index 0000000000..8363a7f41d --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm/a3e0aca75e16aeafc171751028406b54f5ed8397.patch @@ -0,0 +1,56 @@ +From 2fbc2ac50b9f143eb594e5f77a8051222ffbd2c9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 27 Jan 2025 14:01:23 +0100 +Subject: [PATCH] gdm-settings-utils: rename variable to fix build with gcc 15 + +In GNU23 C, bool is a keyword. Rename the variable to avoid syntax error. +--- + common/gdm-settings-utils.c | 8 ++++---- + common/gdm-settings-utils.h | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + + Signed-off-by: Markus Volk + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdm/-/commit/a3e0aca75e16aeafc171751028406b54f5ed8397.patch] + +diff --git a/common/gdm-settings-utils.c b/common/gdm-settings-utils.c +index 636be3a9e..da4c7aefb 100644 +--- a/common/gdm-settings-utils.c ++++ b/common/gdm-settings-utils.c +@@ -287,16 +287,16 @@ gdm_settings_parse_boolean_as_value (gboolean boolval) + /* adapted from GKeyFile */ + gboolean + gdm_settings_parse_value_as_boolean (const char *value, +- gboolean *bool) ++ gboolean *boolval) + { + g_return_val_if_fail (value != NULL, FALSE); +- g_return_val_if_fail (bool != NULL, FALSE); ++ g_return_val_if_fail (boolval != NULL, FALSE); + + if (g_ascii_strcasecmp (value, "true") == 0 || strcmp (value, "1") == 0) { +- *bool = TRUE; ++ *boolval = TRUE; + return TRUE; + } else if (g_ascii_strcasecmp (value, "false") == 0 || strcmp (value, "0") == 0) { +- *bool = FALSE; ++ *boolval = FALSE; + return TRUE; + } else { + return FALSE; +diff --git a/common/gdm-settings-utils.h b/common/gdm-settings-utils.h +index 4f2362ce7..734d625c7 100644 +--- a/common/gdm-settings-utils.h ++++ b/common/gdm-settings-utils.h +@@ -44,7 +44,7 @@ gboolean gdm_settings_parse_schemas (const char *fil + GSList **list); + + gboolean gdm_settings_parse_value_as_boolean (const char *value, +- gboolean *bool); ++ gboolean *boolval); + gboolean gdm_settings_parse_value_as_integer (const char *value, + int *intval); + gboolean gdm_settings_parse_value_as_double (const char *value, +-- +GitLab + diff --git a/meta-gnome/recipes-gnome/gdm/gdm_48.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_48.0.bb index 1c8076e6c7..92ddc143f6 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_48.0.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_48.0.bb @@ -21,6 +21,7 @@ GIR_MESON_OPTION = "" inherit gnomebase gsettings pkgconfig gobject-introspection gettext systemd useradd itstool gnome-help features_check +SRC_URI += "file://a3e0aca75e16aeafc171751028406b54f5ed8397.patch" SRC_URI[archive.sha256sum] = "1bc06daff093ec7b5e37ecb4f92e5da3474a1b1ba076edb9151ee967d1c30adf" PACKAGECONFIG ??= "" From patchwork Tue May 13 12:52:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 62861 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F75FC3DA4A for ; Tue, 13 May 2025 12:52:22 +0000 (UTC) Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by mx.groups.io with SMTP id smtpd.web10.75188.1747140740449843098 for ; Tue, 13 May 2025 05:52:20 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.22, mailfrom: f_l_k@t-online.de) Received: from fwd76.aul.t-online.de (fwd76.aul.t-online.de [10.223.144.102]) by mailout12.t-online.de (Postfix) with SMTP id 7B9215E6 for ; Tue, 13 May 2025 14:52:18 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.170.233]) by fwd76.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1uEp7J-3FhvG60; Tue, 13 May 2025 14:52:17 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCH 2/3] mutter: use libxcvt instead of xserver-xorg-cvt Date: Tue, 13 May 2025 14:52:08 +0200 Message-ID: <20250513125209.1088462-2-f_l_k@t-online.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250513125209.1088462-1-f_l_k@t-online.de> References: <20250513125209.1088462-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1747140737-11FF95CE-6184DB2A/0/0 CLEAN NORMAL X-TOI-MSGID: 430dd38a-abbf-426b-94f6-354f1cbd71f0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 May 2025 12:52:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117396 xserver-xorg-cvt is deprecated and libxcvt can be used as drop-in replacement Signed-off-by: Markus Volk --- meta-gnome/recipes-gnome/mutter/mutter_48.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/mutter/mutter_48.0.bb b/meta-gnome/recipes-gnome/mutter/mutter_48.0.bb index 777fef79b0..6f799ad57a 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_48.0.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_48.0.bb @@ -3,7 +3,6 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ - xserver-xorg-cvt-native \ wayland-native \ virtual/libx11 \ colord \ @@ -16,6 +15,7 @@ DEPENDS = " \ json-glib \ libdisplay-info \ libei \ + libxcvt-native \ libxtst \ libxkbfile \ python3-argcomplete-native \ From patchwork Tue May 13 12:52:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 62862 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E950C3ABD9 for ; Tue, 13 May 2025 12:52:22 +0000 (UTC) Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by mx.groups.io with SMTP id smtpd.web10.75190.1747140740661681780 for ; Tue, 13 May 2025 05:52:20 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.81, mailfrom: f_l_k@t-online.de) Received: from fwd76.aul.t-online.de (fwd76.aul.t-online.de [10.223.144.102]) by mailout03.t-online.de (Postfix) with SMTP id 7D747F07 for ; Tue, 13 May 2025 14:52:18 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.170.233]) by fwd76.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1uEp7J-3FhvG70; Tue, 13 May 2025 14:52:17 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCH 3/3] xserver-xorg-cvt: remove recipe Date: Tue, 13 May 2025 14:52:09 +0200 Message-ID: <20250513125209.1088462-3-f_l_k@t-online.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250513125209.1088462-1-f_l_k@t-online.de> References: <20250513125209.1088462-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1747140737-B97F85CE-B9FB9DF4/0/0 CLEAN NORMAL X-TOI-MSGID: 908e0386-cb14-4fc7-a1bc-904b8e4cc9ca List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 May 2025 12:52:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/117398 xserver-xorg-cvt is deprecated and can be replaced by libxcvt, which is in oe-core Signed-off-by: Markus Volk --- .../xserver-xorg-cvt-native_1.20.10.bb | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb diff --git a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb deleted file mode 100644 index e672701ae0..0000000000 --- a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "X.Org X cvt" -HOMEPAGE = "https://linux.die.net/man/1/cvt" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" - -DEPENDS += "pixman-native xorgproto-native libxrandr-native" - -XORG_PN = "xorg-server" - -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" -SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" - -S = "${WORKDIR}/${XORG_PN}-${PV}" -B = "${WORKDIR}/build" - -inherit pkgconfig native - -do_configure[noexec] = "1" - -do_compile() { - cd ${S} - for header in `find -name '*.h'`; do - path=`dirname $header` - if ! echo "$incpaths" | grep -q "$path" ; then - incpaths="$incpaths -I$path" - fi - done - CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`" - LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`" - ${CC} $CFLAGS -o ${B}/cvt \ - ${S}/hw/xfree86/utils/cvt/cvt.c \ - ${S}/hw/xfree86/modes/xf86cvt.c \ - ${S}/os/xprintf.c \ - $LDFLAGS -} - -do_install() { - install -d ${D}${bindir} - install -m 755 ${B}/cvt ${D}${bindir} -}