From patchwork Mon Jan 6 19:37:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 19648 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D077717A05; Mon, 6 Jan 2020 19:39:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 76245179FE for ; Mon, 6 Jan 2020 19:39:13 +0000 (GMT) Received: from localhost ([::1]:59162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioYDY-0004Wh-Rc for patchwork@mira.cbaines.net; Mon, 06 Jan 2020 14:39:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50201) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioYDP-0004Q2-Ne for guix-patches@gnu.org; Mon, 06 Jan 2020 14:39:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioYDO-0003xg-G4 for guix-patches@gnu.org; Mon, 06 Jan 2020 14:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40853) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioYDO-0003xc-D3 for guix-patches@gnu.org; Mon, 06 Jan 2020 14:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ioYDO-000605-9a for guix-patches@gnu.org; Mon, 06 Jan 2020 14:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38994] [PATCH core-updates] gnu: glib: Fix g_app_info_get_default_for_type. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jan 2020 19:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38994@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157833948722982 (code B ref -1); Mon, 06 Jan 2020 19:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jan 2020 19:38:07 +0000 Received: from localhost ([127.0.0.1]:46826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioYCV-0005yc-AL for submit@debbugs.gnu.org; Mon, 06 Jan 2020 14:38:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:48786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ioYCT-0005yU-IP for submit@debbugs.gnu.org; Mon, 06 Jan 2020 14:38:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49866) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioYCS-0003aj-3B for guix-patches@gnu.org; Mon, 06 Jan 2020 14:38:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioYCQ-00036e-Qx for guix-patches@gnu.org; Mon, 06 Jan 2020 14:38:03 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:46626) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ioYCQ-00033H-Kk for guix-patches@gnu.org; Mon, 06 Jan 2020 14:38:02 -0500 Received: from dayas.lan (80-110-118-191.cgn.dynamic.surfer.at [80.110.118.191]) by dd26836.kasserver.com (Postfix) with ESMTPSA id E24E73363972; Mon, 6 Jan 2020 20:37:58 +0100 (CET) From: Danny Milosavljevic Date: Mon, 6 Jan 2020 20:37:51 +0100 Message-Id: <20200106193751.725-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Tags: patch X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Fixes . Reported by Reza Alizadeh Majd . * 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 + ;; 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}/bin". ;; We don't patch "bindir" to point to "$bin/bin", because that ;; would create a reference cycle between the "out" and "bin"