From: Marius Bakke <mbakke@fastmail.com>
To: Danny Milosavljevic <dannym@scratchpost.org>, 38994@debbugs.gnu.org
Subject: [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type.
Date: Mon, 13 Jan 2020 22:50:24 +0100 [thread overview]
Message-ID: <87d0bnvxen.fsf@devup.no> (raw)
In-Reply-To: <20200106193751.725-1-dannym@scratchpost.org>
[-- 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 --]
next prev parent reply other threads:[~2020-01-13 21:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2020-01-14 0:59 ` bug#38994: " Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d0bnvxen.fsf@devup.no \
--to=mbakke@fastmail.com \
--cc=38994@debbugs.gnu.org \
--cc=dannym@scratchpost.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).