From patchwork Fri May 1 07:47:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21782 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 90B9027BBE4; Fri, 1 May 2020 08:48:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 25C2127BBE1 for ; Fri, 1 May 2020 08:48:10 +0100 (BST) Received: from localhost ([::1]:47140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUQP3-0007ZO-Iv for patchwork@mira.cbaines.net; Fri, 01 May 2020 03:48:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35700) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUQOx-0007Ys-Jv for guix-patches@gnu.org; Fri, 01 May 2020 03:48:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUQOw-0001TC-SN for guix-patches@gnu.org; Fri, 01 May 2020 03:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUQOw-0001Qt-Dz for guix-patches@gnu.org; Fri, 01 May 2020 03:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUQOw-0004nK-BN for guix-patches@gnu.org; Fri, 01 May 2020 03:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40980] gnu: xfe: Fix configuration and icons. (v2) References: <20200430072930.607771c2.raghavgururajan@disroot.org> In-Reply-To: <20200430072930.607771c2.raghavgururajan@disroot.org> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 07:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40980 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40980@debbugs.gnu.org Received: via spool by 40980-submit@debbugs.gnu.org id=B40980.158831925418392 (code B ref 40980); Fri, 01 May 2020 07:48:02 +0000 Received: (at 40980) by debbugs.gnu.org; 1 May 2020 07:47:34 +0000 Received: from localhost ([127.0.0.1]:48172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUQOT-0004ma-MP for submit@debbugs.gnu.org; Fri, 01 May 2020 03:47:33 -0400 Received: from knopi.disroot.org ([178.21.23.139]:51470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUQOR-0004mR-Mt for 40980@debbugs.gnu.org; Fri, 01 May 2020 03:47:32 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E4A33288F8 for <40980@debbugs.gnu.org>; Fri, 1 May 2020 09:47:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aGs-515PMp2Z for <40980@debbugs.gnu.org>; Fri, 1 May 2020 09:47:28 +0200 (CEST) Date: Fri, 1 May 2020 03:47:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588319248; bh=+e2F5k4dK1OAV7w4eAaNuJecExfddo1buemXqu4fU+Q=; h=Date:From:To:Subject; b=PB1nukL98KVIOqdT5nZwQEBA1UP4NI/E0jYN3MZPZy3ewwtIT6uQRZD8I3ijFwRD+ h9Y/rC9wPSPUgwAYBdx8nvRLqQ38W85Ek/cg0HNy/35D3hwJCcwh3prx++pCtuBvDq /4a/2MsYZu/cW958eEN/9+Iw0HipVp5aPZCIPoR/wGgmtqZIC6faN3dswTZbNgsLAp W+hN/GDYNvKm9VXcFHH/IKmvDBskpX5iXy7XdYymcvv8eF+FzONzskgYXfzxJf0+rK kZDpCkdxlJ7CvGmBFBjCaNbDTuX77fHgIvAnrJl2xzhY/ez2MheI2M2fk0UgIhcDnc a0ZqJO1NJZuOA== From: Raghav Gururajan Message-ID: <20200501034703.685faec8.raghavgururajan@disroot.org> Mime-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 From c29163895fd4c7aa4c2e448272e987ac6ff9ceed Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 1 May 2020 03:43:04 -0400 Subject: [PATCH] gnu: xfe: Fix configuration and icons. Changed paths to datadir, xferc and icons, to load them correctly. Removed bash-completions, as the directory does not exist. Cosmetic changes to source uri. * gnu/packages/disk.scm (xfe): Fix configuration and icons. --- gnu/packages/disk.scm | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b7d3b9d954..fad07d60f6 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -917,9 +917,8 @@ since they are better handled by external tools.") (origin (method url-fetch) (uri - (string-append "https://sourceforge.net/projects/xfe/files/xfe/" - version - "/xfe-" version ".tar.gz")) + (string-append "https://sourceforge.net/projects/" name "/files/" name + "/" version "/" name "-" version ".tar.gz")) (sha256 (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs")))) (build-system gnu-build-system) @@ -937,17 +936,29 @@ since they are better handled by external tools.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-xferc-path + (add-after 'unpack 'patch-xfe-paths (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (xferc (string-append out "/share/xfe/xferc"))) + (let* + ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (xferc (string-append out "/share/xfe/xferc")) + (xfe-theme (string-append out "/share/xfe/icons/xfe-theme"))) + ;; Correct path for xfe registry. + (substitute* "src/foxhacks.cpp" + (("/etc:/usr/share:/usr/local/share") share)) + ;; Correct path for xfe configuration. (substitute* "src/XFileExplorer.cpp" - (("/usr/share/xfe/xferc") xferc)) - #t)))) - #:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "BASH_COMPLETION_DIR=" out - "/share/bash-completion/completions"))))) + (("/usr/share/xfe/xferc") xferc) + (("/usr/local/share/xfe/xferc") xferc) + (("/opt/local/share/xfe/xferc") xferc)) + ;; Correct path for xfe icons. + (substitute* "src/xfedefs.h" + (((string-append + "~/.config/xfe/icons/xfe-theme:" + "/usr/local/share/xfe/icons/xfe-theme:" + "/usr/share/xfe/icons/xfe-theme")) + xfe-theme)) + #t)))))) (synopsis "File Manager for X-Based Graphical Systems") (description"XFE (X File Explorer) is a file manager for X. It is based on the popular but discontinued, X Win Commander. It aims to be the file manager -- 2.26.2