From patchwork Sun Dec 6 05:02:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 25595 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 89DE627BC00; Sun, 6 Dec 2020 05:03:15 +0000 (GMT) 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_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, 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 ESMTPS id BC7E827BC01 for ; Sun, 6 Dec 2020 05:03:11 +0000 (GMT) Received: from localhost ([::1]:45082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1klmCU-00047j-KU for patchwork@mira.cbaines.net; Sun, 06 Dec 2020 00:03:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klmCN-00047c-2L for guix-patches@gnu.org; Sun, 06 Dec 2020 00:03:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37116) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klmCM-0008DF-NF for guix-patches@gnu.org; Sun, 06 Dec 2020 00:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1klmCM-000191-G1 for guix-patches@gnu.org; Sun, 06 Dec 2020 00:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45062] [PATCH 1/2] gnu: xfce4-session: Fix xfce4-panel plugin detection. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Dec 2020 05:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45062 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45062@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16072309714380 (code B ref -1); Sun, 06 Dec 2020 05:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Dec 2020 05:02:51 +0000 Received: from localhost ([127.0.0.1]:48662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klmC3-00018O-O4 for submit@debbugs.gnu.org; Sun, 06 Dec 2020 00:02:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:39232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klmBz-00018E-AX for submit@debbugs.gnu.org; Sun, 06 Dec 2020 00:02:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klmBy-00046E-Ob for guix-patches@gnu.org; Sun, 06 Dec 2020 00:02:38 -0500 Received: from mout02.posteo.de ([185.67.36.66]:50779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klmBt-0008BS-BS for guix-patches@gnu.org; Sun, 06 Dec 2020 00:02:38 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 05B5C2400FB for ; Sun, 6 Dec 2020 06:02:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1607230948; bh=dqExPJMQuPqNyIw+n0CNlsQb40KKkDywF5lZDVsZ0jA=; h=From:To:Cc:Subject:Date:From; b=eB4QrAlqN1pJoZ8Obshe/mdhUkBNxK/G7EETBJCpXbIntLRi7jVGPqhd6NCXGpgm5 1M/e/rIRvA5qlioFmEdzV5HJLrbDHW6QfX/R0I8oXEsqxKQLAq9VJUXzKzoXg3+epz fgglk/lmYKmqHfo7LRDMjbCBNaQU8aRd4rO80EDgeHOZzludYfxjNs94sOH9ttMiYP A/HE4unX8eSIgfLnxHDNgTnkTJN8cTxBm+HfJKOt93qxfKyXIxBn6kaGhdPpnE7zXr OxlvFOEHqH1hzYUy760hkmGVo00ZfiL0M4399dfI9V0h8pRU07Gi3LuQ6vv5lAmYnl 5x9zzXrWs8hXw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4CpZ7Q6x0tz9rxG; Sun, 6 Dec 2020 06:02:26 +0100 (CET) From: Kei Kebreau Date: Sun, 6 Dec 2020 00:02:24 -0500 Message-Id: <20201206050224.5355-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=kkebreau@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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 * gnu/packages/xfce.scm (xfce4-session)[source]: Add patch to append the path to user-installed xfce4-panel plugins to the X_XFCE4_LIB_DIRS environment variable. * gnu/packages/patches/xfce4-session-xinitrc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 3 ++- .../patches/xfce4-session-xinitrc.patch | 19 +++++++++++++++++++ gnu/packages/xfce.scm | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/xfce4-session-xinitrc.patch diff --git a/gnu/local.mk b/gnu/local.mk index cbfefccbb9..ca6d90cced 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -4,7 +4,7 @@ # Copyright © 2016 Mathieu Lirzin # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver # Copyright © 2016 Chris Marusich -# Copyright © 2016, 2017, 2018 Kei Kebreau +# Copyright © 2016, 2017, 2018, 2020 Kei Kebreau # Copyright © 2016, 2017 Rene Saavedra # Copyright © 2016 Adonay "adfeno" Felipe Nogueira # Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus @@ -1721,6 +1721,7 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ + %D%/packages/patches/xfce4-session-xinitrc.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xmonad-dynamic-linking.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ diff --git a/gnu/packages/patches/xfce4-session-xinitrc.patch b/gnu/packages/patches/xfce4-session-xinitrc.patch new file mode 100644 index 0000000000..914890ff3d --- /dev/null +++ b/gnu/packages/patches/xfce4-session-xinitrc.patch @@ -0,0 +1,19 @@ +Ensure that xfce4 panel plugins in the user's Guix profile can +be found in the directories specified in X_XFCE4_LIB_DIRS. + +Partially fixes Guix bug #44916: +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44916. + +Patch by Kei Kebreau + +--- xfce4-session-4.14.2/scripts/xinitrc.in.in.orig 2020-12-05 15:01:43.932285134 -0500 ++++ xfce4-session-4.14.2/scripts/xinitrc.in.in 2020-12-05 15:22:06.171691694 -0500 +@@ -83,6 +83,8 @@ + dbus-update-activation-environment --systemd XAUTHLOCALHOSTNAME=$XAUTHLOCALHOSTNAME + fi + ++# load local Guix xfce4-panel plugins ++test -r "$HOME/.guix-profile/lib/xfce4" && export X_XFCE4_LIB_DIRS="$X_XFCE4_LIB_DIRS:$HOME/.guix-profile/lib/xfce4" + + # check if we start xfce4-session with ck-launch-session. this is only + # required for starting from a console, not a login manager diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 4090372805..685ddd3e18 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -684,6 +684,7 @@ your system in categories, so you can quickly find and launch them.") (sha256 (base32 "1bwpylcn7x9i301yz45wvkzah9bncv9b44nf4hh9ln4i1jka9qzv")) + (patches (search-patches "xfce4-session-xinitrc.patch")) (modules '((guix build utils))) (snippet '(begin From patchwork Sun Dec 6 05:04:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 25596 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 C9D1427BC01; Sun, 6 Dec 2020 05:05:26 +0000 (GMT) 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_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, 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 ESMTPS id 40C8927BC00 for ; Sun, 6 Dec 2020 05:05:26 +0000 (GMT) Received: from localhost ([::1]:46938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1klmEf-0004yk-Eu for patchwork@mira.cbaines.net; Sun, 06 Dec 2020 00:05:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klmEI-0004yc-4W for guix-patches@gnu.org; Sun, 06 Dec 2020 00:05:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klmEH-0000B5-Pm for guix-patches@gnu.org; Sun, 06 Dec 2020 00:05:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1klmEH-0001CT-LF for guix-patches@gnu.org; Sun, 06 Dec 2020 00:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45062] [PATCH 2/2] gnu: xfce4-whiskermenu-plugin: Fix installed shell script. References: <20201206050224.5355-1-kkebreau@posteo.net> In-Reply-To: <20201206050224.5355-1-kkebreau@posteo.net> Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Dec 2020 05:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45062 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45062@debbugs.gnu.org Cc: Kei Kebreau , Michael Rohleder Received: via spool by 45062-submit@debbugs.gnu.org id=B45062.16072310834584 (code B ref 45062); Sun, 06 Dec 2020 05:05:01 +0000 Received: (at 45062) by debbugs.gnu.org; 6 Dec 2020 05:04:43 +0000 Received: from localhost ([127.0.0.1]:48667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klmDz-0001Bs-CV for submit@debbugs.gnu.org; Sun, 06 Dec 2020 00:04:43 -0500 Received: from mout02.posteo.de ([185.67.36.66]:36491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klmDy-0001Bf-5e for 45062@debbugs.gnu.org; Sun, 06 Dec 2020 00:04:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 70C232400FB for <45062@debbugs.gnu.org>; Sun, 6 Dec 2020 06:04:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1607231076; bh=fBOb8HzJc6N0tc48tyJrzIvzEjhe+FWO12/taGkGYPs=; h=From:To:Cc:Subject:Date:From; b=FQMFXVq4AfYcS1w8MVEbafLxuQTBE8wWpq74dfJ1pQ3R7iCtvaqjs6V9kST9zPM8+ fQwznOT5Pirbo9rG1cEHpc4ki+K824qpDjZKj+QTrBwknQOY+qolLrbWudzoarySON lAetZzn72xOIY3CQYviP/f+6paXIQZy3I+6219YoAyy646m30uMoANa2x4/WQqDSgj p8Vech56hX+5GNj++TtHfFZ5ZZcpqggpCXP6RS11vx/gfCf/0feClx7yylnKCJ3j3y y2xVbKmqGb6+uHood5+4EjlShigSlCt4XoBAoOaJxO/94pg8pR7Nl5beA/HKQMDSG6 vRS2aEtEiDwAQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4CpZ9v1T9bz6tmH; Sun, 6 Dec 2020 06:04:34 +0100 (CET) From: Kei Kebreau Date: Sun, 6 Dec 2020 00:04:33 -0500 Message-Id: <20201206050433.5774-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.29.2 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: Michael Rohleder * gnu/packages/xfce.scm (xfce4-whiskermenu-plugin): Fix installed shell script. [arguments]: Add phase fix-shell-script to substitute paths to xfce4-panel and gettext. [inputs]: Add gettext-minimal. Co-authored-by: Kei Kebreau Signed-off-by: Kei Kebreau --- gnu/packages/xfce.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 685ddd3e18..6f3fc34763 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages cdrom) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) @@ -592,11 +593,21 @@ keys for controlling the audio volume.") (inputs `(("xfce4-panel" ,xfce4-panel) ("garcon" ,garcon) + ("gettext" ,gettext-minimal) ("exo" ,exo) ("gtk+" ,gtk+) ("libxfce4ui" ,libxfce4ui))) (arguments - `(#:tests? #f)) ; no tests + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-shell-script + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (string-append "panel-plugin/xfce4-popup-whiskermenu.in") + (("@CMAKE_INSTALL_FULL_BINDIR@") + (string-append (assoc-ref inputs "xfce4-panel") "/bin")) + (("gettext") (which "gettext"))) + #t))))) (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin") (synopsis "Application menu panel plugin for Xfce") (description