From patchwork Wed Apr 22 00:15:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21407 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 B3B1A27BBE1; Wed, 22 Apr 2020 01:17:23 +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 05EEE27BBE4 for ; Wed, 22 Apr 2020 01:17:23 +0100 (BST) Received: from localhost ([::1]:37964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jR34s-0005Wf-Gq for patchwork@mira.cbaines.net; Tue, 21 Apr 2020 20:17:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34242) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jR34g-0005WS-Vy for guix-patches@gnu.org; Tue, 21 Apr 2020 20:17:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jR34c-0005db-48 for guix-patches@gnu.org; Tue, 21 Apr 2020 20:17:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jR34Y-0005TD-Qc for guix-patches@gnu.org; Tue, 21 Apr 2020 20:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jR34Y-00018Y-7L for guix-patches@gnu.org; Tue, 21 Apr 2020 20:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40753] gnu: spacefm: Add and configure missing dependencies. (v2) References: <20200421172812.6227b2eb.raghavgururajan@disroot.org> In-Reply-To: <20200421172812.6227b2eb.raghavgururajan@disroot.org> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Apr 2020 00:17:02 +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: 40753@debbugs.gnu.org Received: via spool by 40753-submit@debbugs.gnu.org id=B40753.15875145814313 (code B ref 40753); Wed, 22 Apr 2020 00:17:02 +0000 Received: (at 40753) by debbugs.gnu.org; 22 Apr 2020 00:16:21 +0000 Received: from localhost ([127.0.0.1]:50953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jR33s-00017U-6O for submit@debbugs.gnu.org; Tue, 21 Apr 2020 20:16:20 -0400 Received: from knopi.disroot.org ([178.21.23.139]:38148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jR33i-000179-UW for 40753@debbugs.gnu.org; Tue, 21 Apr 2020 20:16:14 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8E2162626B for <40753@debbugs.gnu.org>; Wed, 22 Apr 2020 02:16: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 0HWkoAap2Wuc for <40753@debbugs.gnu.org>; Wed, 22 Apr 2020 02:16:08 +0200 (CEST) Date: Tue, 21 Apr 2020 20:15:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587514568; bh=3GarK2+e2ODegZvt/vPMqpCQNjRKvOmvrFXccx/D00E=; h=Date:From:To:Subject; b=PjEoy/y6VAc4d88CB+VxvMtXqbodS/gcMprpVIfZHdeiK5L3WH6l4O2WuuWXXgzBt ucaMKg1c7OEmYuWUSLbwIXW36MscNs8pdVZlMdX9IlSkj3uI5ItwbHuUX3f2zYSWhK LjuQrG48BTlWkW6phLMyVw8I/OOyM0ZXY736pj9UBv00X2KkaywTk/54eRLh2ZAsI1 N6slabHB9sGq/A0/svjDdk+vw6CCZvxtaT1SnzkvyFdhsqURGDDs/FB4jwG0xanHQD S1acGUBKld8foQwQmsI5ibLTY5rFii6TG45aeFc2AsNbdpFYoyngQ336MZRramhv6N fmmH7Yq8TadOw== From: Raghav Gururajan Message-ID: <20200421201550.5133dd86.raghavgururajan@disroot.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 BLOCKERS: #40630, #40752 and #40756. From 43cd81fdbe7522cd5ed7f638e49438bfd1a2ccff Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 21 Apr 2020 20:10:50 -0400 Subject: [PATCH 4/4] gnu: spacefm: Add and configure missing dependencies. * gnu/packages/lxde.scm (spacefm): Add and configure missing dependencies. --- gnu/packages/lxde.scm | 81 ++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 20 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index f5dc027e03..e6fc5b14c8 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -27,15 +27,19 @@ (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) #:use-module (gnu packages docbook) + #:use-module (gnu packages file-systems) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image-viewers) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lsof) #:use-module (gnu packages openbox) @@ -43,9 +47,12 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages text-editors) #:use-module (gnu packages video) + #:use-module (gnu packages wget) #:use-module (gnu packages wm) #:use-module (gnu packages xml) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -249,8 +256,8 @@ with freedesktop.org standard.") "https://github.com/IgnorantGuru/spacefm/archive/" version ".tar.gz")) (sha256 - (base32 - "1jg7xfyr7kihjnalxp8wxyb9qjk8hqf5l36rp3s0lvkpmpyakppy")) + (base32 + "1jg7xfyr7kihjnalxp8wxyb9qjk8hqf5l36rp3s0lvkpmpyakppy")) (modules '((guix build utils))) (snippet '(begin @@ -262,25 +269,59 @@ with freedesktop.org standard.") "#include \n"))) #t)) (file-name (string-append name "-" version ".tar.gz")))) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config) - ("desktop-file-utils" ,desktop-file-utils) - ("intltool" ,intltool))) - (inputs `(("bash" ,bash) - ("gtk+" ,gtk+) - ("eudev" ,eudev) - ("shared-mime-info" ,shared-mime-info) - ("ffmpegthumbnailer" ,ffmpegthumbnailer) - ("jmtpfs" ,jmtpfs) - ("lsof" ,lsof) - ("udisks" ,udisks))) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("glib:bin" ,glib "bin") + ("gtk+:bin" ,gtk+ "bin") + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("bash" ,bash) + ("cairo" ,cairo) + ("curlftpfs" ,curlftpfs) + ("dbus" ,dbus) + ("eject" ,eject) + ("eudev" ,eudev) + ("fakeroot" ,fakeroot) + ("ffmpegthumbnailer" ,ffmpegthumbnailer) + ("fuseiso" ,fuseiso) + ("glib" ,glib) + ("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) + ("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")))) + `(#: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 + (lambda _ + (substitute* "etc/spacefm.conf" + (("#terminal_su=/bin/su") + (string-append "terminal_su=" + (string-append (assoc-ref %build-inputs "sudo") + "/bin/sudo")))) + (substitute* "etc/spacefm.conf" + (("#graphical_su=/usr/bin/gksu") + (string-append "graphical_su=" + (string-append (assoc-ref %build-inputs "ktsuss") + "/bin/ktsuss")))) + #t))))) (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