[patch] Portage repo diff fix for g_spawn_check_exit_status taken from Arch Linux

snapd-2.52-g_spawn_check_exit_status.patch (text/plain), 2.04 KB, created by Simon Alman on 2021-10-05 14:54:35 UTC

diff --git a/app-emulation/snapd/files/0001-cmd-libsnap-confine-private-g_spawn_check_exit_statu.patch b/app-emulation/snapd/files/0001-cmd-libsnap-confine-private-g_spawn_check_exit_statu.patch
new file mode 100644
index 000000000000..264097a2c6af
--- /dev/null
+++ b/app-emulation/snapd/files/0001-cmd-libsnap-confine-private-g_spawn_check_exit_statu.patch
@@ -0,0 +1,27 @@
+diff --git a/src/github.com/snapcore/snapd/cmd/libsnap-confine-private/test-utils.c b/work/snapd-2.52/src/github.com/snapcore/snapd/cmd/libsnap-confine-private/test-utils.c
+index c3e17a18d91b32da04f5febc802926942011ca9c..5cf4eb53de693ad17294c5eede3bd05339395878 100644
+--- a/src/github.com/snapcore/snapd/cmd/libsnap-confine-private/test-utils.c
++++ b/src/github.com/snapcore/snapd/cmd/libsnap-confine-private/test-utils.c
+@@ -23,6 +23,11 @@
+ 
+ #include <glib.h>
+ 
++#if !GLIB_CHECK_VERSION(2, 69, 0)
++// g_spawn_check_exit_status is considered deprecated since 2.69
++#define g_spawn_check_wait_status(x, y) (g_spawn_check_exit_status (x, y))
++#endif
++
+ void rm_rf_tmp(const char *dir)
+ {
+ 	// Sanity check, don't remove anything that's not in the temporary
+@@ -60,7 +65,7 @@ void rm_rf_tmp(const char *dir)
+ 		      (working_directory, argv, envp, flags, child_setup,
+ 		       user_data, standard_output, standard_error, &exit_status,
+ 		       &error));
+-	g_assert_true(g_spawn_check_exit_status(exit_status, NULL));
++	g_assert_true(g_spawn_check_wait_status(exit_status, NULL));
+ 	if (error != NULL) {
+ 		g_test_message("cannot remove temporary directory: %s\n",
+ 			       error->message);
+-- 
+2.33.0
diff --git a/app-emulation/snapd/snapd-2.52.ebuild b/app-emulation/snapd/snapd-2.52.ebuild
index abc28376ab87..a71476a81e5d 100644
--- a/app-emulation/snapd/snapd-2.52.ebuild
+++ b/app-emulation/snapd/snapd-2.52.ebuild
@@ -56,6 +56,10 @@ PDEPEND="sys-auth/polkit[gtk?,kde?]"
 
 README_GENTOO_SUFFIX=""
 
+PATCHES=(
+	${FILESDIR}/0001-cmd-libsnap-confine-private-g_spawn_check_exit_statu.patch
+)
+
 pkg_setup() {
 	if use apparmor; then
 		CONFIG_CHECK+=" ~SECURITY_APPARMOR"