[gtk-osx] Remove gtk3 themes, rename gnome-themes-standard to gnome-themes-extra.

[John Ralls <jralls src gnome org>]

commit 4d8eb2dac2fb69a5d5c0d1cef4d74a2a6e9fe922
Author: John Ralls <jralls ceridwen us>
Date:   Thu Mar 21 17:19:09 2019 -0700

    Remove gtk3 themes, rename gnome-themes-standard to gnome-themes-extra.
    
    Reflects incorporation of standard themes into gtk3.

 modulesets-stable/gtk-osx.modules          |  1 -
 modulesets-unstable/gtk-osx-themes.modules | 13 ++-----------
 modulesets-unstable/gtk-osx.modules        |  1 -
 modulesets/gtk-osx-themes.modules          | 11 ++---------
 modulesets/gtk-osx.modules                 |  1 -
 5 files changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index d37bc70..1481357 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -68,7 +68,6 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
-      <dep package="meta-gtk-osx-gtk3-core-themes"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
diff --git a/modulesets-unstable/gtk-osx-themes.modules b/modulesets-unstable/gtk-osx-themes.modules
index 5e37053..b11c964 100644
--- a/modulesets-unstable/gtk-osx-themes.modules
+++ b/modulesets-unstable/gtk-osx-themes.modules
@@ -11,20 +11,12 @@
   <metamodule id="meta-gtk-osx-themes">
     <dependencies>
       <dep package="tango-icon-theme"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-themes-extra"/>
       <dep package="icon-naming-utils"/>
       <dep package="gtk-engines"/>
     </dependencies>
   </metamodule>
 
-  <metamodule id="meta-gtk-osx-gtk3-core-themes">
-    <dependencies>
-      <dep package="icon-naming-utils"/>
-      <dep package="adwaita-icon-theme"/>
-      <dep package="gnome-themes-standard"/>
-    </dependencies>
-  </metamodule>
-
   <autotools id="icon-naming-utils" autogen-sh="configure" >
     <branch repo="freedesktop.org" module="gstreamer-sdk/icon-naming-utils" 
            revision="sdk-0.8.7"/>
@@ -55,11 +47,10 @@ cgit    <after>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-themes-standard" autogenargs='--disable-gtk2-engine'>
+  <autotools id="gnome-themes-extra">
     <branch />
     <dependencies>
       <dep package="librsvg"/>
-      <dep package="adwaita-icon-theme"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 53865c2..52379f5 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -59,7 +59,6 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
-      <dep package="meta-gtk-osx-gtk3-core-themes"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index d922849..9481cd2 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -13,18 +13,11 @@
       <dep package="tango-icon-theme"/>
       <dep package="adwaita-icon-theme"/>
       <dep package="icon-naming-utils"/>
+      <dep package="gnome-themes-extra"/>
       <dep package="gtk-engines"/>
     </dependencies>
   </metamodule>
 
-  <metamodule id="meta-gtk-osx-gtk3-core-themes">
-    <dependencies>
-      <dep package="icon-naming-utils"/>
-      <dep package="adwaita-icon-theme"/>
-      <dep package="gnome-themes-standard"/>
-    </dependencies>
-  </metamodule>
-
   <autotools id="icon-naming-utils" autogen-sh="configure" >
     <branch repo="freedesktop.org" module="gstreamer-sdk/icon-naming-utils" 
            revision="sdk-0.8.7"/>
@@ -55,7 +48,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-themes-standard" autogenargs="--disable-gtk2-engine">
+  <autotools id="gnome-themes-extra" autogenargs="--disable-gtk2-engine">
     <branch revision="gnome-3-22"/> 
     <dependencies>
       <dep package="librsvg"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 360bac7..1c51dbb 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -59,7 +59,6 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
-      <dep package="meta-gtk-osx-gtk3-core-themes"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>