[gtk-osx] Update dbus-glib, uncomment gconf's dependency on it

[John Ralls <jralls src gnome org>]

commit 6fb1e599dceb472e3986dc7ea9a118a7bfb9d49f
Author: John Ralls <jralls ceridwen us>
Date:   Sun Nov 11 09:02:27 2012 -0800

    Update dbus-glib, uncomment gconf's dependency on it
    
    
    Seems they changed their minds about glib-dbus.

 modulesets-stable/gtk-osx-random.modules |    9 ++-------
 modulesets/gtk-osx-random.modules        |    5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index d7617b8..29fd22e 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -214,7 +214,7 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 <!-- NB: dbus support is now built into glib -->
   <autotools id="dbus-glib" autogenargs="--disable-selinux">
-    <branch module="dbus-glib/dbus-glib-0.92.tar.gz"   version="0.92"
+    <branch module="dbus-glib/dbus-glib-0.100.tar.gz"   version="0.100"
 	    repo="dbus.freedesktop.org"/>
     <dependencies>
       <dep package="dbus"/>
@@ -229,16 +229,11 @@ Libglade itself is deprecated. This is the last release. -->
        which is available only through svn or from Linux distros -->
   <autotools id="gconf" autogen-sh="configure"
 	     autogenargs="--disable-defaults-service">
-     <!--branch module="GConf/2.28/GConf-2.28.0.tar.bz2" version="2.28.0"
-	     hash="sha256:d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8">
-      <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/GConf-3.2.5.tar.xz" version="3.2.5"
             hash="sha256:4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6"/>
     <dependencies>
       <dep package="ORBit2"/>
-      <!--dep package="dbus-glib"/-->
+      <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 195edb4..f9b8b5d 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -178,7 +178,7 @@
 
   <autotools id="dbus-glib" autogenargs="--disable-selinux">
     <branch repo="git.freedesktop.org" module="dbus/dbus-glib"
-            tag="dbus-glib-0.92"/>
+            tag="dbus-glib-0.100"/>
     <dependencies>
       <dep package="dbus"/>
     </dependencies>
@@ -190,9 +190,8 @@
 
   <!-- Note: -disable-defaults-service removes dependency on "PolicyKit"
        which is available only through svn or from Linux distros -->
-<!-- Pegged at 2-28 until gdbus is fixed for OSX -->
   <autotools id="gconf" autogenargs="--disable-defaults-service">
-    <branch revision="gnome-2-28"/>
+    <branch />
     <dependencies>
       <dep package="ORBit2"/>
       <dep package="dbus-glib"/>