Drop gnome-desktop3 providers

* gnome-desktop3 name was left from gnome2 times
* RPROVIDES was broken: Both gnome-desktop and libgnome-desktop were added to
  RPROVIDES. This caused images with missing gnome-desktop

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

9 files changed, 8 insertions, 12 deletions

diff --git a/meta-gnome/recipes-gnome/evince/evince_41.3.bb b/meta-gnome/recipes-gnome/evince/evince_41.3.bb
index e9e1e17463..3464bd11e7 100644
--- a/meta-gnome/recipes-gnome/evince/evince_41.3.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_41.3.bb
@@ -14,7 +14,7 @@ DEPENDS = " \
     orc \
     adwaita-icon-theme \
     libhandy \
-    ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop','',d)} \
 "
 
 GNOMEBASEBUILDCLASS = "meson"
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb
index 566ae21b42..3085d2767e 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb
@@ -36,7 +36,3 @@ FILES:libgnome-desktop = " \
 "
 
 RRECOMMENDS:libgnome-desktop += "gsettings-desktop-schemas"
-
-PROVIDES += "gnome-desktop3"
-RPROVIDES:${PN} += "gnome-desktop3"
-RPROVIDES:libgnome-desktop += "gnome-desktop3"
diff --git a/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb b/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb
index 0c2e341ff7..3f47de6f29 100644
--- a/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb
@@ -13,7 +13,7 @@ DEPENDS += " \
     polkit \
     metacity \
     gdm \
-    gnome-desktop3 \
+    gnome-desktop \
     gnome-bluetooth \
     gnome-panel \
 "
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb
index 4322e6a2dd..7afdefda11 100644
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb
@@ -6,7 +6,7 @@ SECTION = "x11/gnome"
 
 DEPENDS = " \
     gtk+3 \
-    gnome-desktop3 \
+    gnome-desktop \
     libhandy \
 "
 
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.38.0.bb
index 0e2a5395f9..1a3c20fbc0 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.38.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.38.0.bb
@@ -13,7 +13,7 @@ DEPENDS += " \
     dconf \
     libgweather \
     gnome-menus3 \
-    gnome-desktop3 \
+    gnome-desktop \
     gdm \
 "
 
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb
index 82504a4068..2851ccfd9a 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb
@@ -10,7 +10,7 @@ DEPENDS = " \
     colord \
     geocode-glib \
     gcr \
-    gnome-desktop3 \
+    gnome-desktop \
     libgweather \
     lcms \
     libcanberra \
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb b/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb
index cb4e026868..19dad21380 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb
@@ -13,7 +13,7 @@ DEPENDS = " \
     pango \
     gsettings-desktop-schemas \
     json-glib \
-    gnome-desktop3 \
+    gnome-desktop \
     gnome-settings-daemon \
     libxtst \
     libxkbfile \
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb
index 831d7491d4..c64d49b0ba 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_41.1.bb
@@ -9,7 +9,7 @@ GNOMEBASEBUILDCLASS = "meson"
 DEPENDS = " \
     fontconfig \
     gtk+3 \
-    gnome-desktop3 \
+    gnome-desktop \
     gsettings-desktop-schemas \
     gnome-autoar \
     tracker \
diff --git a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb
index 95ef6901f1..abf1d24c3f 100644
--- a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb
+++ b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb
@@ -13,7 +13,7 @@ RDEPENDS:${PN} = " \
     gnome-backgrounds \
     gnome-bluetooth \
     gnome-control-center \
-    gnome-desktop3 \
+    gnome-desktop \
     gnome-flashback \
     gnome-keyring \
     gnome-menus3 \