Merge remote-tracking branch 'origin/pr/102'

* origin/pr/102:
  debian: fix conflict with newer location of pulseaudio conf
  Check if shmoverride.so exists directly
  debian: add xfce subpackage for VM
  Makefile: add clean of pkgs and debian changelog.*
  qubes-run-xephyr: debian has another path for shmoverride.so

.gitignore

@@ -1,3 +1,5 @@
 *.o
 tags
 deb/
+pkgs
+debian/changelog.*

.travis.yml

@@ -1,18 +1,4 @@
-sudo: required
-dist: bionic
-language: generic
-install: git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder
-script: ~/qubes-builder/scripts/travis-build
-env:
- - DIST_DOM0=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=fc30 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=stretch USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=buster USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
- - DISTS_VM=centos7 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1
-
-# don't build tags which are meant for code signing only
-branches:
-  except:
-    - /.*_.*/
-    - build
+import:
+  - source: QubesOS/qubes-continuous-integration:R4.1/travis-base-r4.1.yml
+  - source: QubesOS/qubes-continuous-integration:R4.1/travis-dom0-r4.1.yml
+  - source: QubesOS/qubes-continuous-integration:R4.1/travis-vms-r4.1.yml

Makefile

@@ -87,6 +87,8 @@ clean:
 	$(MAKE) -C xf86-qubes-common clean
 	(cd xf86-input-mfndev; if [ -e Makefile ] ; then \
 		$(MAKE) distclean; fi; ./bootstrap --clean || echo )
+	rm -rf debian/changelog.*
+	rm -rf pkgs
 
 
 install: install-rh-agent install-pulseaudio
@@ -102,10 +104,10 @@ install-rh-agent: 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-xfce:
-	install -D appvm-scripts/etc/X11/xinit/xinitrc.d/50-xfce-desktop.sh \
-		$(DESTDIR)/etc/X11/xinit/xinitrc.d/50-xfce-desktop.sh
+	install -D appvm-scripts/etc/X11/xinit/xinitrc.d/50guivm-windows-prefix.sh \
+		$(DESTDIR)/etc/X11/xinit/xinitrc.d/50guivm-windows-prefix.sh
+	install -D appvm-scripts/etc/X11/xinit/xinitrc.d/60xfce-desktop.sh \
+		$(DESTDIR)/etc/X11/xinit/xinitrc.d/60xfce-desktop.sh
 
 install-debian: appvm install-common install-pulseaudio
 	install -d $(DESTDIR)/etc/X11/Xsession.d
@@ -163,8 +165,6 @@ install-common:
 		$(DESTDIR)/$(USRLIBDIR)/tmpfiles.d/qubes-session.conf
 	install -m 0644 -D appvm-scripts/etc/securitylimits.d/90-qubes-gui.conf \
 		$(DESTDIR)/etc/security/limits.d/90-qubes-gui.conf
-	install -D appvm-scripts/etc/X11/xinit/xinitrc.d/50-guivm-windows-prefix.sh \
-		$(DESTDIR)/etc/X11/xinit/xinitrc.d/50-guivm-windows-prefix.sh
 ifneq ($(shell lsb_release -is), Ubuntu)
 	install -m 0644 -D appvm-scripts/etc/xdg/Trolltech.conf \
 		$(DESTDIR)/etc/xdg/Trolltech.conf

appvm-scripts/etc/X11/Xsession.d/25xdg-qubes-settings

@@ -1,5 +1,10 @@
 # This file is sourced by Xsession(5), not executed.
 
