From 2c396b28e5f6fa3e2901788734477e463d3adf9a Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Tue, 15 Jan 2019 11:30:55 -0500
Subject: [PATCH] No longer attempting to keep multiple Gnome versions in
 single tree

---
 meta-gnome/conf/include/gnome-3.28.0.inc      | 52 -------------------
 .../include/gnome-development-packages.inc    |  1 -
 .../conf/include/gnome-stable-packages.inc    |  2 -
 meta-gnome/conf/layer.conf                    |  3 --
 4 files changed, 58 deletions(-)
 delete mode 100644 meta-gnome/conf/include/gnome-3.28.0.inc
 delete mode 100644 meta-gnome/conf/include/gnome-development-packages.inc
 delete mode 100644 meta-gnome/conf/include/gnome-stable-packages.inc

diff --git a/meta-gnome/conf/include/gnome-3.28.0.inc b/meta-gnome/conf/include/gnome-3.28.0.inc
deleted file mode 100644
index 292b1b7..0000000
--- a/meta-gnome/conf/include/gnome-3.28.0.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-# 3.28.0
-
-PREFERRED_VERSION_atk = "2.28.1"
-PREFERRED_VERSION_at-spi2-atk = "2.26.2"
-PREFERRED_VERSION_at-spi2-core = "2.28.0"
-#PREFERRED_VERSION_dconf = "0.27.1"
-PREFERRED_VERSION_dconf = "0.27.1"
-# 0.27.1 was moved to meson and rpath is now broken for /usr/bin/dconf
-PREFERRED_VERSION_dconf-native = "0.26.1"
-PREFERRED_VERSION_gcr = "3.28.0"
-PREFERRED_VERSION_gdm = "3.27.92"
-PREFERRED_VERSION_geocode-glib = "3.25.4.1"
-PREFERRED_VERSION_gexiv2 = "0.10.8"
-PREFERRED_VERSION_gjs = "1.52.0"
-PREFERRED_VERSION_glib = "2.56.1"
-PREFERRED_VERSION_gnome-autoar = "0.2.3"
-PREFERRED_VERSION_gnome-backgrounds = "3.28.0"
-PREFERRED_VERSION_gnome-bluetooth = "3.28.0"
-# No recipe 
-PREFERRED_VERSION_gnome-color-manager = "3.28.0"
-PREFERRED_VERSION_gnome-control-center = "3.28.0"
-PREFERRED_VERSION_gnome-desktop = "3.28.0"
-PREFERRED_VERSION_gnome-keyring = "3.28.0.1"
-# No recipe 
-PREFERRED_VERSION_gnome-menus = "3.13.3"
-PREFERRED_VERSION_gnome-online-accounts = "3.28.0"
-PREFERRED_VERSION_gnome-session = "3.27.92"
-PREFERRED_VERSION_gnome-settings-daemon = "3.28.0"
-PREFERRED_VERSION_gnome-shell = "3.28.0"
-# No recipe 
-PREFERRED_VERSION_gnome-system-monitor = "3.28.0"
-PREFERRED_VERSION_gnome-terminal = "3.28.0"
-# No recipe 
-PREFERRED_VERSION_gnome-themes-extra = "3.27.92"
-PREFERRED_VERSION_gsettings-desktop-schemas = "3.28.0"
-PREFERRED_VERSION_grilo = "0.3.4"
-PREFERRED_VERSION_libgee = "0.20.1"
-PREFERRED_VERSION_libgtop = "2.38.0"
-PREFERRED_VERSION_libgweather = "3.28.0"
-PREFERRED_VERSION_modemmanager = "1.6.12"
-PREFERRED_VERSION_mutter = "3.28.0"
-PREFERRED_VERSION_nautilus = "3.28.0"
-PREFERRED_VERSION_networkmanager = "1.10.6"
-PREFERRED_VERSION_network-manager-applet = "1.8.10"
-PREFERRED_VERSION_pango = "1.42.0"
-PREFERRED_VERSION_rest = "0.8.1"
-PREFERRED_VERSION_tracker = "2.0.3"
-PREFERRED_VERSION_vte = "0.52.0"
-# Upgrade me
-#PREFERRED_VERSION_yelp-xsl = "3.28.0"
-#PREFERRED_VERSION_yelp-tools = "3.28.0"
-PREFERRED_VERSION_zenity = "3.28.0"
diff --git a/meta-gnome/conf/include/gnome-development-packages.inc b/meta-gnome/conf/include/gnome-development-packages.inc
deleted file mode 100644
index e923807..0000000
--- a/meta-gnome/conf/include/gnome-development-packages.inc
+++ /dev/null
@@ -1 +0,0 @@
-require gnome-3.28.0.inc
diff --git a/meta-gnome/conf/include/gnome-stable-packages.inc b/meta-gnome/conf/include/gnome-stable-packages.inc
deleted file mode 100644
index a34e541..0000000
--- a/meta-gnome/conf/include/gnome-stable-packages.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-require gnome-3.28.0.inc
-
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index 35e8a40..1602a8b 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -10,6 +10,3 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "meta-gnome"
 BBFILE_PATTERN_meta-gnome = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-gnome = "6"
-
-GNOME_RELEASE ?= "stable"
-require conf/include/gnome-${GNOME_RELEASE}-packages.inc