[gtk-osx: 8/17] Update DevHelp

[John Ralls <jralls src gnome org>]

commit c4ee7bf2d5fdb0364a99154d3ccf9a444839d94e
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Jun 27 15:20:35 2015 -0700

    Update DevHelp
    
    Now that we have webkit2gtk3, we can build a more recent DevHelp: the
    latest from the 3.16 series.

 modulesets-stable/gtk-osx-random.modules   |    7 +++----
 modulesets-unstable/gtk-osx-random.modules |    4 +---
 modulesets/gtk-osx-random.modules          |   12 +++---------
 3 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 65072b2..ba38fb5 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -118,17 +118,16 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
-  <!-- 3.8 is the last version to support WebKit1 -->
   <autotools id="devhelp-gtk3" autogen-sh="configure">
-    <branch module="devhelp/3.8/devhelp-3.8.2.tar.xz" version="3.8.2"
-            hash="sha256:a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7"/>
+    <branch module="devhelp/3.16/devhelp-3.16.1.tar.xz" version="3.16.1"
+            hash="sha256:673c34e6851c2848e6257da8de5edc222d41e1dbf110501bd29d7f6810f41345"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
       <dep package="meta-gtk-osx-gtk3"/>
     </after>
     <dependencies>
-      <dep package="webkit1gtk3"/>
+      <dep package="webkit2gtk3"/>
       <dep package="gsettings-desktop-schemas"/>
       <!-- Without shared-mime-info, HTML documents display as plain text -->
       <dep package="shared-mime-info"/>
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index 3d72ebc..a99ee4d 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -97,8 +97,6 @@
     </dependencies>
   </autotools>
 
-  <!-- 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>
@@ -107,7 +105,7 @@
       <dep package="meta-gtk-osx-core"/>
     </after>
     <dependencies>
-      <dep package="webkit1gtk3"/>
+      <dep package="webkit2gtk3"/>
       <dep package="gsettings-desktop-schemas"/>
       <!-- Without shared-mime-info, HTML documents display as plain text -->
       <dep package="shared-mime-info"/>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index afb533e..69c26b4 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -106,21 +106,15 @@
     </dependencies>
   </autotools>
 
-  <!-- 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"/>
+  <autotools id="devhelp-gtk3">
+    <branch module="devhelp" revision="gnome-3-16"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
       <dep package="meta-gtk-osx-gtk3"/>
     </after>
     <dependencies>
-      <dep package="webkit1gtk3"/>
+      <dep package="webkit2gtk3"/>
       <dep package="gsettings-desktop-schemas"/>
       <!-- Without shared-mime-info, HTML documents display as plain text -->
       <dep package="shared-mime-info"/>