From 81881fc1c2722957a21d25c07ac97c7c12ac7f5b Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Wed, 5 Aug 2020 19:38:24 -0400
Subject: [PATCH] Remove Adapta theme since it's totally broken now

---
 .../files/dconf/build.d/initial-realm-dconf.conf         | 1 -
 .../files/gsettings/90_citadel.gschema.override          | 9 ---------
 .../recipes-citadel/images/citadel-extra-image.bb        | 1 -
 .../recipes-citadel/images/citadel-rootfs-image.bb       | 6 ------
 4 files changed, 17 deletions(-)

diff --git a/meta-citadel/recipes-citadel/citadel-config/files/dconf/build.d/initial-realm-dconf.conf b/meta-citadel/recipes-citadel/citadel-config/files/dconf/build.d/initial-realm-dconf.conf
index a64285e..7d9b6ff 100644
--- a/meta-citadel/recipes-citadel/citadel-config/files/dconf/build.d/initial-realm-dconf.conf
+++ b/meta-citadel/recipes-citadel/citadel-config/files/dconf/build.d/initial-realm-dconf.conf
@@ -1,6 +1,5 @@
 [org/gnome/desktop/interface]
 cursor-theme='Paper'
-gtk-theme='Adapta-Eta'
 
 [org/gnome/settings-daemon/plugins/xsettings]
 antialiasing='rgba'
diff --git a/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override
index 8e8809c..e356a67 100644
--- a/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override
+++ b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override
@@ -19,25 +19,16 @@ autorun-x-content-start-app=[]
 [org.gnome.desktop.lockdown]
 disable-user-switching=true
 
-[org.gnome.desktop.wm.preferences]
-theme='Adapta-Eta'
-titlebar-font='Roboto Bold 11'
-
 
 [org.gnome.desktop.interface]
-gtk-theme='Adapta-Eta'
 cursor-theme='Paper'
 icon-theme='Paper'
-font-name='Roboto 11'
 gtk-enable-primary-paste=false
 clock-format='12h'
 
 [org.gnome.shell]
 enabled-extensions=['dash-to-panel@jderose9.github.com']
 
-[org.gnome.shell.extensions]
-user-theme-name='Adapta-Eta'
-
 [org.gnome.settings-daemon.plugins.xsettings]
 antialiasing='rgba'
 
diff --git a/meta-citadel/recipes-citadel/images/citadel-extra-image.bb b/meta-citadel/recipes-citadel/images/citadel-extra-image.bb
index 44302f1..5bb016e 100644
--- a/meta-citadel/recipes-citadel/images/citadel-extra-image.bb
+++ b/meta-citadel/recipes-citadel/images/citadel-extra-image.bb
@@ -4,7 +4,6 @@ LICENSE = "MIT"
 
 PACKAGE_INSTALL = "\
     linux-firmware \
-    adapta-gtk-theme \
     paper-icon-theme \
     gnome-backgrounds \
     base16-vim \
diff --git a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb
index 4355050..ffe2327 100644
--- a/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb
+++ b/meta-citadel/recipes-citadel/images/citadel-rootfs-image.bb
@@ -51,13 +51,7 @@ setup_var() {
     mv ${IMAGE_ROOTFS}/home/citadel ${IMAGE_ROOTFS}/usr/share/factory/home
     mv ${IMAGE_ROOTFS}/home/root ${IMAGE_ROOTFS}/usr/share/factory/home
 
-    rm ${IMAGE_ROOTFS}/usr/share/gnome-shell/gnome-shell-theme.gresource
-    ln -sf /opt/share/themes/Adapta-Eta/gnome-shell/gnome-shell-theme.gresource ${IMAGE_ROOTFS}/usr/share/gnome-shell/gnome-shell-theme.gresource
 
-    ln -sf /opt/share/themes/Adapta ${IMAGE_ROOTFS}/usr/share/themes/Adapta
-    ln -sf /opt/share/themes/Adapta-Eta ${IMAGE_ROOTFS}/usr/share/themes/Adapta-Eta
-    ln -sf /opt/share/themes/Adapta-Nokto ${IMAGE_ROOTFS}/usr/share/themes/Adapta-Nokto
-    ln -sf /opt/share/themes/Adapta-Nokto-Eta ${IMAGE_ROOTFS}/usr/share/themes/Adapta-Nokto-Eta
     ln -sf /opt/share/icons/Paper ${IMAGE_ROOTFS}/usr/share/icons/Paper
     ln -sf /opt/share/icons/Adwaita ${IMAGE_ROOTFS}/usr/share/icons/Adwaita
     ln -sf /opt/share/backgrounds/gnome ${IMAGE_ROOTFS}/usr/share/backgrounds/gnome