From patchwork Wed Apr 22 20:22:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21428 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 A142427BBE4; Wed, 22 Apr 2020 21:24:39 +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 1E7D927BBE1 for ; Wed, 22 Apr 2020 21:24:39 +0100 (BST) Received: from localhost ([::1]:57414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRLvC-0004ur-Mn for patchwork@mira.cbaines.net; Wed, 22 Apr 2020 16:24:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44868) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRLud-0004aU-3u for guix-patches@gnu.org; Wed, 22 Apr 2020 16:24:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRLuc-0005hU-Az for guix-patches@gnu.org; Wed, 22 Apr 2020 16:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jRLub-0005fw-Tb for guix-patches@gnu.org; Wed, 22 Apr 2020 16:24:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jRLub-0007PW-Kk for guix-patches@gnu.org; Wed, 22 Apr 2020 16:24:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40753] gnu: spacefm: Add missing dependencies. (v3) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Apr 2020 20:24: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.158758698228407 (code B ref 40753); Wed, 22 Apr 2020 20:24:01 +0000 Received: (at 40753) by debbugs.gnu.org; 22 Apr 2020 20:23:02 +0000 Received: from localhost ([127.0.0.1]:53402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRLtd-0007O1-Vx for submit@debbugs.gnu.org; Wed, 22 Apr 2020 16:23:02 -0400 Received: from knopi.disroot.org ([178.21.23.139]:45088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRLta-0007NY-M6 for 40753@debbugs.gnu.org; Wed, 22 Apr 2020 16:23:00 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 36D5A265AC; Wed, 22 Apr 2020 22:22:56 +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 K7q-DROF0Azz; Wed, 22 Apr 2020 22:22:54 +0200 (CEST) Date: Wed, 22 Apr 2020 16:22:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587586974; bh=kRt9OIj61es0lPVZBCGwkPWa58xE5PLL8KlGhGtGxeE=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=UUnFuUco+F3XeLDzsD59RR6TsweuNWV3PSxByIoz1HdaXQaZuAH50wStYtABrsUnU sxfXKhjhJNXHZs+y9v6MbCJF2rRENKnv/oRm0D1lJNZfgN2QwXn71tg7niahmqaXRr fk11b44E6+5EHC29OUIiTgTFSNhtefqg81g+JZ8OpH0z33K40HRorAXAmQbtytKzAf WjQLXKlRlGGIYnI2XlW9Xf3lzBP+a0ihmUSLjWX8ASplv7im2O6O0gmtaDlMaeL0X+ aOFkHZAdf+pEtcNXXMOlXRWhOpwAaEzIgPwGNoBtPBLL9tJT0aq+2xmUgCGMr+9eUG ZLiTYKaaGPJUg== From: Raghav Gururajan Message-ID: <20200422162239.0a98a5c3.raghavgururajan@disroot.org> In-Reply-To: <87k127o0z6.fsf@gnu.org> References: <20200421172812.6227b2eb.raghavgururajan@disroot.org> <87ftcw81bl.fsf@gnu.org> <20200422122833.076c8a60.raghavgururajan@disroot.org> <87k127o0z6.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! > Right. So we'll have to wait for those then, right? Pardon me, I should have communicated better. I was asking to push including the blockers. Would you be able to please? If not, that's okay. > Okay, it would be nice to say something about that in the commit > message. What about > > gnu: spacefm: Add dependencies for extra functionality. > > Adding these inputs provides adds icons, privilege-management and > disk-management. Thanks. Please find the revised patch attached with this email. > Other than that, LGTM (assuming that it builds). I'm not really able > to test it, I assume it works for you as you expected? Yes, all works good. :-) > No worries! I did not have much time this morning and from your ping > assumed a trivial task. Teaches me not to assume things. No, you did not do anything wrong. I should have communicated better. > I would suggest that when you get an OK on the last dependency for this > one, you mention this patch again. Sure. But let me know if you would be able to process the blockers as well. > Please consider sending patches that depend on eachother in one bug > report if that makes sense. Sorry, I did not plan on fixing spacefm. I came across the issues with spacefm after sending those other patches. Regards, RG. From b4f659e7c43eebb4f27f5c1d208a0326d7f2e6a6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 22 Apr 2020 16:15:34 -0400 Subject: [PATCH 4/4] gnu: spacefm: Add dependencies for extra functionality. * gnu/packages/lxde.scm (spacefm): Add dependencies for extra functionality. Adding these inputs and making required changes to build-system+arguments; provides icons, privilege-management and disk-management. --- gnu/packages/lxde.scm | 50 +++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index f5dc027e03..eeb9feb745 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -29,13 +29,16 @@ #:use-module (gnu packages) #: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 +46,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 +255,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,18 +268,34 @@ 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) + ("libx11" ,libx11) + ("lsof" ,lsof) + ("pango" ,pango) + ("shared-mime-info" ,shared-mime-info) + ("startup-notification" ,startup-notification) + ("udevil" ,udevil) + ("wget" ,wget))) (arguments `(#:configure-flags (list (string-append "--with-bash-path=" (assoc-ref %build-inputs "bash") -- 2.26.1