From 6b0179c1077249a47900ed36244d8f0bd89996a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
 <aidecoe@aidecoe.name>
Date: Tue, 24 Sep 2019 22:18:21 +0100
Subject: [PATCH] Remove no longer needed xorg-preload-apps.conf

---
 Makefile                        |  2 --
 debian/qubes-core-agent.install |  1 -
 misc/xorg-preload-apps.conf     | 30 ------------------------------
 rpm_spec/core-agent.spec.in     |  1 -
 4 files changed, 34 deletions(-)
 delete mode 100644 misc/xorg-preload-apps.conf

diff --git a/Makefile b/Makefile
index 2543426..73ffe72 100644
--- a/Makefile
+++ b/Makefile
@@ -240,8 +240,6 @@ install-common: install-doc
 
 	install -d $(DESTDIR)/mnt/removable
 
-	install -D -m 0644 misc/xorg-preload-apps.conf $(DESTDIR)/etc/X11/xorg-preload-apps.conf
-
 	install -d $(DESTDIR)/usr/lib/qubes-bind-dirs.d
 	install -D -m 0644 misc/30_cron.conf $(DESTDIR)/usr/lib/qubes-bind-dirs.d/30_cron.conf
 
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index f0f884d..7431ba2 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -1,4 +1,3 @@
-etc/X11/xorg-preload-apps.conf
 etc/apt/apt.conf.d/00notify-hook
 etc/apt/apt.conf.d/70no-unattended
 etc/apt/sources.list.d/qubes-r4.list
diff --git a/misc/xorg-preload-apps.conf b/misc/xorg-preload-apps.conf
deleted file mode 100644
index 7edf848..0000000
--- a/misc/xorg-preload-apps.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-Section "ServerLayout"
-        Identifier     "Default Layout"
-        Screen      0  "Screen0" 0 0
-EndSection
-
-Section "Device"
-        Identifier  "Videocard0"
-        Driver      "dummy"
-	VideoRam 4001
-EndSection
-
-Section "Monitor"
-        Identifier "Monitor0"
-        HorizSync 49-50
-	VertRefresh 62-63
-	Modeline "QB1280x800" 64 1280 1281 1282 1283 800 801 802 803
-EndSection
-
-Section "Screen"
-        Identifier "Screen0"
-        Device     "Videocard0"
-	Monitor    "Monitor0"
-        DefaultDepth     24
-        SubSection "Display"
-                Viewport   0 0
-                Depth     24
-		Modes "QB1280x800"
-        EndSubSection
-EndSection
-
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index 16fae24..5b77b79 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -544,7 +544,6 @@ rm -f %{name}-%{version}
 %{kde5_service_dir}/qvm-copy.desktop
 %{kde5_service_dir}/qvm-move.desktop
 %{kde5_service_dir}/qvm-dvm.desktop
-%config(noreplace) /etc/X11/xorg-preload-apps.conf
 /etc/fstab
 /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*
 %dir /etc/qubes-rpc