From b1cebaf73b22a8d7cfd818078a476a99c6ab1a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Thu, 14 Nov 2019 23:33:43 +0100
Subject: [PATCH] qvm-features-request: add guivm-gui-agent

---
 Makefile                                                     | 3 +++
 .../etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh     | 5 +++++
 debian/qubes-gui-agent.install                               | 1 +
 rpm_spec/gui-agent.spec.in                                   | 1 +
 4 files changed, 10 insertions(+)
 create mode 100755 appvm-scripts/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh

diff --git a/Makefile b/Makefile
index 9eb82f0a..3e482278 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,9 @@ install-pulseaudio:
 install-common:
 	install -D gui-agent/qubes-gui $(DESTDIR)/usr/bin/qubes-gui
 	install -D gui-common/qubes-gui-runuser $(DESTDIR)/usr/bin/qubes-gui-runuser
+	install -d $(DESTDIR)/etc/qubes/post-install.d
+	install -m 0755 appvm-scripts/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh \
+                $(DESTDIR)/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh
 	install -D appvm-scripts/usrbin/qubes-session \
 		$(DESTDIR)/usr/bin/qubes-session
 	install -D appvm-scripts/usrbin/qubes-run-xorg \
diff --git a/appvm-scripts/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh b/appvm-scripts/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh
new file mode 100755
index 00000000..097fc16b
--- /dev/null
+++ b/appvm-scripts/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if rpm -q xorg-x11-server-Xephyr > /dev/null; then
+    qvm-features-request service supported-service.guivm-gui-agent=1
+fi
diff --git a/debian/qubes-gui-agent.install b/debian/qubes-gui-agent.install
index ce3deedc..411021fa 100644
--- a/debian/qubes-gui-agent.install
+++ b/debian/qubes-gui-agent.install
@@ -3,6 +3,7 @@ etc/profile.d/*
 etc/pam.d/qubes-gui-agent
 etc/security/limits.d/90-qubes-gui.conf
 etc/qubes-rpc/qubes.SetMonitorLayout
+etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh
 etc/xdg/autostart/qubes-icon-sender.desktop
 etc/xdg/autostart/qubes-qrexec-fork-server.desktop
 etc/xdg/Trolltech.conf
diff --git a/rpm_spec/gui-agent.spec.in b/rpm_spec/gui-agent.spec.in
index 3ead8954..ea40a60a 100644
--- a/rpm_spec/gui-agent.spec.in
+++ b/rpm_spec/gui-agent.spec.in
@@ -164,6 +164,7 @@ rm -f %{name}-%{version}
 /etc/X11/xinit/xinitrc.d/20qt-gnome-desktop-session-id.sh
 /etc/X11/xinit/xinitrc.d/50-guivm-windows-prefix.sh
 /etc/qubes-rpc/qubes.SetMonitorLayout
+/etc/qubes/post-install.d/20-qubes-guivm-gui-agent.sh
 %config /etc/sysconfig/desktop
 /lib/systemd/system/qubes-gui-agent.service
 /lib/udev/rules.d/70-master-of-seat.rules