Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

systemd/gdm: fix building with gcc 15

Browse source 
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6861

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Biswapriyo Nath 2025-08-01 06:12:48 +00:00 • committed by Clayton Craft
parent a068708156
commit 2d84b7fcff
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
2 changed files with 55 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extra-repos/systemd/gdm/APKBUILD
View file

@ -3,7 +3,7 @@
pkgname=gdm
pkgver=99948.0
_pkgver=48.0
pkgrel=2
pkgrel=3
pkgdesc="GNOME display manager"
url="https://wiki.gnome.org/Projects/GDM"
# blocked by gnome-shell
@ -45,6 +45,7 @@ source="https://download.gnome.org/sources/gdm/${_pkgver%%.*}/gdm-$_pkgver.tar.x
0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
0003-DOWNSTREAM-pam-rename-common-to-base.patch
Xsession
gcc15.patch
"
install="gdm.pre-install gdm.post-deinstall"
builddir="$srcdir/gdm-$_pkgver"
@ -81,4 +82,5 @@ sha512sums="
aa302c33c9b31e823ab98ca80c330c3f7eaa10d05c402cf111d78a35fbec82ce90bff34c19b713b6e352428c31df91f04bd01b58cae8968e130a991c73382020 0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
66611d49fc4c9578415a7e554834edcb9de99396bd0ca511dcfd4fb256e8a1cd1fd5f10464f4668ffe04799d919bc22ddb58e8bf272017edba69a7951522e63d 0003-DOWNSTREAM-pam-rename-common-to-base.patch
f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82 Xsession
9b6b1aba510267bfa366666dd1f2d3b22b0a8875313d72dbdbd568d79255e59b705a052889acff3b052a3dae38b87b3bc770a70604f64670f77a16c045c9d29c gcc15.patch
"

52
extra-repos/systemd/gdm/gcc15.patch Normal file
View file

@ -0,0 +1,52 @@
From 2fbc2ac50b9f143eb594e5f77a8051222ffbd2c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
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(-)
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