From patchwork Thu Apr 30 11:29:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21770 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 EFC3827BBE4; Thu, 30 Apr 2020 12:30: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 86C1B27BBE1 for ; Thu, 30 Apr 2020 12:30:10 +0100 (BST) Received: from localhost ([::1]:32794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU7OL-0003N5-VZ for patchwork@mira.cbaines.net; Thu, 30 Apr 2020 07:30:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59466) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU7OG-0003Mm-1u for guix-patches@gnu.org; Thu, 30 Apr 2020 07:30:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU7OF-0006wm-Db for guix-patches@gnu.org; Thu, 30 Apr 2020 07:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jU7OF-0006wY-0S for guix-patches@gnu.org; Thu, 30 Apr 2020 07:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jU7OE-00035X-SF for guix-patches@gnu.org; Thu, 30 Apr 2020 07:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40980] gnu: xfe: Fix configuration and icons. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Apr 2020 11:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40980 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40980@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158824619911826 (code B ref -1); Thu, 30 Apr 2020 11:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Apr 2020 11:29:59 +0000 Received: from localhost ([127.0.0.1]:45434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jU7OB-00034e-2q for submit@debbugs.gnu.org; Thu, 30 Apr 2020 07:29:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:38068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jU7O9-00034W-ND for submit@debbugs.gnu.org; Thu, 30 Apr 2020 07:29:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59458) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU7O9-0003MM-7V for guix-patches@gnu.org; Thu, 30 Apr 2020 07:29:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU7O8-0006vE-30 for guix-patches@gnu.org; Thu, 30 Apr 2020 07:29:56 -0400 Received: from knopi.disroot.org ([178.21.23.139]:33932) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jU7O7-0006j6-7W for guix-patches@gnu.org; Thu, 30 Apr 2020 07:29:55 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A6C802806C for ; Thu, 30 Apr 2020 13:29:50 +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 xlGIGgYNte77 for ; Thu, 30 Apr 2020 13:29:49 +0200 (CEST) Date: Thu, 30 Apr 2020 07:29:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588246189; bh=LbE7IWx90uajyU8UxpR/dRzjzJfPm4EnzByzB7WuAUo=; h=Date:From:To:Subject; b=K3fnoYF4q2hta1Lp6oJvoW2N/TdAiuOoDJW+UAOw6bQj+khnw3acjMbudJS7hOD3+ a70GqMBS4hFMKVU+194XpE/C0ioF5nvQUfp0AxFC96cCPfkFGtvQHWV3ktZizB8NGM 6zaSQapVIPstnmw/frKjZjnoI5Rl36+ALKhFIlcUJuoVFABx15cZsgi0SQE3xhtaJ5 2ivPbDfxyMpLXJlTvxj1JZONG5TPyFMio/fxFuFN3s4kv69vVaJBfDFNov26AkiRi/ nY/nUH/g+9zh6XONRHRyZrxHDPyTC5UFf/Mv3Egua1sJfGMYd1iMJSACBzL8QPsXVP ofoxe2N+CEdWA== From: Raghav Gururajan Message-ID: <20200430072930.607771c2.raghavgururajan@disroot.org> Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/30 07:29:50 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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 47a6d0cca849dbfe7e2b3fdc9479ae3307708324 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 30 Apr 2020 07:23:41 -0400 Subject: [PATCH] gnu: xfe: Fix configuration and icons. Patched paths to xferc and icons, to load them correctly. Cosmetic changes to source uri. * gnu/packages/disk.scm (xfe): Fix configuration and icons. --- gnu/packages/disk.scm | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b7d3b9d954..1d7f4ea1f9 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,25 @@ 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")) + (xferc (string-append out "/share/xfe/xferc")) + (xfe-theme (string-append out "/share/xfe/icons/xfe-theme"))) + ;; 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