From b3f2504c1d05b5999b74b2135860fc721e3adf68 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 15 Jul 2022 07:41:50 +0100
Subject: gentoo auto-resync : 15:07:2022 - 07:41:50

---
 mate-extra/mate-power-manager/Manifest             |  4 +-
 ...e-power-manager-1.24.3-removing-backtrace.patch | 89 ++++++++++++++++++++++
 ...te-power-manager-1.24.3-removing-execinfo.patch | 38 +++++++++
 .../mate-power-manager-1.24.3.ebuild               |  6 +-
 4 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 mate-extra/mate-power-manager/files/mate-power-manager-1.24.3-removing-backtrace.patch
 create mode 100644 mate-extra/mate-power-manager/files/mate-power-manager-1.24.3-removing-execinfo.patch

(limited to 'mate-extra/mate-power-manager')

diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 7cc95a7203e5..e45625e07512 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,4 +1,6 @@
 AUX mate-power-manager-1.24.1-libsecret.patch 10306 BLAKE2B cf9789f62117c3aded2ce2d73027393bb5c19364f847fbbddeaa7b3b9be1bccdff3b2b1de28198965d65d4f906994c7f91bbb45448cedad0515a8a35aef12e22 SHA512 8646269729d01287cdf213a2a20a262fb658ba95fac47b521dd727ac8a4c3b81776cd24f6d9a3afc9311a4ebf2fe5cacece1db9487ba74f6cb04f008fdbf6238
+AUX mate-power-manager-1.24.3-removing-backtrace.patch 2026 BLAKE2B 55db952ea8c1328516cd98dbecae2702f939708a1f430beefcd2f4339e227d964dc3c272f6800a0652274213aec650665975212e6c182a9c3391a821a5817fe4 SHA512 fd5c9590ceead43653760324aa4a28fbafb82af7287b1b1eb0e4afe1b9cd6ba010162c98081a5df6a7ee18666ea7edb1e5aa148f047f1c5b4b0e329743d9fbfd
+AUX mate-power-manager-1.24.3-removing-execinfo.patch 774 BLAKE2B ef9035810f8121c00b0ced49ff993930b21c46e4fb2fc1f45d98799c624d5b15bf5d00b5fd5b2d40a89d61252022d67f3bbaac37ccdb464428bda48e4872e59d SHA512 e71688c75fa322cf208b8fc583e587b33a000314fe48fb76c3de98d6bb157adeb6d2280a70284d9c0912a3aea69468ead0dc49c9ecd495b20c3b178b4a425c51
 DIST mate-power-manager-1.24.3.tar.xz 6199712 BLAKE2B 21eb92d6b0bc8f97c3f13847e877d6df7d8782ca90cae20e414d38c18ec9345b4b6a65cc72ed23010aec65d764381e66ac01a77a60b698c43764f2c3eb6c5229 SHA512 6aad5c5346e563ce0fbc4e72bccce49323843e3b12738b9e45040dd804f962344a1dbc8f26d518b28fc35ca9ec87a2068f81731eb0c094be114378f2f93a2a8c
