Add support for XFCE desktop in appvm

Makefile

@@ -96,6 +96,8 @@ install-rh: appvm install-common
 		$(DESTDIR)/etc/X11/xinit/xinitrc.d/20qt-x11-no-mitshm.sh
 	install -D appvm-scripts/etc/X11/xinit/xinitrc.d/20qt-gnome-desktop-session-id.sh \
 		$(DESTDIR)/etc/X11/xinit/xinitrc.d/20qt-gnome-desktop-session-id.sh
+	install -D appvm-scripts/etc/X11/xinit/xinitrc.d/50-xfce-desktop.sh \
+                $(DESTDIR)/etc/X11/xinit/xinitrc.d/50-xfce-desktop.sh
 	install -m 0644 -D appvm-scripts/etc/X11/Xwrapper.config \
 		$(DESTDIR)/etc/X11/Xwrapper.config
 

appvm-scripts/etc/X11/xinit/xinitrc.d/50-xfce-desktop.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+XDG_MENU_PREFIX="xfce-"
+export XDG_MENU_PREFIX
+
+DESKTOP_SESSION="xfce"
+export DESKTOP_SESSION
+
+XDG_CURRENT_DESKTOP="XFCE"
+export XDG_CURRENT_DESKTOP
+
+XDG_CONFIG_HOME=$HOME/.config
+[ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME"
+
+XDG_CACHE_HOME=$HOME/.cache
+[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME"
+
+if which xdg-user-dirs-update >/dev/null 2>&1; then
+    xdg-user-dirs-update
+fi
+
+xfsettingsd &

rpm_spec/gui-agent.spec

@@ -65,14 +65,22 @@ Obsoletes:  qubes-gui-vm < 4.0.0
 Summary: Audio support for Qubes VM
 # The vchan sink needs .h files from pulseaudio sources
 # that are not exported by any *-devel packages; thus they are internal and
-# possible to change across version. They are copied to gui git. 
+# possible to change across version. They are copied to gui git.
 # It is possible that our code will work fine with any later pulseaudio
 # version; but this needs to be verified for each pulseaudio version.
 Requires:	pulseaudio = %{pa_ver}
 Conflicts:  qubes-gui-vm < 4.0.0
 
 %description -n pulseaudio-qubes
- Pulseaudio module to enable sound support in Qubes VM
+Pulseaudio module to enable sound support in Qubes VM
+
+%package xfce
+Summary: XFCE desktop support for Qubes VM
+
+%description xfce
+XFCE desktop support for Qubes VM
+
+%description
 
 %define _builddir %(pwd)
 
@@ -171,3 +179,6 @@ rm -f %{name}-%{version}
 /usr/bin/start-pulseaudio-with-vchan
 %{_libdir}/pulse-%{pa_ver}/modules/module-vchan-sink.so
 /etc/xdg/autostart/qubes-pulseaudio.desktop
+
+%files xfce
+/etc/X11/xinit/xinitrc.d/50-xfce-desktop.sh