[gtk-osx] Move adwaita-icon-theme into gtk-osx.modules, add to meta-gtk-osx-gtk3.

[John Ralls <jralls src gnome org>]

commit 28047a21842eb08d7de2ebc5782d0e2bc14ce7ce
Author: John Ralls <jralls ceridwen us>
Date:   Sun May 10 16:27:17 2020 -0700

    Move adwaita-icon-theme into gtk-osx.modules, add to meta-gtk-osx-gtk3.
    
    Because gtk doesn't look very good without icons.
    
    Also remove the obsolete module gnome-extra-themes. Adwaita no longer
    depends on icon-naming-tools or hicolor-icon-theme.
    
    The remaining contents of gtk-osx-themes.modules are no longer
    maintained but they're retained for those projects that still use
    Gtk+-2.

 modulesets-stable/gtk-osx-themes.modules   | 41 ------------------------------
 modulesets-stable/gtk-osx.modules          | 35 ++++++++++++++++++++++++-
 modulesets-unstable/gtk-osx-themes.modules | 34 -------------------------
 modulesets-unstable/gtk-osx.modules        | 26 +++++++++++++++++++
 modulesets/gtk-osx-themes.modules          | 37 ---------------------------
 modulesets/gtk-osx.modules                 | 28 ++++++++++++++++++++
 6 files changed, 88 insertions(+), 113 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index ae5c6c8..fea6380 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -24,13 +24,6 @@
     </dependencies>
   </metamodule>
 
-  <metamodule id="meta-gtk-osx-gtk3-core-themes">
-    <dependencies>
-      <dep package="icon-naming-utils"/>
-      <dep package="adwaita-icon-theme"/>
-    </dependencies>
-  </metamodule>
-
   <autotools id="icon-naming-utils" autogen-sh="configure">
     <branch repo="tango.freedesktop.org"  version="0.8.90"
             module="icon-naming-utils-0.8.90.tar.bz2"
@@ -51,16 +44,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="adwaita-icon-theme" autogen-sh="configure">
-    <branch module="adwaita-icon-theme/3.32/adwaita-icon-theme-3.32.0.tar.xz"
-            version="3.32.0" hash="sha256:698db6e407bb987baec736c6a30216dfc0317e3ca2403c7adf3a5aa46c193286"/>
-    <dependencies>
-      <dep package="librsvg"/>
-      <dep package="hicolor-icon-theme"/>
-      <dep package="icon-naming-utils"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtk-engines" autogen-sh="configure">
     <branch module="gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"
             version="2.20.2" hash="sha256:15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"/>
@@ -74,28 +57,4 @@
            hash="sha256:e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912"/>
   </autotools>
 
-  <!-- librsvg is converting to the Rust language. This requires
-       substantial infrastructure that's resistant to installing with
-       jhbuild, so we'll freeze at the 2.40 branch. -->
-  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
-    <branch module="librsvg/2.40/librsvg-2.40.17.tar.xz" version="2.40.17"
-           hash="sha256:e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc"/>
-    <dependencies>
-      <dep package="libcroco"/>
-      <dep package="meta-gtk-osx-freetype"/>
-    </dependencies>
-    <after>
-<!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
-      <dep package="gtk+"/>
-      <dep package="gtk+-3.0"/>
-      <dep package="gtk+-3.14"/>
-    </after>
-  </autotools>
-
-  <autotools id="libcroco" autogenargs="--disable-Bsymbolic"
-            autogen-sh="configure">
-    <branch module="libcroco/0.6/libcroco-0.6.13.tar.xz" version="0.6.13"
-           hash="sha256:767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"/>
-  </autotools>
- 
 </moduleset>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 5752584..c265d8c 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -67,6 +67,7 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
+      <dep package="adwaita-icon-theme"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -77,7 +78,7 @@
     <dependencies>
       <dep package="gtk+-3.14"/>
       <dep package="gtk-mac-integration"/>
-      <dep package="meta-gtk-osx-gtk3-core-themes"/>
+      <dep package="adwaita-icon-theme"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -302,4 +303,36 @@
     </after>
   </autotools>
 
+    <autotools id="adwaita-icon-theme" autogen-sh="configure">
+    <branch module="adwaita-icon-theme/3.36/adwaita-icon-theme-3.36.1.tar.xz"
+            version="3.36.1" hash="sha256:e498518627044dfd7db7d79a5b3d437848caf1991ef4ef036a2d3a2ac2c1f14d"/>
+    <dependencies>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
+  <!-- librsvg is converting to the Rust language. This requires
+       substantial infrastructure that's resistant to installing with
+       jhbuild, so we'll freeze at the 2.40 branch. -->
+  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
+    <branch module="librsvg/2.40/librsvg-2.40.17.tar.xz" version="2.40.17"
+           hash="sha256:e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc"/>
+    <dependencies>
+      <dep package="libcroco"/>
+      <dep package="meta-gtk-osx-freetype"/>
+    </dependencies>
+    <after>
+<!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
+      <dep package="gtk+-3.14"/>
+    </after>
+  </autotools>
+
+  <autotools id="libcroco" autogenargs="--disable-Bsymbolic"
+            autogen-sh="configure">
+    <branch module="libcroco/0.6/libcroco-0.6.13.tar.xz" version="0.6.13"
+           hash="sha256:767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4"/>
+  </autotools>
+ 
 </moduleset>
