[gtk-osx] Fix up a few more oversights and errors

[John Ralls <jralls src gnome org>]

commit 9300cb486e8c9a7f2709b6797d8ab35d8047dc03
Author: John Ralls <jralls ceridwen us>
Date:   Sun Nov 4 13:37:27 2012 -0800

    Fix up a few more oversights and errors

 modulesets-stable/gtk-osx-random.modules |    7 ++-----
 modulesets-stable/gtk-osx-themes.modules |    2 +-
 modulesets/gtk-osx.modules               |    3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 4257870..26ecfd4 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -234,7 +234,7 @@ Libglade itself is deprecated. This is the last release. -->
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/GConf-characters.patch"; strip="1"/>
      </branch-->
 <!-- GConf-2.32 uses gdbus, which doesn't work for OSX -->
-	   <branch module="GConf/3.2.5/GConf-3.2.5.tar.xz" version="3.2.5"
+	   <branch module="GConf/3.2/GConf-3.2.5.tar.xz" version="3.2.5"
             hash="sha256:4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6"/>
     <dependencies>
       <dep package="ORBit2"/>
@@ -253,11 +253,8 @@ Libglade itself is deprecated. This is the last release. -->
             repo="hadess"/>
     <dependencies>
       <dep package="intltool"/>
-    </dependencies>
-    <after>
       <dep package="glib"/>
-      <dep package="glib-gtk3"/>
-    </after>
+    </dependencies>
   </autotools>
 
   <autotools id="gimp"  autogen-sh="configure"
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index cc997d0..633507f 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -43,7 +43,7 @@
   </autotools>
 
   <autotools id="gnome-icon-theme" autogen-sh="configure">
-    <branch module="gnome-icon-theme/3.6.0/gnome-icon-theme-3.6.0.tar.xz"
+    <branch module="gnome-icon-theme/3.6/gnome-icon-theme-3.6.0.tar.xz"
             version="3.6.0" hash="sha256:5fbeef50b1dea1551ec9a008a6ebda0977154ebc4625ee9328695ec2b82cf0eb"/>
     <dependencies>
       <dep package="hicolor-icon-theme"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 0e013e4..2793aca 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -111,10 +111,9 @@
   <autotools id="atk">
     <branch tag="ATK_2_6_0"/>
     <dependencies>
+      <dep package="glib"/>
     </dependencies>
     <after>
-      <dep package="glib"/>
-      <dep package="glib-gtk3"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>