From patchwork Sun Apr 26 02:11:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21473 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 0821D27BBE4; Sun, 26 Apr 2020 03:13:11 +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 [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4703927BBE1 for ; Sun, 26 Apr 2020 03:13:10 +0100 (BST) Received: from localhost ([::1]:50532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSWn7-000295-QS for patchwork@mira.cbaines.net; Sat, 25 Apr 2020 22:13:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57766) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSWn0-00028x-RP for guix-patches@gnu.org; Sat, 25 Apr 2020 22:13:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSWn0-0002w0-A0 for guix-patches@gnu.org; Sat, 25 Apr 2020 22:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jSWmz-0002vE-Tc for guix-patches@gnu.org; Sat, 25 Apr 2020 22:13:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jSWmz-0000Nn-Np for guix-patches@gnu.org; Sat, 25 Apr 2020 22:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40753] gnu: spacefm: Add dependencies for extra functionality. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Apr 2020 02:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40753 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Jan Nieuwenhuizen Cc: 40753@debbugs.gnu.org Received: via spool by 40753-submit@debbugs.gnu.org id=B40753.15878671331418 (code B ref 40753); Sun, 26 Apr 2020 02:13:01 +0000 Received: (at 40753) by debbugs.gnu.org; 26 Apr 2020 02:12:13 +0000 Received: from localhost ([127.0.0.1]:60617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSWmD-0000Mn-6p for submit@debbugs.gnu.org; Sat, 25 Apr 2020 22:12:13 -0400 Received: from knopi.disroot.org ([178.21.23.139]:35132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSWmA-0000Mc-Np for 40753@debbugs.gnu.org; Sat, 25 Apr 2020 22:12:12 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7E8B425EE5; Sun, 26 Apr 2020 04:12:09 +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 S-bDnJbR64wS; Sun, 26 Apr 2020 04:12:08 +0200 (CEST) Date: Sat, 25 Apr 2020 22:11:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587867128; bh=7qwaaMLm8Odyxr3VrMZeCUxu3LfJFSQbwDgsY5cMAUs=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=JPFM7/WGk4xb6eMQokzlbWumz6XIVDAocPqh1lSBq+wnxDZ5LUp9gWTBwpCi68Xek PMdEMu7MfoNkuyu7WXsFbEbldEq3N3OQSZS78e7VMNXLGNwetZujy2llOp9+ivTTHv biBc4ytLpwtEE5EdgyuytNu2dmBtql+l/eCRuU3yJtQ0CCQZM6FEKkSyeN/EhFA87U KHcFzjtHkk1H23dZ5BZVWpjJpqP5VIPZDwOQYd/rx3kvQJe96Dvjd/A8g7OTrUeKkV msTfaxzij9pZHaKEm73Tk0W73iKFXdMR5yn3JwIGf47+CqWF1VQQ+hiQoOJ0UTYyKe 6HhYQ1xytE79A== From: Raghav Gururajan Message-ID: <20200425221143.1a587483.raghavgururajan@disroot.org> In-Reply-To: <87h7x8wsr8.fsf@gnu.org> References: <20200421172812.6227b2eb.raghavgururajan@disroot.org> <20200424153558.2aa79ef0.raghavgururajan@disroot.org> <87h7x8wsr8.fsf@gnu.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 Jan! > Pushed to master with small cosmetic change below. > > Thanks for the patch! I accidentally sent the wrong patch that missed some things. So sorry. I have attached a patch with this email to append the previous. Could you please push it as new commit. Thanks! Regards, RG. From ea9e9909c2929639c1b6574ae61ca9fb0b319177 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 25 Apr 2020 21:43:25 -0400 Subject: [PATCH] gnu: spacefm: Fix privilege management and icons. * gnu/packages/lxde.scm (spacefm): Fix privilege management and icons. This commit contains changes that were accidentally left out in commit bf37b49cdd345bcedeb7142f61968d3a6e15e8d8. --- gnu/packages/lxde.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9de96a21cb..3fd2eaff69 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -27,6 +27,7 @@ (define-module (gnu packages lxde) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages disk) @@ -276,7 +277,8 @@ with freedesktop.org standard.") ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("bash" ,bash) + `(("adwaita-icon-theme" ,adwaita-icon-theme) ; Hard-coded theme + ("bash" ,bash) ("cairo" ,cairo) ("curlftpfs" ,curlftpfs) ("dbus" ,dbus) @@ -288,21 +290,42 @@ with freedesktop.org standard.") ("gtk+" ,gtk+) ("ifuse" ,ifuse) ("jmtpfs" ,jmtpfs) + ("ktsuss" ,ktsuss) ("libx11" ,libx11) ("lsof" ,lsof) ("pango" ,pango) ("shared-mime-info" ,shared-mime-info) ("startup-notification" ,startup-notification) + ("sudo" ,sudo) ("udevil" ,udevil) ("util-linux" ,util-linux) ("wget" ,wget))) (arguments - `(#:configure-flags (list (string-append "--with-bash-path=" - (assoc-ref %build-inputs "bash") - "/bin/bash") - (string-append "--sysconfdir=" - (assoc-ref %outputs "out") - "/etc")))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-spacefm-conf + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "etc/spacefm.conf" + (("#terminal_su=/bin/su") + (string-append "terminal_su=" + (string-append (assoc-ref inputs "sudo") + "/bin/sudo")))) + (substitute* "etc/spacefm.conf" + (("#graphical_su=/usr/bin/gksu") + (string-append "graphical_su=" + (string-append (assoc-ref inputs "ktsuss") + "/bin/ktsuss")))) + #t))) + #:configure-flags (list + (string-append "--with-preferable-sudo=" + (assoc-ref %build-inputs "ktsuss") + "/bin/ktsuss") + (string-append "--with-bash-path=" + (assoc-ref %build-inputs "bash") + "/bin/bash") + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc")))) (home-page "https://ignorantguru.github.io/spacefm/") (synopsis "Multi-panel tabbed file manager") (description "SpaceFM is a graphical, multi-panel, tabbed file manager -- 2.26.1