[gtk-osx] Build DevHelp

[John Ralls <jralls src gnome org>]

commit 5c6ec32193552810df753fe269b5ea8f4c969acb
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Apr 17 23:16:29 2015 -0700

    Build DevHelp
    
    DevHelp is a really nice tool to have available, so let's get it to
    build! The latest version depends on WebKit2 (the webkit2gtk3 module
    which doesn't work yet) so first of all we have to pin it to the last
    version that supported WebKit1 (module name webkit1gtk3).
    
    In addition, there are some M4 macros in that version that aren't
    properly set up, so building from Git is broken. That means that we use
    the tarball on modulesets as well.
    
    It requires gsettings-desktop-schemas, for which we add a module.
    
    Also, it will build without shared-mime-info, but then the doc pages
    will display as HTML source code, rather than HTML. So effectively,
    shared-mime-info is a dependency as well.

 modulesets-stable/gtk-osx-random.modules   |   24 +++++++++++++++++-------
 modulesets-unstable/gtk-osx-random.modules |   19 +++++++++++++------
 modulesets/gtk-osx-random.modules          |   25 ++++++++++++++++++++-----
 3 files changed, 50 insertions(+), 18 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 0149fa7..549914a 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -118,20 +118,20 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
-<!-- Devhelp-gtk3 depends upon Webkit for Gtk3, something that I
-     haven't gotten to build yet. If you want to give it a try, you'll
-     be using WebKit-svn, which is enormous and difficult. Good
-     Luck. -->
+  <!-- 3.8 is the last version to support WebKit1 -->
   <autotools id="devhelp-gtk3" autogen-sh="configure">
-    <branch module="devhelp/3.6/devhelp-3.6.0.tar.xz" version="3.6.0"
-            hash="sha256:bf0576d5d70496367ccb22be53be620bbfe341bd491c1d725cfb59d566769fe1"/>
+    <branch module="devhelp/3.8/devhelp-3.8.2.tar.xz" version="3.8.2"
+            hash="sha256:a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
       <dep package="meta-gtk-osx-gtk3"/>
     </after>
     <dependencies>
-      <dep package="WebKit-svn"/>
+      <dep package="webkit1gtk3"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <!-- Without shared-mime-info, HTML documents display as plain text -->
+      <dep package="shared-mime-info"/>
     </dependencies>
   </autotools>
 
@@ -278,6 +278,16 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
+  <autotools id="gsettings-desktop-schemas" autogen-sh="configure"
+             autogenargs="--enable-introspection=yes">
+    <branch module="gsettings-desktop-schemas/3.16/gsettings-desktop-schemas-3.16.1.tar.xz"
+            version="3.16.1"
+            hash="sha256:74fe9fdad510c8a6666febeceb7ebafc581ef990b3afcc8c1e8b5d90b24b3461"/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gimp"  autogen-sh="autoreconf"
              autogenargs="--disable-python --without-x --without-dbus
                          --without-gnomevfs --without-wmf --enable-binreloc "
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index d56592a..08975b4 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -97,10 +97,8 @@
     </dependencies>
   </autotools>
 
-  <!-- Devhelp is another Richard Hult/Imendio project. It seems to be
-       actively maintained by others, but no one may get around to
-       doing a formal release, so if you're using this it probably
-       will pay to override the revision. -->
+  <!-- Devhelp 3.8 is the last release to use the WebKit1 API, so you probably
+       need to override the revision. -->
   <autotools id="devhelp">
     <branch />
     <after>
@@ -109,8 +107,10 @@
       <dep package="meta-gtk-osx-core"/>
     </after>
     <dependencies>
-      <dep package="WebKit"/>
-      <dep package="libglade"/>
+      <dep package="webkit1gtk3"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <!-- Without shared-mime-info, HTML documents display as plain text -->
+      <dep package="shared-mime-info"/>
     </dependencies>
   </autotools>
 
@@ -206,6 +206,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gsettings-desktop-schemas" autogenargs="--enable-introspection=yes">
+    <branch/>
+    <dependencies>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <cmake id="exiv2" supports-non-srcdir-builds="no">
     <branch repo="exiv2.org" module="svn">
     </branch>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index f28d75e..9b4f3ab 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -106,16 +106,24 @@
     </dependencies>
   </autotools>
 
-  <autotools id="devhelp-gtk3">
-    <branch tag="gnome-3-6" module="devhelp"/>
+  <!-- 3.8 is the last version to support WebKit1. Building from git is broken
+  on 3.8, due to some libgd macros, so we grab the last tarball release. -->
+  <autotools id="devhelp-gtk3" autogen-sh="configure"
+             autogenargs="--without-webkit2">
+    <!--branch tag="gnome-3-16" module="devhelp"/-->
+    <branch repo="ftp.gnome.org" module="devhelp/3.8/devhelp-3.8.2.tar.xz"
+            version="3.8.2"
+            hash="sha256:a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk3"/>
     </after>
     <dependencies>
-      <dep package="gtk+-3.0"/>
-      <dep package="WebKit"/>
+      <dep package="webkit1gtk3"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <!-- Without shared-mime-info, HTML documents display as plain text -->
+      <dep package="shared-mime-info"/>
     </dependencies>
   </autotools>
 
@@ -220,6 +228,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gsettings-desktop-schemas" autogenargs="--enable-introspection=yes">
+    <branch revision="master"/>  <!-- no gnome-3-16 branch yet -->
+    <dependencies>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gimp"
              autogenargs="--disable-python --disable-print --without-x
                           --without-dbus --without-gnomevfs4echo  --without-wmf"