[gentoo-commits] gentoo-x86 commit in app-i18n/ibus/files: ibus-1.4.0-machine-id-fallback.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/12/23 07:59:07

  Added:                ibus-1.4.0-machine-id-fallback.patch
  Log:
  Support /etc/machine-id fallback wrt #390463 by "Alphat-PC"
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/files/ibus-1.4.0-machine-id-fallback.patch?rev=1.1&content-type=text/plain

Index: ibus-1.4.0-machine-id-fallback.patch
===================================================================
http://cgit.freedesktop.org/dbus/dbus/commit/dbus/dbus-sysdeps-unix.c?id=66e52541d5bdd4927a5c702963749760643313f4

http://bugs.gentoo.org/390463

--- src/ibusshare.c
+++ src/ibusshare.c
@@ -41,7 +41,11 @@ ibus_get_local_machine_id (void)
 
     if (machine_id == NULL) {
         GError *error = NULL;
-        if (!g_file_get_contents ("/var/lib/dbus/machine-id",
+        if (!g_file_get_contents ("/etc/machine-id",
+                                  &machine_id,
+                                  NULL,
+                                  NULL) &&
+            !g_file_get_contents ("/var/lib/dbus/machine-id",
                                   &machine_id,
                                   NULL,
                                   &error)) {