Subject: bug#45062: closed (Re: [bug#45062] [PATCH 1/2] gnu: xfce4-session: Fix xfce4-panel plugin detection.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 07 Dec 2020 21:19:01 +0000

Your bug report

#45062: [PATCH 1/2] gnu: xfce4-session: Fix xfce4-panel plugin detection.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
45062: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=45062
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#45062] [PATCH 1/2] gnu: xfce4-session: Fix xfce4-panel plugin detection.
From: Kei Kebreau <[email-masked]>
To: 宋文武 <[email-masked]>
Cc: [email-masked]
Date: Mon, 7 Dec 2020 16:17:56 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

I've edited your documentation patch a little bit and pushed it to
master along with my second patch.  Thanks for your input and patch!

Kei

On Mon, 07 Dec 2020 19:21:51 +0800
宋文武 <[email-masked]> wrote:

> Kei Kebreau <[email-masked]> writes:
> 
> > Installing both 'xfce4-panel' and 'xfce4-whiskermenu-plugin' into
> > the user profile does work!  
> Okay, but I guess that will be some problem too, since then
> X_XFCE4_LIB_DIRS would contain both system and user paths...
> 
> > Is there a way to make clear to users and
> > administrators that xfce4-panel and its plugins should both be
> > installed at the user or system level to ensure proper function?  I
> > don't think it's obvious since our Xfce desktop service implicitly
> > installs the xfce4-panel.  
> 
> Yes, how about document it like this:
> 

Subject: [PATCH 1/2] gnu: xfce4-session: Fix xfce4-panel plugin detection.
From: Kei Kebreau <[email-masked]>
To: [email-masked]
Cc: Kei Kebreau <[email-masked]>
Date: Sun, 6 Dec 2020 00:02:24 -0500
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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 <[email-masked]>
 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <[email-masked]>
 # Copyright © 2016 Chris Marusich <[email-masked]>
-# Copyright © 2016, 2017, 2018 Kei Kebreau <[email-masked]>
+# Copyright © 2016, 2017, 2018, 2020 Kei Kebreau <[email-masked]>
 # Copyright © 2016, 2017 Rene Saavedra <[email-masked]>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <[email-masked]>
 # Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <[email-masked]>
@@ -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 <[email-masked]>
+
+--- 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
-- 
2.29.2