From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:56615) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iobQo-000277-PA for guix-patches@gnu.org; Mon, 06 Jan 2020 18:05:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iobQk-0000kJ-39 for guix-patches@gnu.org; Mon, 06 Jan 2020 18:05:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iobQk-0000jz-0A for guix-patches@gnu.org; Mon, 06 Jan 2020 18:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iobQj-0004hG-Qg for guix-patches@gnu.org; Mon, 06 Jan 2020 18:05:01 -0500 Subject: [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:55405) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iobQN-0001sz-Qd for guix-patches@gnu.org; Mon, 06 Jan 2020 18:04:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iobQM-00005d-Gg for guix-patches@gnu.org; Mon, 06 Jan 2020 18:04:39 -0500 Received: from mout.web.de ([212.227.17.11]:49853) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iobQL-0008RO-HK for guix-patches@gnu.org; Mon, 06 Jan 2020 18:04:38 -0500 Received: from [192.168.178.26] ([92.117.153.127]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0McFLP-1j6XgM050p-00JXxM for ; Tue, 07 Jan 2020 00:04:33 +0100 References: <20200106193751.725-1-dannym@scratchpost.org> From: Jonathan Brielmaier Message-ID: Date: Tue, 7 Jan 2020 00:04:32 +0100 MIME-Version: 1.0 In-Reply-To: <20200106193751.725-1-dannym@scratchpost.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38994@debbugs.gnu.org Hey Danny, On 06.01.20 20:37, Danny Milosavljevic wrote: > Fixes . > Reported by Reza Alizadeh Majd . I think the bug link is wrong (it's about dhcp services). > > * gnu/packages/glib.scm (glib)[arguments]<#:phases>[patch-gio-launch-des= ktop]: > 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 =3D 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 > + ;; 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 . > + (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}/b= in". > ;; We don't patch "bindir" to point to "$bin/bin", becaus= e 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 thin= k? ~Jonathan