GNU bug report logs - #38994
[PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 38994 in the body.
You can then email your comments to 38994 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: guix-patches <at> gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type.
Date: Mon,  6 Jan 2020 20:37:51 +0100

Fixes <https://bugs.gnu.org/38524>.
Reported by Reza Alizadeh Majd <r.majd <at> pantherx.org>.

* 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"

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: guix-patches <at> gnu.org
Subject: Re: [bug#38994] [PATCH core-updates] gnu: glib: Fix
 g_app_info_get_default_for_type.
Date: Tue, 7 Jan 2020 00:04:32 +0100

Hey Danny,

On 06.01.20 20:37, Danny Milosavljevic wrote:
> Fixes <https://bugs.gnu.org/38524>.
> Reported by Reza Alizadeh Majd <r.majd <at> pantherx.org>.

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

Message #11 received at 38994 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
Cc: 38994 <at> debbugs.gnu.org
Subject: Re: [bug#38994] [PATCH core-updates] gnu: glib: Fix
 g_app_info_get_default_for_type.
Date: Tue, 7 Jan 2020 00:45:10 +0100

[Message part 1 (text/plain, inline)]

Hey,

On Tue, 7 Jan 2020 00:04:32 +0100
Jonathan Brielmaier <jonathan.brielmaier <at> web.de> wrote:

> I think the bug link is wrong (it's about dhcp services).

whoops, should have been a reference to bug 38926.  Thanks!

> 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?

Sure, why not (on core-updates)?  There's glib 2.63 released upstream.

Right now, core-updates has glib 2.60.6 still (as has master).

If you try to update glib, be advised that core-updates is broken right now[1].

On the other hand that means that we could update glib on core-updates right
away since core-updates could not built anything using it anyway :P

(The bug upstream is still open, so it will not improve things in that regard)

[1] texlive-bin build error <https://bugs.gnu.org/38999>; texlive is required for glib-with-documentation.

[Message part 2 (application/pgp-signature, inline)]

Message #14 received at 38994 <at> debbugs.gnu.org (full text, mbox):

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 38994 <at> debbugs.gnu.org
Subject: Re: [bug#38994] [PATCH core-updates] gnu: glib: Fix
 g_app_info_get_default_for_type.
Date: Tue, 7 Jan 2020 10:22:49 +0100

On 07.01.20 00:45, Danny Milosavljevic wrote:
>> 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?
>
> Sure, why not (on core-updates)?  There's glib 2.63 released upstream.

I wonder if uneven release numbers at glib mark development/unstable
releases. As it's the case in the rest of GNOME.

> Right now, core-updates has glib 2.60.6 still (as has master).
>
> If you try to update glib, be advised that core-updates is broken right now[1].
>
> On the other hand that means that we could update glib on core-updates right
> away since core-updates could not built anything using it anyway :P
>
> (The bug upstream is still open, so it will not improve things in that regard)
>
> [1] texlive-bin build error <https://bugs.gnu.org/38999>; texlive is required for glib-with-documentation.

Message #17 received at 38994 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Danny Milosavljevic <dannym <at> scratchpost.org>, 38994 <at> debbugs.gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: Re: [bug#38994] [PATCH core-updates] gnu: glib: Fix
 g_app_info_get_default_for_type.
Date: Mon, 13 Jan 2020 22:50:24 +0100

[Message part 1 (text/plain, inline)]

Danny Milosavljevic <dannym <at> scratchpost.org> writes:

> Fixes <https://bugs.gnu.org/38524>.
> Reported by Reza Alizadeh Majd <r.majd <at> pantherx.org>.
>
> * 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"))

It is moved to "out" to avoid a circular reference between "bin" and
"out", right?  IMO we might as well "beat upstream to it" here and use
$out/libexec, since nothing else is supposed to depend on it.

LGTM with that change.

[signature.asc (application/pgp-signature, inline)]

Message #22 received at 38994-done <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 38994-done <at> debbugs.gnu.org
Subject: Re: [bug#38994] [PATCH core-updates] gnu: glib: Fix
 g_app_info_get_default_for_type.
Date: Tue, 14 Jan 2020 01:59:38 +0100

[Message part 1 (text/plain, inline)]

Hi Marius,

On Mon, 13 Jan 2020 22:50:24 +0100
Marius Bakke <mbakke <at> fastmail.com> wrote:

> It is moved to "out" to avoid a circular reference between "bin" and
> "out", right?

Yes.

>IMO we might as well "beat upstream to it" here and use
> $out/libexec, since nothing else is supposed to depend on it.

Okay.

Pushed to guix core-updates as commit 0bcc1b14fc3e2382406b97577c56e2292b96b8d4.

[Message part 2 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.