From patchwork Sun May 10 08:58:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21972 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 6B92227BBE3; Sun, 10 May 2020 10:00:14 +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,RCVD_IN_MSPIKE_H2,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E2FCF27BBE1 for ; Sun, 10 May 2020 10:00:13 +0100 (BST) Received: from localhost ([::1]:37606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXhoj-0000m1-CI for patchwork@mira.cbaines.net; Sun, 10 May 2020 05:00:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXhoZ-0000lp-5H for guix-patches@gnu.org; Sun, 10 May 2020 05:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXhoY-0008Lh-Qe for guix-patches@gnu.org; Sun, 10 May 2020 05:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jXhoY-0003XK-Op for guix-patches@gnu.org; Sun, 10 May 2020 05:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41169] gnu: xfe: Fix few more FHS directories. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 May 2020 09:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41169@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158910117113521 (code B ref -1); Sun, 10 May 2020 09:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 May 2020 08:59:31 +0000 Received: from localhost ([127.0.0.1]:48921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXho3-0003W1-J6 for submit@debbugs.gnu.org; Sun, 10 May 2020 04:59:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:42806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXho2-0003Vu-KV for submit@debbugs.gnu.org; Sun, 10 May 2020 04:59:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXho2-0000ho-BB for guix-patches@gnu.org; Sun, 10 May 2020 04:59:30 -0400 Received: from knopi.disroot.org ([178.21.23.139]:33004) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jXhnz-0001ct-99 for guix-patches@gnu.org; Sun, 10 May 2020 04:59:29 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6E4EE2229C for ; Sun, 10 May 2020 10:59:23 +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 qk1pjxXtQ7Zd for ; Sun, 10 May 2020 10:59:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1589101161; bh=aI5OQeSws4j8ORv6UUA8UmoWGzKnDXJD/swDmi4OGr8=; h=To:From:Subject:Date; b=UV1yzfiNl3IU+v6OGSqyqVfsLf+YOal0giZaIRfFrkLTnkzSykW3eDIrLSKtmXGBJ BlH5EEZsVAm1mbi2/iRXp9WyqyR8OFcc8YZZKqbC+fUOJTvacLro2GLan1hWbx2r+L IgDsAR2yXWnu6rLaMMXmve3iRtnuNYsjRMOkfLnv9737wq3LywIKl9r09KMrlLq2Lk j8ESE1VxPgbUhjASEDXPOER5MDSxC1gy3cRGKI13JNubmWUpgZZcBRNVQz0k4hgo0v G5HajaHHfSmCfFilRVH0WJeLmY20FahaRqteGzJZEbbUohWZYG9lSLq0nlh19jH/0o CPv0wQny/1UOA== From: Raghav Gururajan Autocrypt: addr=raghavgururajan@disroot.org; keydata= mQENBF6yxWcBCAClEApjrOYs8fSzDl8GBwMFtUzF6VCOVrWaGun1vvPDvk4AFzbB3ZV6+Jn8 VfEuqh3OOvSJGHL2cJoR28Q5gVqeOwupyaMWVdEt6TmDrHISyxriF426KVaJnklfMjYwIi0l /7j8bs3pDRyyR6uFrY6sYL9t6HFvevtt7NwgWL1MAEVy6txKkriyrK1h+qc13wRRgVx3tzl7 dNwYEDWd3yUDn+LESoDOlawJ7TQbO8d1K4FFHaqwyQ/SyaIfLBnMAz9Qd18MUWpDkktLh/9u jRfctouFx5BUr+uGgCHAWcII5D60lt867y5m6vp3Ua75TkVQrYTt7KSF/wm7NZ7L02fTABEB AAG0M1JhZ2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmFnaGF2Z3VydXJhamFuQGRpc3Jvb3Qub3Jn PokBTgQTAQgAOBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJetePbAhsDBQsJCAcCBhUKCQgL AgQWAgMBAh4BAheAAAoJEK5u8wRtb3tXvWIH/3NiwaJfcrOoO/r4/reE0PmfgVWRpWP8uhdy ZiuBmcnyltxSmxZ1drlWpnbap5P7ssVyIlY6SrLTAeN7R0S70HAINkn7XvKpWajHShX0MR4b NeqjETNZg7gh2PTg6zfTnYD1UQqdNxnPMiJTSBZBLCAm/LhdEuigt559uoDA9ZEVLR5ycKh+ ny94NLUhmuRXpH/sb6Ey0FKmdMc47KNnkGQaySeGY88RwONgfv3/rriNbOJ1t12d2qsqkiOo znuxg5O3nT6obd7hCuq+EYwjzwSVrUZuMelO32UE4d2iePhiPBfiprVCNDGPFztJTe0Y+OQA ajj23CBgGIap/L1CpZ25AQ0EXrLFZwEIANGMTVaAiSGtpAbxRo9AHOc2kgatkAsH/ejtzNH0 mtGwtE0g5Gh0OKTI678KItanztmukKcZmBngPCwvUGGNQYzWWwsS+kBti5wJ3OForg+JtYuf /n9DjSAhnb7h1piL9Xi0drULl5ovVFRp/IPldkbT3R8pgc9VwAa0VVRP59dsgF6nPhoHjxfB p/XcA2QRnRfB2bN4BVCValJelPGYR0pSwkftFpmha4FRa0LrJtcMeh+PG20asPiKcE4sNGZT mH3keHkTfk5Tuds3ly5vlqmEKg7qY/zoS1yWQJj0j36JoX1/ravo+gUxszig80140a5bF2VU ERLcKO+Cp0lI4/8AEQEAAYkBNgQYAQgAIBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJessVn AhsMAAoJEK5u8wRtb3tXqTIH/A9z70HLCZcAfnpluGj4APfi3haqdU7xvtrkN9eHJoPV7pwx y1luNRR8xg7YHkwcQ/9qEcvSicNIvhjRw5cSpyW9HGmOFyiZ7+KLf3XPUjC7pC5pIM+AAWyy D5GlyqakH1wBe8RC9/8vNyfZnmbV4PUvHoHvY/xZH+D/Afg1J2igdIebkQzzhFBC65TAKFeM NIWQkYIMKjq4u+nmv3sreqvRvlt8VYq0VSq24SFs0JJ+dEmuO3/s72122JIL0XEUS3ooGb/p 678RM2OpelLZcZSPG6vIIrQFKw6/NVjDtOY3DrNPtQ+h84UnFPUtaZyvQQwpGNjvtNzU/Ym+ NwsFm0Q= Message-ID: <44a01b5d-48bf-7c25-411f-9aab905cde4a@disroot.org> Date: Sun, 10 May 2020 04:58:37 -0400 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/05/10 04:59:23 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 585adef1a8f0fdf510bf0597b943eb8b610a0f76 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 10 May 2020 04:49:25 -0400 Subject: [PATCH] gnu: xfe: Fix few more FHS directories. * gnu/packages/disk.scm (xfe): Fix /bin and /share paths in st/config.h and src/xfedefs.h, respectively. --- gnu/packages/disk.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 0e35ef7de1..15f08773f8 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -990,7 +990,8 @@ since they are better handled by external tools.") (file-prog (assoc-ref inputs "file"))) (with-directory-excursion "src" (substitute* '("FilePanel.cpp" "help.h" "SearchPanel.cpp" - "startupnotification.cpp" "xfeutils.cpp") + "startupnotification.cpp" "xfeutils.cpp" + "../st/config.h") (("/bin/sh" file) (string-append bash file)) (("/bin/ls" file) (string-append coreutils file)) (("/usr(/bin/du)" _ file) (string-append coreutils file)) @@ -1002,11 +1003,13 @@ since they are better handled by external tools.") (add-after 'unpack 'patch-share-dirs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share"))) + (share (string-append out "/share")) + (xfe (string-append share "/xfe"))) (with-directory-excursion "src" (substitute* '("foxhacks.cpp" "help.h" "xfedefs.h" "XFileExplorer.cpp") - (("/(usr|opt)(/local)?/share") share))) + (("/(usr|opt)(/local)?/share") share) + (("~/.config/xfe") xfe))) #t)))))) (native-inputs `(("intltool" ,intltool) -- 2.26.2