* [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type.
@ 2020-01-06 19:37 Danny Milosavljevic
2020-01-06 23:04 ` Jonathan Brielmaier
2020-01-13 21:50 ` Marius Bakke
0 siblings, 2 replies; 6+ messages in thread
From: Danny Milosavljevic @ 2020-01-06 19:37 UTC (permalink / raw)
To: 38994; +Cc: Danny Milosavljevic
Fixes <https://bugs.gnu.org/38524>.
Reported by Reza Alizadeh Majd <r.majd@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"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type.
2020-01-06 19:37 [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type Danny Milosavljevic
@ 2020-01-06 23:04 ` Jonathan Brielmaier
2020-01-06 23:45 ` Danny Milosavljevic
2020-01-13 21:50 ` Marius Bakke
1 sibling, 1 reply; 6+ messages in thread
From: Jonathan Brielmaier @ 2020-01-06 23:04 UTC (permalink / raw)
To: 38994
Hey Danny,
On 06.01.20 20:37, Danny Milosavljevic wrote:
> Fixes <https://bugs.gnu.org/38524>.
> Reported by Reza Alizadeh Majd <r.majd@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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type.
2020-01-06 23:04 ` Jonathan Brielmaier
@ 2020-01-06 23:45 ` Danny Milosavljevic
2020-01-07 9:22 ` Jonathan Brielmaier
0 siblings, 1 reply; 6+ messages in thread
From: Danny Milosavljevic @ 2020-01-06 23:45 UTC (permalink / raw)
To: Jonathan Brielmaier; +Cc: 38994
[-- Attachment #1: Type: text/plain, Size: 979 bytes --]
Hey,
On Tue, 7 Jan 2020 00:04:32 +0100
Jonathan Brielmaier <jonathan.brielmaier@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.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type.
2020-01-06 23:45 ` Danny Milosavljevic
@ 2020-01-07 9:22 ` Jonathan Brielmaier
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Brielmaier @ 2020-01-07 9:22 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 38994
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type.
2020-01-06 19:37 [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type Danny Milosavljevic
2020-01-06 23:04 ` Jonathan Brielmaier
@ 2020-01-13 21:50 ` Marius Bakke
2020-01-14 0:59 ` bug#38994: " Danny Milosavljevic
1 sibling, 1 reply; 6+ messages in thread
From: Marius Bakke @ 2020-01-13 21:50 UTC (permalink / raw)
To: Danny Milosavljevic, 38994
[-- Attachment #1: Type: text/plain, Size: 2265 bytes --]
Danny Milosavljevic <dannym@scratchpost.org> writes:
> Fixes <https://bugs.gnu.org/38524>.
> Reported by Reza Alizadeh Majd <r.majd@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#38994: [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type.
2020-01-13 21:50 ` Marius Bakke
@ 2020-01-14 0:59 ` Danny Milosavljevic
0 siblings, 0 replies; 6+ messages in thread
From: Danny Milosavljevic @ 2020-01-14 0:59 UTC (permalink / raw)
To: Marius Bakke; +Cc: 38994-done
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
Hi Marius,
On Mon, 13 Jan 2020 22:50:24 +0100
Marius Bakke <mbakke@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.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-01-14 1:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-06 19:37 [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type Danny Milosavljevic
2020-01-06 23:04 ` Jonathan Brielmaier
2020-01-06 23:45 ` Danny Milosavljevic
2020-01-07 9:22 ` Jonathan Brielmaier
2020-01-13 21:50 ` Marius Bakke
2020-01-14 0:59 ` bug#38994: " Danny Milosavljevic
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).