From patchwork Fri Mar 18 07:38:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37917 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 8CE4E27BBEA; Fri, 18 Mar 2022 07:40:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EA95427BBE9 for ; Fri, 18 Mar 2022 07:40:20 +0000 (GMT) Received: from localhost ([::1]:46676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nV7Dg-0003T5-2M for patchwork@mira.cbaines.net; Fri, 18 Mar 2022 03:40:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV7DR-0003Qy-QQ for guix-patches@gnu.org; Fri, 18 Mar 2022 03:40:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34045) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nV7DQ-0004JM-6N for guix-patches@gnu.org; Fri, 18 Mar 2022 03:40:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nV7DQ-0007io-3v for guix-patches@gnu.org; Fri, 18 Mar 2022 03:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54434] [PATCH v2 3/7] gnu: XFCE: Remove input labels. Resent-From: 'Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Mar 2022 07:40:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54434@debbugs.gnu.org Cc: Maxime Devos , Brendan Tildesley Received: via spool by 54434-submit@debbugs.gnu.org id=B54434.164758916429560 (code B ref 54434); Fri, 18 Mar 2022 07:40:04 +0000 Received: (at 54434) by debbugs.gnu.org; 18 Mar 2022 07:39:24 +0000 Received: from localhost ([127.0.0.1]:56161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV7Cm-0007gb-0b for submit@debbugs.gnu.org; Fri, 18 Mar 2022 03:39:24 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:51200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV7Cj-0007g0-Rc for 54434@debbugs.gnu.org; Fri, 18 Mar 2022 03:39:22 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4KKbVq69khz9sS6; Fri, 18 Mar 2022 08:39:15 +0100 (CET) From: 'Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1647589153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=glIcESCJ9ffcVwIS7fQtNoz49DGCD5lgvSVaNWYTYxA=; b=hinaImycgxaRz72vg5oOZUu5HIRSzgoUfIt2YZSLcqLrGkZOtQj+WMAdtDfDzwRZJpqox1 DDnzBl3BF5TyR2sZAxmsJrJhlyvamiLKIeloFDKbBcVY6EIY1T8Sj2i2j8UOuG7ZczFnFL lQttF0j+RF8GSMO5TYNWdxylu4+8j7eAVIFf08DwH1a11IIc+7gw9jeQuktXjpeRF+bv6c vVEZdiEbdrCvpov2a4uIKfnzwG82MtbBzO3thvR94NAW2fOVtW3NhjafVhuG7gRXhhcs9f aSX+XTTrG+z5bMSXK93fPkDji5W8PRmAZ6zdTzyik1ZJkAS95I+Ur08xVcYTOA== Date: Fri, 18 Mar 2022 18:38:40 +1100 Message-Id: <20220318073844.14290-4-mail@brendan.scot> In-Reply-To: <20220318073844.14290-1-mail@brendan.scot> References: <20220318073844.14290-1-mail@brendan.scot> MIME-Version: 1.0 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: Brendan Tildesley (xfconf, libxfce4ui, xfce4-panel, xfce4-whiskermenu-plugin, xfce, xfce4-screensaver): Remove input labels. --- gnu/packages/xfce.scm | 130 +++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index d22a0dc84f..150d21226b 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -164,12 +164,12 @@ (define-public xfconf (string-append etc "/bash_completion.d")))))) (delete 'check)))) (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool) - ("glib:bin" ,glib "bin") ;; for gdbus-codegen - ("gobject-introspection" ,gobject-introspection) - ("vala" ,vala) - ("dbus" ,dbus))) + (list pkg-config + intltool + `(,glib "bin") ;; for gdbus-codegen + gobject-introspection + vala + dbus)) (propagated-inputs ;; libxfconf-0.pc refers to all these. (list glib)) @@ -201,10 +201,10 @@ (define-public libxfce4ui (native-inputs (list pkg-config intltool gobject-introspection)) (propagated-inputs - `(("gtk+-3" ,gtk+) ; required by libxfce4ui-2.pc - ;; libxfce4kbd-private-3.pc refers to all these. - ("libxfce4util" ,libxfce4util) - ("xfconf" ,xfconf))) + (list gtk+ ; required by libxfce4ui-2.pc + ;; libxfce4kbd-private-3.pc refers to all these. + libxfce4util + xfconf)) (inputs (list libsm libice startup-notification)) (home-page "https://www.xfce.org/") (synopsis "Widgets library for Xfce") @@ -415,20 +415,20 @@ (define-public xfce4-panel (("/usr/share/zoneinfo") (search-input-directory inputs "share/zoneinfo")))))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool) - ("glib:bin" ,glib "bin"))) + (list pkg-config + intltool + `(,glib "bin"))) (propagated-inputs - `(("gtk+-3" ,gtk+) ; required by libxfce4panel-2.0.pc - ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc + (list gtk+ ; required by libxfce4panel-2.0.pc + libxfce4util)) ; required by libxfce4panel-2.0.pc (inputs - `(("tzdata" ,tzdata) ;; For fix-tzdata-path phase only. - ("exo" ,exo) - ("gtk+-2" ,gtk+-2) - ("xfconf" ,xfconf) - ("garcon" ,garcon) - ("libwnck" ,libwnck) - ("libxfce4ui" ,libxfce4ui))) + (list tzdata ;; For fix-tzdata-path phase only. + exo + gtk+-2 + xfconf + garcon + libwnck + libxfce4ui)) (native-search-paths (list (search-path-specification (variable "X_XFCE4_LIB_DIRS") @@ -548,12 +548,12 @@ (define-public xfce4-whiskermenu-plugin (native-inputs (list pkg-config intltool)) (inputs - `(("xfce4-panel" ,xfce4-panel) - ("garcon" ,garcon) - ("gettext" ,gettext-minimal) - ("exo" ,exo) - ("gtk+" ,gtk+) - ("libxfce4ui" ,libxfce4ui))) + (list xfce4-panel + garcon + gettext-minimal + exo + gtk + libxfce4ui)) (arguments `(#:tests? #f ; no tests #:phases @@ -944,31 +944,31 @@ (define-public xfce directories) #t))))) (inputs - `(("exo" ,exo) - ("garcon" ,garcon) - ("gnome-icon-theme" ,gnome-icon-theme) - ("gtk-xfce-engine" ,gtk-xfce-engine) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("mate-polkit-for-xfce" ,mate-polkit-for-xfce) - ("ristretto" ,ristretto) - ("shared-mime-info" ,shared-mime-info) - ("thunar" ,thunar) - ("thunar-volman" ,thunar-volman) - ("tumbler" ,tumbler) - ("xfce4-appfinder" ,xfce4-appfinder) - ("xfce4-panel" ,xfce4-panel) - ("xfce4-power-manager" ,xfce4-power-manager) - ("xfce4-session" ,xfce4-session) - ("xfce4-settings" ,xfce4-settings) - ("xfce4-terminal" ,xfce4-terminal) - ("xfconf" ,xfconf) - ("xfdesktop" ,xfdesktop) - ("xfwm4" ,xfwm4) - ;; Panel plugins. - ("xfce4-battery-plugin" ,xfce4-battery-plugin) - ("xfce4-clipman-plugin" ,xfce4-clipman-plugin) - ("xfce4-pulseaudio-plugin" ,xfce4-pulseaudio-plugin) - ("xfce4-xkb-plugin" ,xfce4-xkb-plugin))) + (list exo + garcon + gnome-icon-theme + gtk-xfce-engine + hicolor-icon-theme + mate-polkit-for-xfce + ristretto + shared-mime-info + thunar + thunar-volman + tumbler + xfce4-appfinder + xfce4-panel + xfce4-power-manager + xfce4-session + xfce4-settings + xfce4-terminal + xfconf + xfdesktop + xfwm4 + ;; Panel plugins. + xfce4-battery-plugin + xfce4-clipman-plugin + xfce4-pulseaudio-plugin + xfce4-xkb-plugin)) (propagated-inputs ;; Default font that applications such as IceCat require. (list font-dejavu)) @@ -1261,19 +1261,19 @@ (define-public xfce4-screensaver (string-append "DBUS_SESSION_SERVICE_DIR=" dbus-dir))))))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool) - ("glib" ,glib) ; glib-compile-schemas - ("glib:bin" ,glib "bin"))) ; glib-compile-schemas + (list pkg-config + intltool + glib ; glib-compile-schemas + `(,glib "bin"))) ; glib-compile-schemas (inputs - `(("dbus-glib" ,dbus-glib) - ("libux-pam" ,linux-pam) - ("elogind" ,elogind) - ("garcon" ,garcon) - ("libxklavier" ,libxklavier) - ("libwnxk" ,libwnck) - ("libxscrnsaver" ,libxscrnsaver) - ("xfconf" ,xfconf))) + (list dbus-glib + linux-pam + elogind + garcon + libxklavier + libwnck + libxscrnsaver + xfconf)) (home-page "https://docs.xfce.org/apps/screensaver/start") (synopsis "Screensaver for the Xfce desktop") (description