group-desktop: Update weltschmerz patch for glib

Since we have a proper commit for this patch now, use the format-patch
output for the actual patch. Additionally make sure the patch only
applies to the current stable glib version (2.62.6) such that the next
updated build won't just fail.

2 files changed, 42 insertions, 29 deletions

diff --git a/group-desktop/patches/dev-libs/glib-2.62.6/0001-Add-weltschmerz-as-terminal-handler.patch b/group-desktop/patches/dev-libs/glib-2.62.6/0001-Add-weltschmerz-as-terminal-handler.patch
new file mode 100644
index 0000000..6174fd3
--- /dev/null
+++ b/group-desktop/patches/dev-libs/glib-2.62.6/0001-Add-weltschmerz-as-terminal-handler.patch
@@ -0,0 +1,42 @@
+From bf990986382cd1182dc7f6566fb2a9c3dfcd7dd0 Mon Sep 17 00:00:00 2001
+From: Wynn Wolf Arbor <wolf@oriole.systems>
+Date: Tue, 21 Apr 2020 12:47:05 +0200
+Subject: [PATCH] Add weltschmerz as terminal handler
+
+This commit integrates weltschmerz into glib's AppInfo functionality,
+such that it can be launched right out of an application without any
+extra script plumbing.
+---
+ gio/gdesktopappinfo.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
+index f1e2fdd65..2617fc3dd 100644
+--- a/gio/gdesktopappinfo.c
++++ b/gio/gdesktopappinfo.c
+@@ -2544,6 +2544,14 @@ prepend_terminal_to_vector (int    *argc,
+   term_argc = 2;
+   term_argv = g_new0 (char *, 3);
+ 
++  check = g_find_program_in_path ("weltschmerz");
++  if (check != NULL)
++    {
++      term_argv[0] = check;
++      term_argc--;
++      goto done;
++    }
++
+   check = g_find_program_in_path ("gnome-terminal");
+   if (check != NULL)
+     {
+@@ -2584,6 +2592,7 @@ prepend_terminal_to_vector (int    *argc,
+         }
+     }
+ 
++done:
+   real_argc = term_argc + *argc;
+   real_argv = g_new (char *, real_argc + 1);
+ 
+-- 
+2.26.1
+
diff --git a/group-desktop/patches/dev-libs/glib/add-weltschmerz.patch b/group-desktop/patches/dev-libs/glib/add-weltschmerz.patch
deleted file mode 100644
index 5f7c693..0000000
--- a/group-desktop/patches/dev-libs/glib/add-weltschmerz.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 7d7425ea9..7a31a519e 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2523,6 +2523,12 @@ prepend_terminal_to_vector (int    *argc,
-     }
-   else
-     {
-+      int skip_option = 0;
-+      if (check == NULL)
-+        {
-+          check = g_find_program_in_path ("weltschmerz");
-+          skip_option = 1;
-+        }
-       if (check == NULL)
-         check = g_find_program_in_path ("nxterm");
-       if (check == NULL)
-@@ -2537,7 +2543,10 @@ prepend_terminal_to_vector (int    *argc,
-           g_debug ("Couldn’t find a terminal: falling back to xterm");
-         }
-       term_argv[0] = check;
--      term_argv[1] = g_strdup ("-e");
-+      if (!skip_option)
-+        term_argv[1] = g_strdup ("-e");
-+      else
-+        term_argc--;
-     }
- 
-   real_argc = term_argc + *argc;