From unknown Mon Jun 23 22:06:45 2025 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 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 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 Content-Type: multipart/mixed; boundary="MP_/1WUuX.4GW1jR7WB3_Ya8ps8" 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-Received-From: 178.21.23.139 X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --MP_/1WUuX.4GW1jR7WB3_Ya8ps8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/1WUuX.4GW1jR7WB3_Ya8ps8 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-xfe-Fix-configuration-and-icons.patch >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 --MP_/1WUuX.4GW1jR7WB3_Ya8ps8-- From unknown Mon Jun 23 22:06:45 2025 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 Content-Type: multipart/mixed; boundary="MP_/=QWFQ=RFdPAcBIc330DrhZZ" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --MP_/=QWFQ=RFdPAcBIc330DrhZZ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/=QWFQ=RFdPAcBIc330DrhZZ Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-xfe-Fix-configuration-and-icons.patch >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 --MP_/=QWFQ=RFdPAcBIc330DrhZZ-- From unknown Mon Jun 23 22:06:45 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40980] gnu: xfe: Fix configuration and icons. (v2) Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 11:57: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: Raghav Gururajan Cc: 40980@debbugs.gnu.org Received: via spool by 40980-submit@debbugs.gnu.org id=B40980.158833417218319 (code B ref 40980); Fri, 01 May 2020 11:57:01 +0000 Received: (at 40980) by debbugs.gnu.org; 1 May 2020 11:56:12 +0000 Received: from localhost ([127.0.0.1]:48365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUUGy-0004l8-Ib for submit@debbugs.gnu.org; Fri, 01 May 2020 07:56:12 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:44938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUUGv-0004kg-Ni for 40980@debbugs.gnu.org; Fri, 01 May 2020 07:56:03 -0400 Received: from localhost (80-110-127-207.cgn.dynamic.surfer.at [80.110.127.207]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 18B993361DA7; Fri, 1 May 2020 13:56:00 +0200 (CEST) Date: Fri, 1 May 2020 13:55:54 +0200 From: Danny Milosavljevic Message-ID: <20200501135554.07ea33ac@scratchpost.org> In-Reply-To: <20200501034703.685faec8.raghavgururajan@disroot.org> References: <20200430072930.607771c2.raghavgururajan@disroot.org> <20200501034703.685faec8.raghavgururajan@disroot.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/DXxcwYS5dxXivTFhQlRAo+f"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/DXxcwYS5dxXivTFhQlRAo+f Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Raghav, On Fri, 1 May 2020 03:47:03 -0400 Raghav Gururajan wrote: > * 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 re= name 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=3D" out > - "/share/bash-completion/completions"))))) Please mention the removal of make-flags in the commit log. --Sig_/DXxcwYS5dxXivTFhQlRAo+f Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl6sDkoACgkQ5xo1VCww uqVvrgf/Qs8aBB2eVs+o+1Md9OwPmw8l7f5Kg1Sd4f01E6wcsyYxPat3mIVPW5uy rrtOScinVINwuFjPzjqYu+bQOl+qmqXmoIWSIQUxJHFMc189hV1x7qlt1C6kRDjt Or1mctDuLEV6UMY31X8TTo24iGsBeJEAx+7JyI+CMizjGrx+b4nNnsSqI2lKAkjA KPImNjd7Hxuhb0Hs5q3hfW+Q5AAl2kmMFiqtefrqJFnzhXJ4fFU4FPdGPtzwCMlo g0R5tKyUMSk4pRRyc6DnLr3Mdt7NPtNfJIKpZbi3qMZtUtp76J/6r2RVh/bWpC+v 9nfJpnriUaC1Tghq2Dd6dccvDbc9HA== =r7N3 -----END PGP SIGNATURE----- --Sig_/DXxcwYS5dxXivTFhQlRAo+f-- From unknown Mon Jun 23 22:06:45 2025 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 Content-Type: multipart/mixed; boundary="MP_/8a4NfhiJzKASxXPnymEb2WX" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --MP_/8a4NfhiJzKASxXPnymEb2WX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline 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. --MP_/8a4NfhiJzKASxXPnymEb2WX Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-xfe-Fix-configuration-and-icons.patch >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 --MP_/8a4NfhiJzKASxXPnymEb2WX-- From unknown Mon Jun 23 22:06:45 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40980] gnu: xfe: Fix configuration and icons. (v3) Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 14:56: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: Raghav Gururajan Cc: 40980@debbugs.gnu.org Received: via spool by 40980-submit@debbugs.gnu.org id=B40980.15883449057003 (code B ref 40980); Fri, 01 May 2020 14:56:02 +0000 Received: (at 40980) by debbugs.gnu.org; 1 May 2020 14:55:05 +0000 Received: from localhost ([127.0.0.1]:50417 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUX3z-0001oJ-Jf for submit@debbugs.gnu.org; Fri, 01 May 2020 10:55:05 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:59040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUX3y-0001oB-J1 for 40980@debbugs.gnu.org; Fri, 01 May 2020 10:54:51 -0400 Received: from localhost (80-110-127-207.cgn.dynamic.surfer.at [80.110.127.207]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 686843361552; Fri, 1 May 2020 16:54:48 +0200 (CEST) Date: Fri, 1 May 2020 16:54:47 +0200 From: Danny Milosavljevic Message-ID: <20200501165447.5df63553@scratchpost.org> In-Reply-To: <20200501104129.339a98c7.raghavgururajan@disroot.org> References: <20200430072930.607771c2.raghavgururajan@disroot.org> <20200501034703.685faec8.raghavgururajan@disroot.org> <20200501135554.07ea33ac@scratchpost.org> <20200501104129.339a98c7.raghavgururajan@disroot.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Y8avlxX6AjIUHwuJ9zTAXzi"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Sig_/Y8avlxX6AjIUHwuJ9zTAXzi Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Raghav, please use our machine-readable metadata commit log convention instead of u= sing free text. See our git log. --Sig_/Y8avlxX6AjIUHwuJ9zTAXzi Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl6sODcACgkQ5xo1VCww uqVISgf/ed/1M65nZnaCcrmH08KOFf6Kg0QundF24O+E0S6t0UW7Cv+Vh4ZTBUwm hRTuh6yBzyx+vOwRqPOeiSzQKWArvbZ+SVe/Kjgtk0/N9L9B6UEAGaJ5hQV5niDX d+ruxEXPCzacmc3gSAl6v7KOmRo2Hxwn+uRWolKv7mSr7g4yds9yIjO4QUa6HMP0 nyj0n2oOXt51OmYI7kjs2+j5KHhQ8R81NqsCZX9IRauSIaQRwMKRBs6wnx85zXTZ Q/Ow9sfkg/Yg/ssIyFG6BJb13xCFGGyL0gFdedMGbohB54VDk8ge4q1fvWNcnUmH ruT0kCX/v54ygtIUVg7cDgrbjsXrZA== =25ya -----END PGP SIGNATURE----- --Sig_/Y8avlxX6AjIUHwuJ9zTAXzi-- From unknown Mon Jun 23 22:06:45 2025 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 Content-Type: multipart/mixed; boundary="MP_/XFGOdeb8GJOAWEBOyAun20G" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --MP_/XFGOdeb8GJOAWEBOyAun20G Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline 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. --MP_/XFGOdeb8GJOAWEBOyAun20G Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-xfe-Fix-configuration-and-icons.patch >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 --MP_/XFGOdeb8GJOAWEBOyAun20G-- From unknown Mon Jun 23 22:06:45 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Raghav Gururajan Subject: bug#40980: closed (Re: [bug#40980] gnu: xfe: Fix configuration and icons. (v4)) Message-ID: References: <20200501192106.0373256a@scratchpost.org> <20200430072930.607771c2.raghavgururajan@disroot.org> X-Gnu-PR-Message: they-closed 40980 X-Gnu-PR-Package: guix-patches Reply-To: 40980@debbugs.gnu.org Date: Fri, 01 May 2020 17:22:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1588353721-29107-1" This is a multi-part message in MIME format... ------------=_1588353721-29107-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #40980: gnu: xfe: Fix configuration and icons. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 40980@debbugs.gnu.org. --=20 40980: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40980 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1588353721-29107-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 40980-done) by debbugs.gnu.org; 1 May 2020 17:21:13 +0000 Received: from localhost ([127.0.0.1]:50572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUZLd-0007YN-M3 for submit@debbugs.gnu.org; Fri, 01 May 2020 13:21:13 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUZLb-0007YE-B8 for 40980-done@debbugs.gnu.org; Fri, 01 May 2020 13:21:12 -0400 Received: from localhost (80-110-127-207.cgn.dynamic.surfer.at [80.110.127.207]) by dd26836.kasserver.com (Postfix) with ESMTPSA id B859B33611CE; Fri, 1 May 2020 19:21:09 +0200 (CEST) Date: Fri, 1 May 2020 19:21:06 +0200 From: Danny Milosavljevic To: Raghav Gururajan Subject: Re: [bug#40980] gnu: xfe: Fix configuration and icons. (v4) Message-ID: <20200501192106.0373256a@scratchpost.org> In-Reply-To: <20200501124503.4b5cafab.raghavgururajan@disroot.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> <20200501124503.4b5cafab.raghavgururajan@disroot.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/04vzCudCW4ErEVNDKbXr.LN"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40980-done Cc: 40980-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/04vzCudCW4ErEVNDKbXr.LN Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Raghav, thanks! Pushed to guix master as commit 7dfc7c5398c16bdf27acf260c71f905d13bb3a9c with tiny changes. --Sig_/04vzCudCW4ErEVNDKbXr.LN Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl6sWoMACgkQ5xo1VCww uqV+YQf7BqbNefBNnZt9R/cA0bImn1ufy/oMu52wVVWQinC5KemoklHyDVYF5n2b Xexy6t61F5BdFdTYGaSWBDzGZZU6di0vnseVY1tLjHGB6W2sNX/dgZNWszttTJIb SxD9Z9bJsQk2fMCpqIO5Ez9I1sE/SbqaW6GznDOY+vycj9a9nS8Pk+25zdgZZs6g SmCay2BXlhymGud9PR4Rc3259SsTT1Phr72rJ2ug4fb9NYo+Mr2MTFSF3d4fc79q U+RDklbPClp6/E6SXwNSYLE62qomA8Kijxh5PCqcZNROaT/sS5ZkNAqHP8n60VlC Uw0xvV4ABmxrElnfZEBJhIDxYd4wfQ== =JkO8 -----END PGP SIGNATURE----- --Sig_/04vzCudCW4ErEVNDKbXr.LN-- ------------=_1588353721-29107-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 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 To: guix-patches@gnu.org Subject: gnu: xfe: Fix configuration and icons. Message-ID: <20200430072930.607771c2.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/1WUuX.4GW1jR7WB3_Ya8ps8" 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-Received-From: 178.21.23.139 X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --MP_/1WUuX.4GW1jR7WB3_Ya8ps8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/1WUuX.4GW1jR7WB3_Ya8ps8 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-xfe-Fix-configuration-and-icons.patch >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 --MP_/1WUuX.4GW1jR7WB3_Ya8ps8-- ------------=_1588353721-29107-1--