From patchwork Fri May 1 16:45: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: 21795 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 54EC027BBE4; Fri, 1 May 2020 17:50:07 +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 B647B27BBE1 for ; Fri, 1 May 2020 17:50:06 +0100 (BST) Received: from localhost ([::1]:54412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUYrW-0001v9-8w for patchwork@mira.cbaines.net; Fri, 01 May 2020 12:50:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUYqJ-0000EQ-28 for guix-patches@gnu.org; Fri, 01 May 2020 12:49:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUYnb-00020v-4V for guix-patches@gnu.org; Fri, 01 May 2020 12:48:50 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUYna-00020q-MO for guix-patches@gnu.org; Fri, 01 May 2020 12:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUYna-0006d9-JY for guix-patches@gnu.org; Fri, 01 May 2020 12:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40980] gnu: xfe: Fix configuration and icons. (v4) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 16:46: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: Danny Milosavljevic Cc: 40980@debbugs.gnu.org Received: via spool by 40980-submit@debbugs.gnu.org id=B40980.158835153325444 (code B ref 40980); Fri, 01 May 2020 16:46:02 +0000 Received: (at 40980) by debbugs.gnu.org; 1 May 2020 16:45:33 +0000 Received: from localhost ([127.0.0.1]:50530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUYn6-0006cK-R6 for submit@debbugs.gnu.org; Fri, 01 May 2020 12:45:33 -0400 Received: from knopi.disroot.org ([178.21.23.139]:57108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUYn1-0006c6-RU for 40980@debbugs.gnu.org; Fri, 01 May 2020 12:45:32 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3054328257; Fri, 1 May 2020 18:45:26 +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 aULkL3zelPuE; Fri, 1 May 2020 18:45:24 +0200 (CEST) Date: Fri, 1 May 2020 12:45:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588351524; bh=UNwARSSuEAwS/qVCSNmzp9rFzCRU6A9lHexas446EoY=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=hlux4HEIlBXzuWLRAsgFlG3izs6HK+8Bp9Av0uFEwJbbAVVloq97mMtWrAuqbeAsm ekMiJBpsSo7A9R2a2ehykjb0HoiPn0SnBPN72XHRXL6uobFRK/tFbfuHvix61DMxhK kIi4r0jUAas2FVkSvgEUEgSAohGzStg9Yg4xVNP/niN59+RxxY1NtTV/fLpl3jz077 WKUtqClSKegiHmMMJBEdQt+kSWeoxo8AfPcg4dBvpTuWEHbFplDwrEv2VM9Li1LlWb L4R9cx2fZuswb5xEH87vFaOjzXTy9niJ0+MCxvrojBw2NwZfuN6C4npxlvULjetMqE ylgUAvBHptxcQ== From: Raghav Gururajan Message-ID: <20200501124503.4b5cafab.raghavgururajan@disroot.org> In-Reply-To: <20200501165447.5df63553@scratchpost.org> References: <20200430072930.607771c2.raghavgururajan@disroot.org> <20200501034703.685faec8.raghavgururajan@disroot.org> <20200501135554.07ea33ac@scratchpost.org> <20200501104129.339a98c7.raghavgururajan@disroot.org> <20200501165447.5df63553@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! > please use our machine-readable metadata commit log convention instead of > using free text. > > See our git log. Sorry about that. I just saw your modified commit message in previous commits. Please find the revised patch attached with this email. Regards, RG. From 7e9c3b41d89e7ba4908cf7894b3222377e162af9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 1 May 2020 12:31:27 -0400 Subject: [PATCH] gnu: xfe: Fix configuration and icons. * gnu/packages/disk.scm (xfe): [arguments]<#:make-flags>[BASH_COMPLETION_DIR]: Remove flag. [arguments]<#:phases>[patch-xferc-path]: Remove phase. [arguments]<#:phases>[patch-xfe-paths]: New phase. --- gnu/packages/disk.scm | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b7d3b9d954..e723efebbf 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/xfe/files/xfe/" + 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