Package: glib2.0 / 2.58.3-1

debian/Look-for-gio-launch-desktop-in-libdir-glib-2.0.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
From: Simon McVittie <smcv@debian.org>
Date: Wed, 1 Aug 2018 09:40:38 +0100
Subject: Look for gio-launch-desktop in $(libdir)/glib-2.0

In Debian, we install it in the shared library package to avoid
needing a circular dependency between libglib2.0-0 and
libglib2.0-bin.

Forwarded: not-needed, Debian-specific
---
 gio/Makefile.am       | 1 +
 gio/gdesktopappinfo.c | 4 ++--
 gio/meson.build       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 05b20cd..b498202 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -26,6 +26,7 @@ AM_CPPFLAGS = \
 	$(gmodule_INCLUDES)				\
 	$(GLIB_DEBUG_FLAGS)				\
 	-DGIO_COMPILATION				\
+	-DGIO_LIBDIR=\"$(libdir)\"			\
 	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	
 
 AM_CFLAGS = $(GLIB_WARN_CFLAGS)
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index d0ffbac..11b245a 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -2723,9 +2723,9 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo            *info,
           /* Allow test suite to specify path to gio-launch-desktop */
           tmp = g_getenv ("GIO_LAUNCH_DESKTOP");
 
-          /* Fall back on usual searching in $PATH */
           if (tmp == NULL)
-            tmp = "gio-launch-desktop";
+            tmp = GIO_LIBDIR "/glib-2.0/gio-launch-desktop";
+
           g_once_init_leave (&gio_launch_desktop_path, tmp);
         }
 
diff --git a/gio/meson.build b/gio/meson.build
index 853b2cc..c3b7b76 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -1,6 +1,7 @@
 gio_c_args = [
   '-DG_LOG_DOMAIN="GLib-GIO"',
   '-DGIO_COMPILATION',
+  '-DGIO_LIBDIR="@0@"'.format(glib_libdir),
   '-DGIO_MODULE_DIR="@0@"'.format(glib_giomodulesdir),
 ]