diff -uNr glib-2.58.3/gio/gdbusaddress.c glib-2.58.3.mod/gio/gdbusaddress.c --- glib-2.58.3/gio/gdbusaddress.c 2019-01-21 15:38:50.000000000 +0200 +++ glib-2.58.3.mod/gio/gdbusaddress.c 2019-03-02 02:08:55.324976201 +0200 @@ -1628,7 +1628,7 @@ ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS")); if (ret == NULL) { - ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket"); + ret = g_strdup ("unix:path=@TERMUX_PREFIX@/var/run/dbus/system_bus_socket"); } break; diff -uNr glib-2.58.3/gio/gdbusprivate.c glib-2.58.3.mod/gio/gdbusprivate.c --- glib-2.58.3/gio/gdbusprivate.c 2019-01-21 15:38:50.000000000 +0200 +++ glib-2.58.3.mod/gio/gdbusprivate.c 2019-03-02 02:08:55.328309547 +0200 @@ -2098,17 +2098,17 @@ /* TODO: use PACKAGE_LOCALSTATEDIR ? */ ret = NULL; first_error = NULL; - if (!g_file_get_contents ("/var/lib/dbus/machine-id", + if (!g_file_get_contents ("@TERMUX_PREFIX@/var/lib/dbus/machine-id", &ret, NULL, &first_error) && - !g_file_get_contents ("/etc/machine-id", + !g_file_get_contents ("@TERMUX_PREFIX@/etc/machine-id", &ret, NULL, NULL)) { g_propagate_prefixed_error (error, first_error, - _("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: ")); + _("Unable to load @TERMUX_PREFIX@/var/lib/dbus/machine-id or @TERMUX_PREFIX@/etc/machine-id: ")); } else { diff -uNr glib-2.58.3/gio/gnetworking.h.in glib-2.58.3.mod/gio/gnetworking.h.in --- glib-2.58.3/gio/gnetworking.h.in 2019-01-21 15:38:50.000000000 +0200 +++ glib-2.58.3.mod/gio/gnetworking.h.in 2019-03-02 02:08:55.331642893 +0200 @@ -55,7 +55,7 @@ #endif #ifndef _PATH_RESCONF -#define _PATH_RESCONF "/etc/resolv.conf" +#define _PATH_RESCONF "@TERMUX_PREFIX@/etc/resolv.conf" #endif #ifndef CMSG_LEN diff -uNr glib-2.58.3/gio/gunixmounts.c glib-2.58.3.mod/gio/gunixmounts.c --- glib-2.58.3/gio/gunixmounts.c 2019-01-21 15:38:50.000000000 +0200 +++ glib-2.58.3.mod/gio/gunixmounts.c 2019-03-02 02:08:55.331642893 +0200 @@ -539,7 +539,7 @@ return _PATH_MOUNTED; # endif #else - return "/etc/mtab"; + return "@TERMUX_PREFIX@/etc/mtab"; #endif } @@ -666,7 +666,7 @@ mountinfo_path = _PATH_MOUNTED; # endif #else - mountinfo_path = "/etc/mtab"; + mountinfo_path = "@TERMUX_PREFIX@/etc/mtab"; #endif return mountinfo_path; @@ -960,7 +960,7 @@ #elif defined(VFSTAB) return VFSTAB; #else - return "/etc/fstab"; + return "@TERMUX_PREFIX@/etc/fstab"; #endif #endif } @@ -2955,7 +2955,7 @@ /* see if device with similar major:minor as /dev/root is mention * in /etc/mtab (it usually is) */ - f = fopen ("/etc/mtab", "r"); + f = fopen ("@TERMUX_PREFIX@/etc/mtab", "r"); if (f != NULL) { struct mntent *entp; diff -uNr glib-2.58.3/gio/tests/org.gtk.test.gschema.override.orig glib-2.58.3.mod/gio/tests/org.gtk.test.gschema.override.orig --- glib-2.58.3/gio/tests/org.gtk.test.gschema.override.orig 2019-01-21 15:38:50.000000000 +0200 +++ glib-2.58.3.mod/gio/tests/org.gtk.test.gschema.override.orig 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -[org.gtk.test.per-desktop:GNOME-Classic] -desktop = "GNOME Classic" diff -uNr glib-2.58.3/gio/tests/org.gtk.test.gschema.xml.orig glib-2.58.3.mod/gio/tests/org.gtk.test.gschema.xml.orig --- glib-2.58.3/gio/tests/org.gtk.test.gschema.xml.orig 2019-01-21 15:38:50.000000000 +0200 +++ glib-2.58.3.mod/gio/tests/org.gtk.test.gschema.xml.orig 1970-01-01 03:00:00.000000000 +0300 @@ -1,222 +0,0 @@ - - - - - "Hello, earthlings" - A greeting - - Greeting of the invading martians - - - - "So long" - - - - - - - - - - true - - - - - - true - - - 25 - - - -1234 - - - 1234 - - - -123456 - - - 123456 - - - -123456789 - - - 123456789 - - - 123.456 - - - "a string, it seems" - - - "/a/object/path" - - - - - - ("one",(2,3)) - - - [0,1,2,3,4,5] - - - - { - "AC": [0,0, 0,0,0,0,0,0], - "IV": [0,0, 0,0,0,0,0,0] - } - - - - - - - "Unnamed" - - - "BackSpace" - - - - - - false - - - false - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - "" - - - [48, 49] - - - [] - - - 'foo' - - - ['mourning', 'laughing'] - - - 33 - - - - - - - 'bar' - - - - - - [] - - - - - - - - - [] - - - 'bar' - - - - - - 33 - - - - - - - 33 - - - - - - 0 - - - - - - - a paragraph. - - with some whitespace. - - because not everyone has a great editor. - - - - - lots of space is as one. - - 0 - - - - - - 0 - - - '' - - - - 42 - - 0 - - - - - - "GNOME" - - - - diff -uNr glib-2.58.3/gio/xdgmime/xdgmime.c glib-2.58.3.mod/gio/xdgmime/xdgmime.c --- glib-2.58.3/gio/xdgmime/xdgmime.c 2019-01-21 15:38:50.000000000 +0200 +++ glib-2.58.3.mod/gio/xdgmime/xdgmime.c 2019-03-02 02:08:55.334976238 +0200 @@ -255,7 +255,7 @@ xdg_data_dirs = getenv ("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) - xdg_data_dirs = "/usr/local/share/:/usr/share/"; + xdg_data_dirs = "@TERMUX_PREFIX@/local/share/:@TERMUX_PREFIX@/share/"; ptr = xdg_data_dirs; diff -uNr glib-2.58.3/glib/gcharset.c glib-2.58.3.mod/glib/gcharset.c --- glib-2.58.3/glib/gcharset.c 2019-01-21 15:38:50.000000000 +0200 +++ glib-2.58.3.mod/glib/gcharset.c 2019-03-02 02:08:55.334976238 +0200 @@ -298,7 +298,7 @@ if (g_once_init_enter (&alias_table)) { GHashTable *table = g_hash_table_new (g_str_hash, g_str_equal); - read_aliases ("/usr/share/locale/locale.alias", table); + read_aliases ("@TERMUX_PREFIX@/share/locale/locale.alias", table); g_once_init_leave (&alias_table, table); }