diff options
| author |   brahmajit das <brahmajit.xyz@gmail.com> | 2022-07-08 23:29:45 +0530 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-07-15 02:28:14 +0100 |
| commit | b9949b9a1c0b5b31d98c5f006b3fc7bfdd997026 (patch) | |
| tree | 25d7af47d5659fbd4455d301f0f0c17de8b97787 /mate-extra | |
| parent | media-video/jellyfin-media-player: add 1.7.1 (diff) | |
| download | gentoo-b9949b9a1c0b5b31d98c5f006b3fc7bfdd997026.tar.gz gentoo-b9949b9a1c0b5b31d98c5f006b3fc7bfdd997026.tar.bz2 gentoo-b9949b9a1c0b5b31d98c5f006b3fc7bfdd997026.zip | |
mate-extra/mate-power-manager: Fix build on musl
mate-power-manager was failing to build on musl due to missing
execinfo.h, this header is not provided my musl, and egg_debug_backtrace
fucntion call. The egg_debug_backtrace function just prints some trace
to console.
Closes: https://bugs.gentoo.org/762484
Signed-off-by: brahmajit das <brahmajit.xyz@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26198
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'mate-extra')
3 files changed, 132 insertions, 1 deletions
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 \ |