-EBUILD mate-power-manager-1.24.3.ebuild 1636 BLAKE2B 0c82419c4f7fb5b8ca1cd68f72c4565178b7409e3c617f334361c974fce5269d8097a6433a5648e0eb4b340864e48ea26a22d2a36b7d599af8edf57d64f8110e SHA512 45e15c88a7074aac52effc872b938496cf8ad08a6ba41c911e1f6654cbc96a2101a2b7993cad1ceda19da1f5cb52c980ee50a7e4f32ca53f3a9b07cf1a838e19
+EBUILD mate-power-manager-1.24.3.ebuild 1742 BLAKE2B d105cb11e2bd6843eb3360fbfa7a90ad344965c11a5a1983864656722e2e449eef0e06471a448df459f986a2f63227e7210309ff4bbe63e5c820ab58611bb9d3 SHA512 6588d17ac5f4cac76b332421475359e89d1905be8d3af4444d9cf582904353c50551ffdb7c1a3f6572eed65e559c5a5afde8308c5a70c01b40937e145096c0be
 MISC metadata.xml 522 BLAKE2B 2a85d9773f593cd52b0340d7b702a93e69b01f08c972940f6df7c208aea599c550da200316d3369f0961a27435b86c0ff2fc5822df026c7a1110e0fd9d6fe5fd SHA512 e6b3132766dec16a44d0ef79477eb39865242fe68580d6bf4a1700329f4a623181656c06669adca1a16a1d143b23b8799368eda667d7cd928ea58554fb364b9d
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.24.3-removing-backtrace.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.24.3-removing-backtrace.patch
new file mode 100644
index 000000000000..62157058ba6f
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.24.3-removing-backtrace.patch
@@ -0,0 +1,89 @@
+# Instead of deleting the code blocks, just putting them inside a ifndef
+# condition is safer
+--- a/applets/brightness/egg-debug.c
++++ b/applets/brightness/egg-debug.c
+@@ -74,6 +74,7 @@ pk_set_console_mode (guint console_code)
+ 	printf ("%s", command);
+ }
+
++#if (defined(__UCLIBC__) || defined(__GLIBC__))
+ /**
+  * egg_debug_backtrace:
+  **/
+@@ -98,6 +99,7 @@ egg_debug_backtrace (void)
+ 		free (symbols);
+ 	}
+ }
++#endif
+
+ /**
+  * pk_log_line:
+@@ -229,8 +231,10 @@ egg_error_real (const gchar *func, const gchar *file, const int line, const gcha
+ 	pk_print_line (func, file, line, buffer, CONSOLE_RED);
+ 	g_free(buffer);
+
++#if (defined(__UCLIBC__) || defined(__GLIBC__))
+ 	/* we want to fix this! */
+ 	egg_debug_backtrace ();
++#endif
+
+ 	exit (1);
+ }
+--- a/applets/inhibit/egg-debug.c
++++ b/applets/inhibit/egg-debug.c
+@@ -74,6 +74,7 @@ pk_set_console_mode (guint console_code)
+ 	printf ("%s", command);
+ }
+
++#if (defined(__UCLIBC__) || defined(__GLIBC__))
+ /**
+  * egg_debug_backtrace:
+  **/
+@@ -98,6 +99,7 @@ egg_debug_backtrace (void)
+ 		free (symbols);
+ 	}
+ }
++#endif
+
+ /**
+  * pk_log_line:
+@@ -229,8 +231,10 @@ egg_error_real (const gchar *func, const gchar *file, const int line, const gcha
+ 	pk_print_line (func, file, line, buffer, CONSOLE_RED);
+ 	g_free(buffer);
+
++#if (defined(__UCLIBC__) || defined(__GLIBC__))
+ 	/* we want to fix this! */
+ 	egg_debug_backtrace ();
++#endif
+
+ 	exit (1);
+ }
+--- a/src/egg-debug.c
++++ b/src/egg-debug.c
+@@ -74,6 +74,7 @@ pk_set_console_mode (guint console_code)
+ 	printf ("%s", command);
+ }
+
++#if (defined(__UCLIBC__) || defined(__GLIBC__))
+ /**
+  * egg_debug_backtrace:
+  **/
+@@ -98,6 +99,7 @@ egg_debug_backtrace (void)
+ 		free (symbols);
+ 	}
+ }
++#endif
+
+ /**
+  * pk_log_line:
+@@ -229,8 +231,10 @@ egg_error_real (const gchar *func, const gchar *file, const int line, const gcha
+ 	pk_print_line (func, file, line, buffer, CONSOLE_RED);
+ 	g_free(buffer);
+
++#if (defined(__UCLIBC__) || defined(__GLIBC__))
+ 	/* we want to fix this! */
+ 	egg_debug_backtrace ();
++#endif
+
+ 	exit (1);
+ }
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.24.3-removing-execinfo.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.24.3-removing-execinfo.patch
new file mode 100644
index 000000000000..9a0febfad6c1
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.24.3-removing-execinfo.patch
@@ -0,0 +1,38 @@
+# Musl doesn't supply execinfo.h as a result build fails.
+# Closes: https://bugs.gentoo.org/762484
+--- a/applets/brightness/egg-debug.c
++++ b/applets/brightness/egg-debug.c
+@@ -39,7 +39,9 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <time.h>
++#if (defined(__GLIBC__))
+ #include <execinfo.h>
++#endif
+
+ #include "egg-debug.h"
+
+--- a/applets/inhibit/egg-debug.c
++++ b/applets/inhibit/egg-debug.c
+@@ -39,7 +39,9 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <time.h>
++#if (defined(__GLIBC__))
+ #include <execinfo.h>
++#endif
+
+ #include "egg-debug.h"
+
+--- a/src/egg-debug.c
++++ b/src/egg-debug.c
+@@ -39,7 +39,9 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <time.h>
++#if (defined(__GLIBC__))
+ #include <execinfo.h>
++#endif
+
+ #include "egg-debug.h"
+
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.24.3.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.3.ebuild
index c4ac7770bc43..72093adfd245 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.24.3.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.3.ebuild
@@ -58,7 +58,11 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.24.1-libsecret.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.24.1-libsecret.patch"
+	"${FILESDIR}/${PN}-1.24.3-removing-execinfo.patch"
+	"${FILESDIR}/${PN}-1.24.3-removing-backtrace.patch"
+)
 
 src_configure() {
 	mate_src_configure \
-- 
cgit v1.2.3