branch core-updates updated: gnu: glib: Fix g_app_info_get_default_for_type.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

dannym pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 0bcc1b1  gnu: glib: Fix g_app_info_get_default_for_type.
0bcc1b1 is described below

commit 0bcc1b14fc3e2382406b97577c56e2292b96b8d4
Author: Danny Milosavljevic <address@hidden>
AuthorDate: Mon Jan 6 19:58:20 2020 +0100

    gnu: glib: Fix g_app_info_get_default_for_type.
    
    Fixes <https://bugs.gnu.org/38524>.
    Reported by Reza Alizadeh Majd <address@hidden>.
    
    * gnu/packages/glib.scm 
(glib)[arguments]<#:phases>[patch-gio-launch-desktop]:
    New phase.
    [move-executables]: Modify.
---
 gnu/packages/glib.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 2e7f436..4fe38b7 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -213,6 +213,15 @@ shared NFS home directories.")
                  (string-append "command_line = g_strdup_printf (\""
                                 dbus "/bin/dbus-launch")))
               #t)))
+        (add-after 'unpack 'patch-gio-launch-desktop
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let ((out (assoc-ref outputs "out")))
+              ;; See also <https://gitlab.gnome.org/GNOME/glib/issues/1633>
+              ;; for another future fix.
+              (substitute* "gio/gdesktopappinfo.c"
+               (("gio-launch-desktop")
+                (string-append out "/libexec/gio-launch-desktop")))
+              #t)))
         (add-before 'build 'pre-build
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; For tests/gdatetime.c.
@@ -321,6 +330,13 @@ shared NFS home directories.")
               (mkdir-p bin)
               (rename-file (string-append out "/bin")
                            (string-append bin "/bin"))
+              ;; This one is an implementation detail of glib.
+              ;; It is wrong that that's in "/bin" in the first place,
+              ;; but that's what upstream is doing right now.
+              ;; See <https://gitlab.gnome.org/GNOME/glib/issues/1633>.
+              (mkdir (string-append out "/libexec"))
+              (rename-file (string-append bin "/bin/gio-launch-desktop")
+                           (string-append out "/libexec/gio-launch-desktop"))
               ;; Do not refer to "bindir", which points to "${prefix}/bin".
               ;; We don't patch "bindir" to point to "$bin/bin", because that
               ;; would create a reference cycle between the "out" and "bin"