[gtk-osx] Fix a few random module errors.

[John Ralls <jralls src gnome org>]

commit 7fbf1548a31902d0bba7b8d480a523c6b9dbf050
Author: John Ralls <jralls ceridwen us>
Date:   Thu May 4 16:05:00 2017 -0700

    Fix a few random module errors.

 modulesets-stable/gtk-osx-random.modules   |    8 ++++----
 modulesets-stable/gtk-osx-themes.modules   |    5 +++--
 modulesets-unstable/gtk-osx-random.modules |    2 +-
 modulesets-unstable/gtk-osx-themes.modules |    4 ++--
 modulesets/gtk-osx-random.modules          |    5 ++---
 modulesets/gtk-osx-themes.modules          |    5 +++--
 6 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 8b95a5a..7cabf07 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -279,9 +279,9 @@ Libglade itself is deprecated. This is the last release. -->
     </after>
   </autotools>
 
-  <autotools id="hunspell" autogen-sh="configure">
-    <branch module="hunspell/hunspell/archive/v1.6.1.tar.gz" version="1.3.3"
-           repo="github-tarball"/>
+  <autotools id="hunspell" autogen-sh="autoreconf">
+    <branch module="hunspell/hunspell/archive/v1.6.1.tar.gz" version="1.6.1"
+           repo="github-tarball" checkoutdir="hunspell-1.6.1"/>
   </autotools>
 
   <autotools id="enchant" autogen-sh="configure"
@@ -307,7 +307,7 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
   <autotools id="gtkspell3" autogen-sh="configure">
-    <branch module="gtkspell/gtkspell3-3.0.9.tar.gz" repo="sourceforge"
+    <branch module="gtkspell/gtkspell3-3.0.9.tar.xz" repo="sourceforge"
             version="3.0.9">
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Enable-use-of-XDG_DATA_DIRS-for-locating-iso-code-fi.patch";
 strip="1"/>
     </branch>
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index 8d01448..3972fd2 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -96,8 +96,9 @@
       <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="meta-gtk-osx-gtk3"/>
+<!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
     </after>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index 1717667..3ff8b02 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -223,7 +223,7 @@
   </autotools>
 
   <autotools id="gtkspell3" autogen-sh="configure">
-    <branch module="gtkspell/gtkspell3-3.0.9.tar.gz" repo="sourceforge"
+    <branch module="gtkspell/gtkspell3-3.0.9.tar.xz" repo="sourceforge"
            version="3.0.9">
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Enable-use-of-XDG_DATA_DIRS-for-locating-iso-code-fi.patch";
 strip="1"/>
     </branch>
diff --git a/modulesets-unstable/gtk-osx-themes.modules b/modulesets-unstable/gtk-osx-themes.modules
index 03f41e2..bae804c 100644
--- a/modulesets-unstable/gtk-osx-themes.modules
+++ b/modulesets-unstable/gtk-osx-themes.modules
@@ -89,8 +89,8 @@ cgit    <after>
       <dep package="libcroco"/>
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
     </after>
   </autotools>
 
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 3cf5ee1..f1be42e 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -222,8 +222,7 @@
   </autotools>
 
   <autotools id="hunspell" >
-    <branch module="hunspell" version="1.3.2"
-           repo="hunspell-cvs"/>
+    <branch module="hunspell" tag="v1.6.1" repo="github"/>
   </autotools>
 
   <autotools id="enchant">
@@ -245,7 +244,7 @@
   </autotools>
 
   <autotools id="gtkspell3" autogen-sh="configure">
-    <branch module="gtkspell/gtkspell3-3.0.9.tar.gz" repo="sourceforge"
+    <branch module="gtkspell/gtkspell3-3.0.9.tar.xz" repo="sourceforge"
             version="3.0.9">
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Enable-use-of-XDG_DATA_DIRS-for-locating-iso-code-fi.patch";
 strip="1"/>
     </branch>
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index 3541aff..7aabcda 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -84,8 +84,9 @@
       <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
     <after>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="meta-gtk-osx-gtk3"/>
+<!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
+      <dep package="gtk+"/>
+      <dep package="gtk+-3.0"/>
     </after>
   </autotools>