Created
July 6, 2025 13:21
-
-
Save mingaleg/f2b7969eb22e6722864bf06048df5ac5 to your computer and use it in GitHub Desktop.
GNU23 CC patch for AUR gdm-prime
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.SRCINFO b/.SRCINFO | |
| index 38634e2..672ac4e 100644 | |
| --- a/.SRCINFO | |
| +++ b/.SRCINFO | |
| @@ -45,9 +45,11 @@ pkgbase = gdm-prime | |
| source = git+https://gitlab.gnome.org/GNOME/gdm.git#tag=48.0 | |
| source = 0001-Xsession-Don-t-start-ssh-agent-by-default.patch | |
| source = 0002-nvidia-prime.patch | |
| + source = 0003-gnu23-bool-fix.patch | |
| b2sums = d08d2137f630999b2f36bd8b798805e145fd7350fc4a092056cfdddd2170ae57b3b17a3a8f44f4c08a7e527a165fdce0dfa7a934188bc487d2a6d5bd848497b0 | |
| b2sums = f7e868fdd7cc121433de1572583eb728f4d186cd4f52c6d6c8f2ccf4a3cf781144ff71f704f13571ddb97a1ff4ec55cfa3df25d38737ad19da21e84ddc2d3ee4 | |
| b2sums = b02edd38bb178b457379717633f935f18bea153470905d34675a587c807a4c0de79e48cc82c53ec5a139d667f57c13e652ea6d9cb3a7fcd05bdd59b9cf715b45 | |
| + b2sums = 6f0708ccfb6d50d085d950a848163ddf86788fd506597161aa8d5b358c0c7e7e37c0e76186f4cf3f262f468f98b42dc0f9a855837c54d2e29c675229e86e9692 | |
| pkgname = gdm-prime | |
| groups = gnome | |
| diff --git a/0003-gnu23-bool-fix.patch b/0003-gnu23-bool-fix.patch | |
| new file mode 100644 | |
| index 0000000..3741fb3 | |
| --- /dev/null | |
| +++ b/0003-gnu23-bool-fix.patch | |
| @@ -0,0 +1,49 @@ | |
| +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, | |
| diff --git a/PKGBUILD b/PKGBUILD | |
| index 18b3661..a698d1c 100644 | |
| --- a/PKGBUILD | |
| +++ b/PKGBUILD | |
| @@ -61,10 +61,12 @@ source=( | |
| "git+https://gitlab.gnome.org/GNOME/gdm.git#tag=${pkgver/[a-z]/.&}" | |
| 0001-Xsession-Don-t-start-ssh-agent-by-default.patch | |
| 0002-nvidia-prime.patch | |
| + 0003-gnu23-bool-fix.patch | |
| ) | |
| b2sums=('d08d2137f630999b2f36bd8b798805e145fd7350fc4a092056cfdddd2170ae57b3b17a3a8f44f4c08a7e527a165fdce0dfa7a934188bc487d2a6d5bd848497b0' | |
| 'f7e868fdd7cc121433de1572583eb728f4d186cd4f52c6d6c8f2ccf4a3cf781144ff71f704f13571ddb97a1ff4ec55cfa3df25d38737ad19da21e84ddc2d3ee4' | |
| - 'b02edd38bb178b457379717633f935f18bea153470905d34675a587c807a4c0de79e48cc82c53ec5a139d667f57c13e652ea6d9cb3a7fcd05bdd59b9cf715b45') | |
| + 'b02edd38bb178b457379717633f935f18bea153470905d34675a587c807a4c0de79e48cc82c53ec5a139d667f57c13e652ea6d9cb3a7fcd05bdd59b9cf715b45' | |
| + '6f0708ccfb6d50d085d950a848163ddf86788fd506597161aa8d5b358c0c7e7e37c0e76186f4cf3f262f468f98b42dc0f9a855837c54d2e29c675229e86e9692') | |
| prepare() { | |
| cd gdm | |
| @@ -73,6 +75,8 @@ prepare() { | |
| git apply -3 ../0001-Xsession-Don-t-start-ssh-agent-by-default.patch | |
| git apply -3 ../0002-nvidia-prime.patch | |
| + | |
| + git apply -3 ../0003-gnu23-bool-fix.patch | |
| } | |
| build() { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment