[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_f
From: |
Jonathan Brielmaier |
Subject: |
[bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type. |
Date: |
Tue, 7 Jan 2020 00:04:32 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 |
Hey Danny,
On 06.01.20 20:37, Danny Milosavljevic wrote:
> Fixes <https://bugs.gnu.org/38524>.
> Reported by Reza Alizadeh Majd <address@hidden>.
I think the bug link is wrong (it's about dhcp services).
>
> * 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 369bd373ac..9551509a53 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 "/bin/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 does right now.
> + ;; See <https://gitlab.gnome.org/GNOME/glib/issues/1633>.
> + (mkdir (string-append out "/bin"))
> + (rename-file (string-append bin "/bin/gio-launch-desktop")
> + (string-append out "/bin/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"
I would personally like, if we can update to 2.62. Because that is
needed for updating gnome to 3.34
(https://gitlab.com/jonsger/Guix/commits/wip-gnome-3.34). What do you think?
~Jonathan