Commit | Line | Data |
---|---|---|
6965a696 LP |
1 | diff -uNr glib-2.52.3/gio/gdbusprivate.c glib-2.52.3.mod/gio/gdbusprivate.c |
2 | --- glib-2.52.3/gio/gdbusprivate.c 2017-06-22 15:52:49.000000000 +0300 | |
3 | +++ glib-2.52.3.mod/gio/gdbusprivate.c 2017-09-12 11:53:44.482990841 +0300 | |
4 | @@ -2075,11 +2075,11 @@ | |
5 | /* TODO: use PACKAGE_LOCALSTATEDIR ? */ | |
6 | ret = NULL; | |
7 | first_error = NULL; | |
8 | - if (!g_file_get_contents ("/var/lib/dbus/machine-id", | |
9 | + if (!g_file_get_contents ("@TERMUX_PREFIX@/var/lib/dbus/machine-id", | |
10 | &ret, | |
11 | NULL, | |
12 | &first_error) && | |
13 | - !g_file_get_contents ("/etc/machine-id", | |
14 | + !g_file_get_contents ("@TERMUX_PREFIX@/etc/machine-id", | |
15 | &ret, | |
16 | NULL, | |
17 | NULL)) | |
18 | diff -uNr glib-2.52.3/gio/gnetworking.h.in glib-2.52.3.mod/gio/gnetworking.h.in | |
19 | --- glib-2.52.3/gio/gnetworking.h.in 2017-06-22 15:52:49.000000000 +0300 | |
20 | +++ glib-2.52.3.mod/gio/gnetworking.h.in 2017-09-12 11:53:44.492990841 +0300 | |
21 | @@ -55,7 +55,7 @@ | |
22 | #endif | |
23 | ||
24 | #ifndef _PATH_RESCONF | |
25 | -#define _PATH_RESCONF "/etc/resolv.conf" | |
26 | +#define _PATH_RESCONF "@TERMUX_PREFIX@/etc/resolv.conf" | |
27 | #endif | |
28 | ||
29 | #ifndef CMSG_LEN | |
30 | diff -uNr glib-2.52.3/gio/gunixmounts.c glib-2.52.3.mod/gio/gunixmounts.c | |
31 | --- glib-2.52.3/gio/gunixmounts.c 2017-06-22 15:52:54.000000000 +0300 | |
32 | +++ glib-2.52.3.mod/gio/gunixmounts.c 2017-09-12 11:53:44.492990841 +0300 | |
33 | @@ -443,7 +443,7 @@ | |
34 | return _PATH_MOUNTED; | |
35 | # endif | |
36 | #else | |
37 | - return "/etc/mtab"; | |
38 | + return "@TERMUX_PREFIX@/etc/mtab"; | |
39 | #endif | |
40 | } | |
41 | ||
42 | @@ -561,7 +561,7 @@ | |
43 | mountinfo_path = _PATH_MOUNTED; | |
44 | # endif | |
45 | #else | |
46 | - mountinfo_path = "/etc/mtab"; | |
47 | + mountinfo_path = "@TERMUX_PREFIX@/etc/mtab"; | |
48 | #endif | |
49 | ||
50 | return mountinfo_path; | |
51 | @@ -852,7 +852,7 @@ | |
52 | #elif defined(VFSTAB) | |
53 | return VFSTAB; | |
54 | #else | |
55 | - return "/etc/fstab"; | |
56 | + return "@TERMUX_PREFIX@/etc/fstab"; | |
57 | #endif | |
58 | #endif | |
59 | } | |
60 | @@ -2702,7 +2702,7 @@ | |
61 | /* see if device with similar major:minor as /dev/root is mention | |
62 | * in /etc/mtab (it usually is) | |
63 | */ | |
64 | - f = fopen ("/etc/mtab", "r"); | |
65 | + f = fopen ("@TERMUX_PREFIX@/etc/mtab", "r"); | |
66 | if (f != NULL) | |
67 | { | |
68 | struct mntent *entp; | |
69 | diff -uNr glib-2.52.3/glib/gcharset.c glib-2.52.3.mod/glib/gcharset.c | |
70 | --- glib-2.52.3/glib/gcharset.c 2017-06-22 15:52:49.000000000 +0300 | |
71 | +++ glib-2.52.3.mod/glib/gcharset.c 2017-09-12 11:53:44.502990841 +0300 | |
72 | @@ -293,7 +293,7 @@ | |
73 | if (g_once_init_enter (&alias_table)) | |
74 | { | |
75 | GHashTable *table = g_hash_table_new (g_str_hash, g_str_equal); | |
76 | - read_aliases ("/usr/share/locale/locale.alias", table); | |
77 | + read_aliases ("@TERMUX_PREFIX@/share/locale/locale.alias", table); | |
78 | g_once_init_leave (&alias_table, table); | |
79 | } | |
80 | ||
81 | diff -uNr glib-2.52.3/glib/gspawn.c glib-2.52.3.mod/glib/gspawn.c | |
82 | --- glib-2.52.3/glib/gspawn.c 2017-06-22 15:52:49.000000000 +0300 | |
83 | +++ glib-2.52.3.mod/glib/gspawn.c 2017-09-12 11:53:44.502990841 +0300 | |
84 | @@ -1627,7 +1627,7 @@ | |
85 | ||
86 | new_argv = g_new0 (gchar*, argc + 2); /* /bin/sh and NULL */ | |
87 | ||
88 | - new_argv[0] = (char *) "/bin/sh"; | |
89 | + new_argv[0] = (char *) "@TERMUX_PREFIX@/bin/sh"; | |
90 | new_argv[1] = (char *) file; | |
91 | while (argc > 0) | |
92 | { | |
93 | diff -uNr glib-2.52.3/glib/gutils.c glib-2.52.3.mod/glib/gutils.c | |
94 | --- glib-2.52.3/glib/gutils.c 2017-06-22 15:52:49.000000000 +0300 | |
95 | +++ glib-2.52.3.mod/glib/gutils.c 2017-09-12 11:53:44.512990841 +0300 | |
96 | @@ -375,7 +375,7 @@ | |
97 | * what to search if PATH is unset. POSIX may, dunno. | |
98 | */ | |
99 | ||
100 | - path = "/bin:/usr/bin:."; | |
101 | + path = "@TERMUX_PREFIX@/bin:@TERMUX_PREFIX@/bin/applets:/system/xbin:/system/bin:."; | |
102 | } | |
103 | #else | |
104 | n = GetModuleFileNameW (NULL, wfilename, MAXPATHLEN); | |
105 | @@ -1959,7 +1959,7 @@ | |
106 | gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); | |
107 | ||
108 | if (!data_dirs || !data_dirs[0]) | |
109 | - data_dirs = "/usr/local/share/:/usr/share/"; | |
110 | + data_dirs = "@TERMUX_PREFIX@/share/"; | |
111 | ||
112 | data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); | |
113 | #endif | |
114 | @@ -2023,7 +2023,7 @@ | |
115 | conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS"); | |
116 | ||
117 | if (!conf_dirs || !conf_dirs[0]) | |
118 | - conf_dirs = "/etc/xdg"; | |
119 | + conf_dirs = "@TERMUX_PREFIX@/etc/xdg"; | |
120 | ||
121 | conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); | |
122 | #endif |