+# shellcheck disable=SC1091
+. /usr/lib/qubes/init/functions
+
+if ! qsvc guivm-gui-agent; then
+
 installConfigurationFile() {
     file="${1}"
 
@@ -16,3 +21,5 @@ if [ -x /usr/bin/xsettingsd ]; then
     installConfigurationFile "Xresources"
     /usr/bin/xsettingsd &
 fi
+
+fi

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

@@ -26,5 +26,5 @@ fi
 
 export QT_QPA_PLATFORMTHEME=qt5ct
 
-xfsettingsd &
+xfsettingsd --replace&
 fi

appvm-scripts/etc/X11/xinit/xinitrc.d/50guivm-windows-prefix.sh

@@ -0,0 +1 @@
+../../Xsession.d/50guivm-windows-prefix

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

@@ -0,0 +1 @@
+../../Xsession.d/60xfce-desktop

appvm-scripts/usrbin/qubes-run-xephyr

@@ -2,4 +2,10 @@
 DISPLAY_XEPHYR="$1"
 OPTIONS_XEPHYR="-no-host-grab -fullscreen"
 
-LD_PRELOAD=/usr/lib64/qubes-gui-daemon/shmoverride.so /usr/bin/Xephyr $OPTIONS_XEPHYR "$DISPLAY_XEPHYR" > ~/.xephyr-errors 2>&1
+if [ -e /usr/lib/x86_64-linux-gnu/qubes-gui-daemon/shmoverride.so ]; then
+    SHMOVERRIDE=/usr/lib/x86_64-linux-gnu/qubes-gui-daemon/shmoverride.so
+elif [ -e /usr/lib64/qubes-gui-daemon/shmoverride.so ]; then
+    SHMOVERRIDE=/usr/lib64/qubes-gui-daemon/shmoverride.so
+fi
+
+LD_PRELOAD=$SHMOVERRIDE /usr/bin/Xephyr $OPTIONS_XEPHYR "$DISPLAY_XEPHYR" > ~/.xephyr-errors 2>&1

debian/control

@@ -100,7 +100,15 @@ Depends:
     ${shlibs:Depends},
     ${pulse:Depends},
     ${misc:Depends}
-Replaces: qubes-gui-agent (<< 4.0.0-1)
-Breaks: qubes-gui-agent (<< 4.0.0-1)
+Replaces: qubes-gui-agent (<< 4.1.9-1)
+Breaks: qubes-gui-agent (<< 4.1.9-1)
 Description: Audio support for Qubes VM
  Pulseaudio module to enable sound support in Qubes VM
+
+Package: qubes-gui-agent-xfce
+Architecture: any
+Depends:
+    ${shlibs:Depends},
+    ${misc:Depends}
+Description: XFCE desktop support for Qubes VM
+ XFCE desktop support for Qubes VM

debian/pulseaudio-qubes.install

@@ -2,3 +2,4 @@ etc/pulse/qubes-default.pa
 etc/xdg/autostart/qubes-pulseaudio.desktop
 usr/bin/start-pulseaudio-with-vchan
 usr/lib/pulse-*/modules/module-vchan-sink.so
+usr/lib/tmpfiles.d/qubes-pulseaudio.conf

debian/qubes-gui-agent-xfce.install

@@ -0,0 +1 @@
+etc/X11/Xsession.d/60xfce-desktop

debian/qubes-gui-agent.install

@@ -1,5 +1,12 @@
-etc/X11/*
-etc/profile.d/*
+etc/X11/Xsession.d/90qubes-keymap
+etc/X11/Xsession.d/20qt-gnome-desktop-session-id
+etc/X11/Xsession.d/20qt-x11-no-mitshm
+etc/X11/Xsession.d/25xdg-qubes-settings
+etc/X11/Xsession.d/50guivm-windows-prefix
+etc/X11/xorg-qubes.conf.template
+etc/profile.d/qubes-gui.sh
+etc/profile.d/qubes-gui.csh
+etc/profile.d/qubes-session.sh
 etc/pam.d/qubes-gui-agent
 etc/security/limits.d/90-qubes-gui.conf
 etc/qubes-rpc/qubes.SetMonitorLayout
@@ -21,7 +28,7 @@ usr/bin/qubes-session
 usr/bin/qubes-set-monitor-layout
 usr/lib/qubes/icon-sender
 usr/lib/sysctl.d/30-qubes-gui-agent.conf
-usr/lib/tmpfiles.d/*
+usr/lib/tmpfiles.d/qubes-session.conf
 usr/lib/qubes/qubes-gui-agent-pre.sh
 usr/share/glib-2.0/schemas/20_qubes-gui-vm.gschema.override
 var/log/qubes

rpm_spec/gui-agent.spec.in

@@ -106,7 +106,7 @@ make BACKEND_VMM=@BACKEND_VMM@ appvm
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install install-xfce DESTDIR=$RPM_BUILD_ROOT \
+make install DESTDIR=$RPM_BUILD_ROOT \
                      LIBDIR=%{_libdir} \
                      DATADIR=%{_datadir} \
                      PA_VER_FULL=%{pa_ver_full}
@@ -167,7 +167,7 @@ rm -f %{name}-%{version}
 /etc/X11/xinit/xinitrc.d/qubes-keymap.sh
 /etc/X11/xinit/xinitrc.d/20qt-x11-no-mitshm.sh
 /etc/X11/xinit/xinitrc.d/20qt-gnome-desktop-session-id.sh
-/etc/X11/xinit/xinitrc.d/50-guivm-windows-prefix.sh
+/etc/X11/xinit/xinitrc.d/50guivm-windows-prefix.sh
 /etc/qubes-rpc/qubes.SetMonitorLayout
 /etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh
 %config /etc/sysconfig/desktop
@@ -190,7 +190,7 @@ rm -f %{name}-%{version}
 /etc/xdg/autostart/qubes-pulseaudio.desktop
 
 %files xfce
-/etc/X11/xinit/xinitrc.d/50-xfce-desktop.sh
+/etc/X11/xinit/xinitrc.d/60xfce-desktop.sh
 
 %changelog
 @CHANGELOG@