From patchwork Fri May 1 14:41:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21794 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 2EAAD27BBE1; Fri, 1 May 2020 15:43:36 +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 C8FE627BBE4 for ; Fri, 1 May 2020 15:43:31 +0100 (BST) Received: from localhost ([::1]:58710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUWt1-0006s6-Bh for patchwork@mira.cbaines.net; Fri, 01 May 2020 10:43:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51684) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUWsm-0006db-4g for guix-patches@gnu.org; Fri, 01 May 2020 10:43:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUWsY-00062G-Av for guix-patches@gnu.org; Fri, 01 May 2020 10:43:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUWsX-00061l-RF for guix-patches@gnu.org; Fri, 01 May 2020 10:43:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUWsX-0001Vn-O9 for guix-patches@gnu.org; Fri, 01 May 2020 10:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40980] gnu: xfe: Fix configuration and icons. (v3) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 14:43:01 +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: Danny Milosavljevic Cc: 40980@debbugs.gnu.org Received: via spool by 40980-submit@debbugs.gnu.org id=B40980.15883441345737 (code B ref 40980); Fri, 01 May 2020 14:43:01 +0000 Received: (at 40980) by debbugs.gnu.org; 1 May 2020 14:42:14 +0000 Received: from localhost ([127.0.0.1]:50393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUWri-0001UQ-Qb for submit@debbugs.gnu.org; Fri, 01 May 2020 10:42:14 -0400 Received: from knopi.disroot.org ([178.21.23.139]:48168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUWrc-0001UB-Re for 40980@debbugs.gnu.org; Fri, 01 May 2020 10:42:09 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5970F28973; Fri, 1 May 2020 16:42:03 +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 IepeeF9Wm-ml; Fri, 1 May 2020 16:41:59 +0200 (CEST) Date: Fri, 1 May 2020 10:41:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588344116; bh=Zmr3eHR9BwOG5ddkAoa62O1/fPSepu/tIE4dTaYLgsM=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=URNn8VwfLuoQ5uXHe0OyykZoVSbfESoTRLwi+cW78k4jcYTatWarpS5MAlhDhTFm6 NORi9OjIcRb7DLJtEMrxlO7nb0KCqVH0ILf2EWR2oqFBrGzZng+ZvvT5AX/GRBmUkM VHjqCThosnITV38K75R9f2gklJDPnKADpv5aLdobU4XYPCwaxm5XkXJxdlRbir+BUH rcQIB0c34WzfKpvCxTWmC0da0MkF2OwcjjMcRF6yeDvzepwVa9jPRWdA6BRIGm1PkU pqHJXCe/1mqbjk8wOdf/X3Ver4HYDYaxZNqQBHK1Rqo5UDFncbMgTBaQLADtIWLDaY WeURAjXvsn8Ag== From: Raghav Gururajan Message-ID: <20200501104129.339a98c7.raghavgururajan@disroot.org> In-Reply-To: <20200501135554.07ea33ac@scratchpost.org> References: <20200430072930.607771c2.raghavgururajan@disroot.org> <20200501034703.685faec8.raghavgururajan@disroot.org> <20200501135554.07ea33ac@scratchpost.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 Hi Danny! > > * gnu/packages/disk.scm (xfe): Fix configuration and icons. > > Please mention the phases and arguments you changed. > > > (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")) > > Please don't do that without a good reason because it makes us unable to > rename our package later. > > > - (add-after 'unpack 'patch-xferc-path > > + (add-after 'unpack 'patch-xfe-paths > > Please mention this in the commit log. > > > - #:make-flags > > - (let ((out (assoc-ref %outputs "out"))) > > - (list (string-append "BASH_COMPLETION_DIR=" out > > - "/share/bash-completion/completions"))))) > > Please mention the removal of make-flags in the commit log. Please find the revised patch attached with this email. Regards, RG. From 18ead96ab6498f2e197ca967e0e55a4c84cbb8f9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 1 May 2020 10:29:06 -0400 Subject: [PATCH] gnu: xfe: Fix configuration and icons. In patch-phase, added paths to datadir, xferc and icons; to patch the respective and load them correctly. Changed name of patch-phase to fit above changes. Removed bash-completion make-flag, as the directory does not exist. * 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..41429b73cc 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -918,8 +918,7 @@ since they are better handled by external tools.") (method url-fetch) (uri (string-append "https://sourceforge.net/projects/xfe/files/xfe/" - version - "/xfe-" version ".tar.gz")) + version "/xfe-" version ".tar.gz")) (sha256 (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs")))) (build-system gnu-build-system) @@ -937,20 +936,32 @@ 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 of choice for all light thinking Unix addicts!") (home-page "http://roland65.free.fr/xfe/") - (license license:gpl2+))) + (license license:gpl2+))) \ No newline at end of file -- 2.26.2