gentoo auto-resync : 28:01:2025 - 22:42:58

4 files changed, 59 insertions, 1 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 891797362347..f5324885e705 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index e8e9c861b352..3b515ade9aa1 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,8 +1,9 @@
+AUX 47.0-c23.patch 2532 BLAKE2B 0954b1deaaea55a02b837031176e68037541cd9cb7cb31d5876374f958c08b221bd330c951bb1295888df839a8ceb35bf75f207b96018df00356bb9a3b7c7cf0 SHA512 cc2b5e126a16a0aabe6f935fb2e813a62e4e85f139d4d3b3a4bfc8ecbf2311b9f98abd007748e856a23959115bf87e71381530a2cd46b65e9b4e69ef2de54da0
 AUX default.pa 328 BLAKE2B 558dbedcb5a0f31e0bdc01ce21deaeacb4740dee998f8b2f947361745ea6680acf8662e426adf1d3f777af714c2fb7cf5ec74b2807187c37e2d8d896e863fa0d SHA512 4f0e9c38ae0c17b8f4ee6e37b87259676c4ff4e62fd315989c9e20012a8070c5b5571f835379639f76f157530495928cdc79265473478b1d9fe6d8ad0d64785d
 AUX gdm-3.30.3-logo.patch 846 BLAKE2B e99b6621191c509545bc36fe838bc467c3762f2726e247aea1b3cad2a86c0b0e95c5f9953b680a072d244140615c38becbc605998a2be0ed3332d7b5ef802f55 SHA512 63428d4605d9f4f35445f364657c1d92818125a737add7bc5e5acab424beaf8ae5895368111cd2d1c03c75f5fd8b9538d8750ea732a0990b5b82507735850e4c
 DIST gdm-46.2.tar.xz 931868 BLAKE2B 53b6efb6ae0a60592c6790c4ff676e6bdd7e8096eabb002f3c0d7ad1ba63498cd38799bf0d6606528d05a57b72630ce36bbd1c3e3810bc344df88c445a09c517 SHA512 29cb00b42b64313f63cbf33a0caf9ecaf43f38699983017966fba951b867742129ef150cd927d02add5f7c1c20049ba1301e5ee094caa54835dc12cf29c86210
 DIST gdm-47.0.tar.xz 936172 BLAKE2B 603c253888a2f10d5acf66c29b5892134375160c6edd8badbc6314c15b8ab82c38de7a7ef22c260e32d19ddb2893d8d3c498df8731a7c39ac2337f42faee8639 SHA512 5578b2839ec78ef0b155a6ef6b82384495ef0f3ceb49f4bc7c656bf9dafa95b260148c7fc9b8295b71d4a2d33f6fe6c4a47485cd9eba5c0929f0492ba06e0893
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gdm-46.2-r2.ebuild 5782 BLAKE2B 847c64d7611304417e046c7c68b8c41cd90605469aad4c4513d33ea0edc6ae25cd9327fbc10d1b34bc2372c5c560644551a5a529bb29ffcaff3417d9481f28eb SHA512 1c03f8c5222d52e7017f1902b5f8cb9cc5831e60a2cef49d76cd99732ff0f4744e10484fd400764babad78a7196ffc289468ffb8cfa81f5b28dcd698e738ccf3
-EBUILD gdm-47.0.ebuild 5724 BLAKE2B 1b0a84e9cd43c045d46a736bc5f586524645e5efc005d696ec41d65aa9588afdf1d57d5f42fef24f4b3760a5e60e05b65401fc1d32205ff61557c829e3057341 SHA512 378137bcb4227a52dbc3e87ef2f2cd65db0a3c4030d2f91ce348880c915373f260bc7bb17d7fbeeb2744ac9964e842ebdc5df4bf067f120dfb05c561fb03477f
+EBUILD gdm-47.0.ebuild 5762 BLAKE2B 22a1128eeffeca07689d919a5cb31ba85835b0eb4dd8da89800072e883ae11d94142c3608190fff6d44ae8bcae5b1e033d74d5456a07bb16497f32bc576930f3 SHA512 ab604593feda549b2b5e97d23bfa0021477d60e904d522bce2dd5884533688e9fc058becdcf03be4b893f77d9f5d3063b576b330d3c66bfed29202db5c3b936e
 MISC metadata.xml 775 BLAKE2B c5e6f026d1a42133c98e450ac82e943485e81d42ead7e632d9c8610442d5a138393bb1c0e97827f2b450719ba0450471eff7d04908429acd63818cbea6f49144 SHA512 562bea1d24550c5de69a15102f259e05498f1bd6b7d2a40bd4997546dd373e9fe9911a7873ee3b3c16c149f891766eb5bdfbefa3aa6589f9c8425f7d3b65ced0
diff --git a/gnome-base/gdm/files/47.0-c23.patch b/gnome-base/gdm/files/47.0-c23.patch
new file mode 100644
index 000000000000..f2a48d7334c1
--- /dev/null
+++ b/gnome-base/gdm/files/47.0-c23.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/944223
+https://gitlab.gnome.org/GNOME/gdm/-/issues/964
+https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/273
+
+From a5f9f274c9c902519336a489cfed0548206d2bca 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
diff --git a/gnome-base/gdm/gdm-47.0.ebuild b/gnome-base/gdm/gdm-47.0.ebuild
index 0ad8a60ead62..9a2ee26825b0 100644
--- a/gnome-base/gdm/gdm-47.0.ebuild
+++ b/gnome-base/gdm/gdm-47.0.ebuild
@@ -116,6 +116,8 @@ src_prepare() {
 
 	# Show logo when branding is enabled
 	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
+
+	eapply "${FILESDIR}/47.0-c23.patch"
 }
 
 src_configure() {