From c0f3a055935f51480095c877151f7d13c19d7b3b Mon Sep 17 00:00:00 2001 From: Wolfgang Müller Date: Sat, 11 Jun 2022 11:38:50 +0200 Subject: group-desktop: Update weltschmerz patch for dev-libs/glib-2.72.1 --- .../0001-Add-weltschmerz-as-terminal-handler.patch | 42 ---------------------- .../0001-Add-weltschmerz-as-terminal-handler.patch | 42 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 group-desktop/patches/dev-libs/glib-2.70.4/0001-Add-weltschmerz-as-terminal-handler.patch create mode 100644 group-desktop/patches/dev-libs/glib-2.72.1/0001-Add-weltschmerz-as-terminal-handler.patch (limited to 'group-desktop/patches') diff --git a/group-desktop/patches/dev-libs/glib-2.70.4/0001-Add-weltschmerz-as-terminal-handler.patch b/group-desktop/patches/dev-libs/glib-2.70.4/0001-Add-weltschmerz-as-terminal-handler.patch deleted file mode 100644 index 2f8c618..0000000 --- a/group-desktop/patches/dev-libs/glib-2.70.4/0001-Add-weltschmerz-as-terminal-handler.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 496b4857d4fef1651f55ace4d99beb9ca174dd45 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= -Date: Sat, 29 May 2021 14:24:04 +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 1a4b97918..2ae930a27 100644 ---- a/gio/gdesktopappinfo.c -+++ b/gio/gdesktopappinfo.c -@@ -2578,6 +2578,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) - { -@@ -2622,6 +2630,7 @@ prepend_terminal_to_vector (int *argc, - } - } - -+done: - real_argc = term_argc + *argc; - real_argv = g_new (char *, real_argc + 1); - --- -2.33.0 - diff --git a/group-desktop/patches/dev-libs/glib-2.72.1/0001-Add-weltschmerz-as-terminal-handler.patch b/group-desktop/patches/dev-libs/glib-2.72.1/0001-Add-weltschmerz-as-terminal-handler.patch new file mode 100644 index 0000000..2f8c618 --- /dev/null +++ b/group-desktop/patches/dev-libs/glib-2.72.1/0001-Add-weltschmerz-as-terminal-handler.patch @@ -0,0 +1,42 @@ +From 496b4857d4fef1651f55ace4d99beb9ca174dd45 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= +Date: Sat, 29 May 2021 14:24:04 +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 1a4b97918..2ae930a27 100644 +--- a/gio/gdesktopappinfo.c ++++ b/gio/gdesktopappinfo.c +@@ -2578,6 +2578,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) + { +@@ -2622,6 +2630,7 @@ prepend_terminal_to_vector (int *argc, + } + } + ++done: + real_argc = term_argc + *argc; + real_argv = g_new (char *, real_argc + 1); + +-- +2.33.0 + -- cgit v1.2.3-2-gb3c3