From 69c1a45e3a1b90002e1ea345d05f476296a543be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 13 Jul 2016 00:33:27 +0200
Subject: [PATCH] comps: drop KDE from installation image

Fixes QubesOS/qubes-issues#2119
---
 conf/comps-qubes.xml     | 42 ----------------------------------------
 conf/qubes-kickstart.cfg |  1 -
 2 files changed, 43 deletions(-)

diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index c955faa..156e98e 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -1190,26 +1190,6 @@
     </packagelist>
   </group>
 
-  <environment>
-   <id>qubes-kde</id>
-   <display_order>2</display_order>
-   <name>Qubes OS with KDE</name>
-   <description>Standard installation with KDE enviroment in Dom0.</description>
-    <grouplist>
-     <groupid>base</groupid>
-     <groupid>base-x</groupid>
-     <groupid>hardware-support</groupid>
-     <groupid>fonts</groupid>
-     <groupid>sound-basic</groupid>
-     <groupid>qubes</groupid>
-     <groupid>kde-desktop-qubes</groupid>
-    </grouplist>
-    <optionlist>
-     <groupid default='true'>debian-8</groupid>
-     <groupid default='true'>whonix</groupid>
-    </optionlist>
-  </environment>
-
   <environment>
    <id>qubes-xfce</id>
    <display_order>3</display_order>
@@ -1231,28 +1211,6 @@
      <groupid default='true'>whonix</groupid>
     </optionlist>
   </environment>
-  <environment>
-   <id>qubes-kde-xfce</id>
-   <display_order>1</display_order>
-   <name>Qubes OS with KDE and Xfce</name>
-   <description>Standard installation with both KDE and Xfce enviroments in Dom0 (selectable on startup).</description>
-    <grouplist>
-     <groupid>base</groupid>
-     <groupid>base-x</groupid>
-     <groupid>hardware-support</groupid>
-     <groupid>fonts</groupid>
-     <groupid>sound-basic</groupid>
-     <groupid>qubes</groupid>
-     <groupid>xfce-desktop-qubes</groupid>
-     <groupid>xfce-extra-plugins</groupid>
-     <groupid>xfce-media</groupid>
-     <groupid>kde-desktop-qubes</groupid>
-    </grouplist>
-    <optionlist>
-     <groupid default='true'>debian-8</groupid>
-     <groupid default='true'>whonix</groupid>
-    </optionlist>
-  </environment>
   <langpacks>
     <match name="kdelibs" install="kde-l10n-%s"/>
   </langpacks>
diff --git a/conf/qubes-kickstart.cfg b/conf/qubes-kickstart.cfg
index 6ebd708..8ea2b3b 100644
--- a/conf/qubes-kickstart.cfg
+++ b/conf/qubes-kickstart.cfg
@@ -13,7 +13,6 @@ repo --name=dom0-updates --baseurl=file:///tmp/qubes-installer/yum/dom0-updates/
 @core
 @base
 @base-x --nodefaults
-@kde-desktop-qubes
 @xfce-desktop-qubes
 @xfce-extra-plugins
 @xfce-media