From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kNtoHBZOsF4KYwAA0tVLHw (envelope-from ) for ; Mon, 04 May 2020 17:17:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +DSvKCFOsF4YMQAAbx9fmQ (envelope-from ) for ; Mon, 04 May 2020 17:17:21 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 743C094060B for ; Mon, 4 May 2020 17:17:19 +0000 (UTC) Received: from localhost ([::1]:51000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVeiV-0000MD-7v for larch@yhetil.org; Mon, 04 May 2020 13:17:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVeiF-0000Jv-4g for guix-patches@gnu.org; Mon, 04 May 2020 13:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVeiE-0002ms-Po for guix-patches@gnu.org; Mon, 04 May 2020 13:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jVeiE-0001VV-KH for guix-patches@gnu.org; Mon, 04 May 2020 13:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41083] gnu: xfe: Fix hard-coded fhs directories. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 May 2020 17:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41083 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41083@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15886126185777 (code B ref -1); Mon, 04 May 2020 17:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2020 17:16:58 +0000 Received: from localhost ([127.0.0.1]:33892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVeiA-0001V6-BV for submit@debbugs.gnu.org; Mon, 04 May 2020 13:16:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:55612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jVei8-0001Uy-1z for submit@debbugs.gnu.org; Mon, 04 May 2020 13:16:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVei7-0008Uf-Ls for guix-patches@gnu.org; Mon, 04 May 2020 13:16:55 -0400 Received: from knopi.disroot.org ([178.21.23.139]:34650) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jVei5-0002lL-I4 for guix-patches@gnu.org; Mon, 04 May 2020 13:16:55 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 82EC22BEA8 for ; Mon, 4 May 2020 19:16:49 +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 1g-4l6ZGjSwX for ; Mon, 4 May 2020 19:16:47 +0200 (CEST) Date: Mon, 4 May 2020 13:16:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588612606; bh=2FJO+xJc/gvdX6fcb7WYqo5gEXrmuHAjbVFLDPmnzrg=; h=Date:From:To:Subject; b=I/HenlFujB/CqJlUW8bvn8AoO48fwYVbvbQy4M3m3rmTUh0xoWtXdi2p7CxxRgxgS +H/TDUDXSsz7OrRDv92ijQGbRwcy/gFBb3fcVgF8JCZMK5/EkbYYXUNuK/2p/zFu8j D+ghyUnxdaJJQfT5NRYPCEuBGwNoQvITisXgIsSY5lg/qhXytJh7iNmcJDFrRHEeJ2 QpwY07x+f9CYFpurnA/fK5brbi1RSmayeG/JnqFPhhSV2+irWtXNQTaTMB2Ioxjv5v aFkEPpndohl2hFU7SBKai/41jrXB38SjMwAe9rfTDV4y+CX3Kzbo0ofsZgAjhww5je rNE6eJvlPXBYw== From: Raghav Gururajan Message-ID: <20200504131624.04c6d30e.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/xCvXmL8L5nXCexRRLsOLVuB" 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/05/04 13:16:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.4 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: 1.59 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=I/HenlFu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [1.59 / 13.00]; GENERIC_REPUTATION(0.00)[-0.49496892845765]; DWL_DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; R_DKIM_REJECT(1.00)[disroot.org:s=mail]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; HAS_ATTACHMENT(0.00)[]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.13), country: US(-0.00), ip: 2001:470:142::17(-0.49)]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; DKIM_TRACE(0.00)[disroot.org:-]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[raghavgururajan@disroot.org,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[disroot.org:email]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; HAS_LIST_UNSUB(-0.01)[]; RCPT_COUNT_ONE(0.00)[1]; DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_SEVEN(0.00)[11]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[disroot.org : SPF not aligned (relaxed),none] X-TUID: VUrdMPSpd6zf --MP_/xCvXmL8L5nXCexRRLsOLVuB Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/xCvXmL8L5nXCexRRLsOLVuB Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-xfe-Fix-hard-coded-fhs-directories.patch >From 660f134e15438e7ee7aec1c076dca93c68e4edc6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 4 May 2020 13:07:02 -0400 Subject: [PATCH] gnu: xfe: Fix hard-coded fhs directories. * gnu/packages/disk.scm (xfe): Fix hard-coded fhs directories. [arguments]<#:phases>['patch-xfe-paths]: Delete phase. [arguments]<#:phases>['patch-bin-dirs]: New phase. [arguments]<#:phases>['patch-share-dirs]: New phase. [inputs]: New inputs. --- gnu/packages/disk.scm | 109 ++++++++++++++++++++++++++++++++---------- 1 file changed, 83 insertions(+), 26 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 484126a3ea..69f0a131bc 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages elf) #:use-module (gnu packages file-systems) + #:use-module (gnu packages file) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -940,43 +941,99 @@ since they are better handled by external tools.") (sha256 (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs")))) (build-system gnu-build-system) - (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) - (inputs - `(("fox" ,fox) - ("freetype" ,freetype) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-util" ,xcb-util) - ("xft" ,libxft) - ("xrandr" ,libxrandr))) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-xfe-paths + (add-after 'unpack 'patch-bin-dirs + (lambda* (#:key inputs #:allow-other-keys) + (let* + ((sh + (string-append + (assoc-ref inputs "bash") "/bin/sh")) + (du + (string-append + (assoc-ref inputs "coreutils") "/bin/du")) + (sort + (string-append + (assoc-ref inputs "coreutils") "/bin/sort")) + (cut + (string-append + (assoc-ref inputs "coreutils") "/bin/cut")) + (ls + (string-append + (assoc-ref inputs "coreutils") "/bin/ls")) + (xargs + (string-append + (assoc-ref inputs "findutils") "/bin/xargs")) + (file + (string-append + (assoc-ref inputs "file") "/bin/file"))) + (substitute* "src/FilePanel.cpp" + (("/bin/sh") sh) + (("/usr/bin/du") du) + (("/usr/bin/sort") sort) + (("/usr/bin/cut") cut) + (("/usr/bin/xargs") xargs)) + (substitute* "src/help.h" + (("/bin/sh") sh) + (("/bin/ls") ls)) + (substitute* "src/SearchPanel.cpp" + (("/usr/bin/du") du) + (("/usr/bin/sort") sort) + (("/usr/bin/cut") cut) + (("/usr/bin/xargs") xargs)) + (substitute* "src/startupnotification.cpp" + (("/bin/sh") sh)) + (substitute* "src/xfeutils.cpp" + (("/usr/bin/file") file)) + #t))) + (add-after 'unpack 'patch-share-dirs (lambda* (#:key outputs #:allow-other-keys) (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. + ((out + (assoc-ref outputs "out")) + (share + (string-append out "/share")) + (xfe + (string-append out "/share/xfe")) + (xferc + (string-append out "/share/xfe/xferc")) + (icons + (string-append out "/share/xfe/icons")) + (xfe-theme + (string-append out "/share/xfe/icons/xfe-theme"))) (substitute* "src/foxhacks.cpp" - (("/etc:/usr/share:/usr/local/share") share)) - ;; Correct path for xfe configuration. + (("/usr/share") share) + (("/usr/local/share") share)) + (substitute* "src/help.h" + (("/usr/share/xfe") xfe) + (("/usr/local/share/xfe") xfe) + (("/opt/local/share/xfe") xfe) + (("/usr/share/xfe/icons/xfe-theme") xfe-theme) + (("/usr/local/share/xfe/icons/xfe-theme") xfe-theme)) + (substitute* "src/xfedefs.h" + (("/usr/share/xfe/icons") icons) + (("/usr/local/share/xfe/icons") icons)) (substitute* "src/XFileExplorer.cpp" (("/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)))))) + (native-inputs + `(("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("bash" ,bash) + ("coreutils" ,coreutils) + ("file" ,file) + ("findutils" ,findutils) + ("fox" ,fox) + ("freetype" ,freetype) + ("x11" ,libx11) + ("xcb" ,libxcb) + ("xcb-util" ,xcb-util) + ("xft" ,libxft) + ("xrandr" ,libxrandr))) (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_/xCvXmL8L5nXCexRRLsOLVuB--