[gtk-osx] Remove the special quartz branches from gtk+

[John Ralls <jralls src gnome org>]

commit d1b3867b0a6d62a63e8dac1929b3c4f506e77204
Author: John Ralls <jralls ceridwen us>
Date:   Sun Apr 22 15:29:40 2012 -0700

    Remove the special quartz branches from gtk+
    
    All of the important differences are either merged or obsolete.

 modulesets-unstable/gtk-osx.modules |    4 ++--
 modulesets/gtk-osx.modules          |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 98c3788..2bb9f3a 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -119,7 +119,7 @@
 
   <autotools id="gtk+"
 	     autogenargs="--with-gdktarget=quartz --enable-introspection=no --enable-quartz-relocation">
-    <branch revision="gtk-2-24-quartz" checkoutdir="gtk+-2.0"/>
+    <branch revision="gtk-2-24" checkoutdir="gtk+-2.0"/>
     <dependencies>
       <dep package="pango"/>
       <dep package="gdk-pixbuf"/>
@@ -132,7 +132,7 @@
 
   <autotools id="gtk+-3.0"
 	     autogenargs="--enable-quartz-backend --enable-quartz-relocation --disable-colord">
-    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="quartz-integration"/>
+    <branch module="gtk+" checkoutdir="gtk+-3.0"/>
     <dependencies>
       <dep package="gobject-introspection"/>
       <dep package="pango"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index a39714d..5827c9d 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -154,7 +154,7 @@
   </autotools>
 
   <autotools id="gtk+" autogenargs="--with-gdktarget=quartz --enable-introspection=no --enable-quartz-relocation">
-    <branch revision="gtk-2-24-quartz"/>
+    <branch revision="gtk-2-24"/>
     <dependencies>
       <dep package="pango"/>
       <dep package="atk"/>
@@ -167,7 +167,7 @@
 
   <autotools id="gtk+-3.0"
 	     autogenargs="--enable-quartz-backend --disable-colord  --enable-quartz-relocation">
-    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="quartz-integration"/>
+    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-2"/>
     <dependencies>
       <dep package="glib-gtk3"/>
       <dep package="pango-gtk3"/>