[gtk-osx] Switch from gnome-doc-utils-fake to the real thing

[John Ralls <jralls src gnome org>]

commit a51e48d4f8d6e09612ba756f4d5c7cc2b3c99529
Author: John Ralls <jralls ceridwen us>
Date:   Mon Nov 7 18:05:53 2011 -0800

    Switch from gnome-doc-utils-fake to the real thing
    
    There's no benefit to the fake, and the real thing is maintained.

 modulesets-stable/gtk-osx-bootstrap.modules   |   20 +++++++++++---------
 modulesets-unstable/gtk-osx-bootstrap.modules |   16 +++++++++-------
 modulesets/gtk-osx-bootstrap.modules          |   18 +++++++++++-------
 3 files changed, 31 insertions(+), 23 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 05fbad6..b449622 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -70,18 +70,20 @@
 	     version="1.0"/>
   </autotools>
 
-  <!-- This is not gnome-doc-utils, it just contains smallest set of
-       files to make it possible to build packages that use
-       gnome-doc-utils, but with disable-scrollkeeper.
-  -->
-  <autotools id="gnome-doc-utils" >
-    <branch version="0.10.13-fake2" repo="sourceforge"
-	    module="gtk-osx/gnome-doc-utils-0.10.13-fake2.tar.gz"/>
+  <autotools id="gnome-common">
+    <branch module="gnome-common/2.34/gnome-common-2.34.0.tar.bz2" version="2.34.0"
+	    hash="sha256:7a9c4f9ab975501c36be3192aa61641abca045a215d519d7d00527706f1de1df"/>
+  </autotools>
+
+  <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper">
+    <branch module="gnome-doc-utils/0.20/gnome-doc-utils-0.20.6.tar.bz2" version="0.20.6"
+	    hash="sha256:091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf"/>
     <dependencies>
-      <dep package="gtk-osx-docbook"/>
+      <dep package="gnome-common"/>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
     </dependencies>
   </autotools>
-
   <!-- Expat could be skipped for >= 10.5 since it's is part of the SDK there. -->
   <autotools id="expat" autogen-sh="configure">
     <branch module="expat/expat-2.0.1.tar.gz" version="2.0.1"
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index f3f4600..00235a6 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -74,15 +74,17 @@
 	     version="1.0"/>
   </autotools>
 
-  <!-- This is not gnome-doc-utils, it just contains smallest set of
-       files to make it possible to build packages that use
-       gnome-doc-utils, but with disable-scrollkeeper.
-  -->
-  <autotools id="gnome-doc-utils" >
-    <branch version="0.10.13-fake2" repo="sourceforge"
-	    module="gtk-osx/gnome-doc-utils-0.10.13-fake2.tar.gz"/>
+  <autotools id="gnome-common">
+     <branch repo="git.gnome.org"/>
+  </autotools>
+
+  <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper" >
+    <branch repo="git.gnome.org"/>
     <dependencies>
       <dep package="gtk-osx-docbook"/>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
+      <dep package="gnome-common"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 6784d5c..5430c74 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -21,6 +21,8 @@
 	      href="http://www.cmake.org/files/"/>
   <repository type="tarball" name="xmlsoft.org"
 	      href="ftp://xmlsoft.org/libxml2/"/>
+  <repository type="git" name="git.gnome.org"
+              href="git://git.gnome.org/"/>
 
 <!-- Libpng-1.5 has made private struct definitions; gdk-pixbuf 2-23
      hasn't adjusted -->
@@ -70,15 +72,17 @@
 	     version="1.0"/>
   </autotools>
 
-  <!-- This is not gnome-doc-utils, it just contains smallest set of
-       files to make it possible to build packages that use
-       gnome-doc-utils, but with disable-scrollkeeper.
-  -->
-  <autotools id="gnome-doc-utils" >
-    <branch version="0.10.13-fake2" repo="sourceforge"
-	    module="gtk-osx/gnome-doc-utils-0.10.13-fake2.tar.gz"/>
+  <autotools id="gnome-common">
+     <branch repo="git.gnome.org"/>
+  </autotools>
+
+  <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper" >
+    <branch repo="git.gnome.org"/>
     <dependencies>
       <dep package="gtk-osx-docbook"/>
+      <dep package="libxslt"/>
+      <dep package="intltool"/>
+      <dep package="gnome-common"/>
     </dependencies>
   </autotools>