diff --git a/modulesets-unstable/gtk-osx-themes.modules b/modulesets-unstable/gtk-osx-themes.modules
index a9f6430..cf09f69 100644
--- a/modulesets-unstable/gtk-osx-themes.modules
+++ b/modulesets-unstable/gtk-osx-themes.modules
@@ -40,22 +40,6 @@ cgit    <after>
     </dependencies>
   </autotools>
 
-  <autotools id="adwaita-icon-theme">
-    <branch />
-    <dependencies>
-      <dep package="librsvg"/>
-      <dep package="hicolor-icon-theme"/>
-      <dep package="icon-naming-utils"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-themes-extra">
-    <branch />
-    <dependencies>
-      <dep package="librsvg"/>
-    </dependencies>
-  </autotools>
-
   <!-- Master on gtk-engines got adjusted in the Gtk+-2.90 cycle to
        require Gtk+-3. Shortly thereafter engine based theming was
        dropped from Gtk+-3 in favor of CSS theming, so it doesn't
@@ -73,22 +57,4 @@ cgit    <after>
     <branch module="murrine"/>
   </autotools>
 
-  <!-- librsvg is converting to the Rust language. This requires
-       substantial infrastructure that's resistant to installing with
-       jhbuild, so we'll freeze at the 2.40 branch. -->
-  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
-    <branch module="librsvg" tag="librsvg-2-40"/>
-    <dependencies>
-      <dep package="libcroco"/>
-    </dependencies>
-    <after>
-      <dep package="gtk+"/>
-      <dep package="gtk+-3.0"/>
-    </after>
-  </autotools>
-
-  <autotools id="libcroco" autogenargs="--disable-Bsymbolic">
-    <branch/>
-  </autotools>
-
 </moduleset>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 104758e..e75fac1 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -60,6 +60,7 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
+      <dep package="adwaita-icon-theme"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -243,4 +244,29 @@
     </after>
   </autotools>
 
+  <autotools id="adwaita-icon-theme">
+    <branch />
+    <dependencies>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
+  <!-- librsvg is converting to the Rust language. This requires
+       substantial infrastructure that's resistant to installing with
+       jhbuild, so we'll freeze at the 2.40 branch. -->
+  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
+    <branch module="librsvg" tag="librsvg-2-40"/>
+    <dependencies>
+      <dep package="libcroco"/>
+    </dependencies>
+    <after>
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
+    </after>
+  </autotools>
+
+  <autotools id="libcroco" autogenargs="--disable-Bsymbolic">
+    <branch/>
+  </autotools>
+
 </moduleset>
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index e7ffb04..a031bd3 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -41,23 +41,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="adwaita-icon-theme">
-    <branch revision="gnome-3-30"/>
-    <dependencies>
-      <dep package="librsvg"/>
-      <dep package="hicolor-icon-theme"/>
-      <dep package="icon-naming-utils"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-themes-extra">
-    <branch revision="gnome-3-28"/> 
-    <dependencies>
-      <dep package="librsvg"/>
-      <dep package="adwaita-icon-theme"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtk-engines">
     <branch revision="gtk-engines-2-22" repo="archive.gnome.org"/>
     <after>
@@ -69,24 +52,4 @@
     <branch module="murrine"/>
   </autotools>
 
-  <!-- librsvg is converting to the Rust language. This requires
-       substantial infrastructure that's resistant to installing with
-       jhbuild, so we'll freeze at the 2.40 branch. -->
-  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
-    <branch module="librsvg" tag="librsvg-2-40"/>
-    <dependencies>
-      <dep package="libcroco"/>
-      <dep package="meta-gtk-osx-freetype"/>
-    </dependencies>
-    <after>
-<!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
-      <dep package="gtk+"/>
-      <dep package="gtk+-3.0"/>
-    </after>
-  </autotools>
-
-  <autotools id="libcroco" autogenargs="--disable-Bsymbolic">
-    <branch/>
-  </autotools>
-
 </moduleset>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 74ba368..9e938ac 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -60,6 +60,7 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
+      <dep package="adwaita-icon-theme"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -214,4 +215,31 @@
     </after>
   </autotools>
 
+  <autotools id="adwaita-icon-theme">
+    <branch revision="gnome-3-30"/>
+    <dependencies>
+      <dep package="librsvg"/>
+    </dependencies>
+  </autotools>
+
+  <!-- librsvg is converting to the Rust language. This requires
+       substantial infrastructure that's resistant to installing with
+       jhbuild, so we'll freeze at the 2.40 branch. -->
+  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
+    <branch module="librsvg" tag="librsvg-2-40"/>
+    <dependencies>
+      <dep package="libcroco"/>
+      <dep package="meta-gtk-osx-freetype"/>
+    </dependencies>
+    <after>
+<!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
+    </after>
+  </autotools>
+
+  <autotools id="libcroco" autogenargs="--disable-Bsymbolic">
+    <branch/>
+  </autotools>
+
 </moduleset>