[jhbuild] 3.16: Make WebKit1 a system module

[Carlos Garcia Campos <carlosgc src gnome org>]

commit 7059619309f6d7b953110935dc707ab4c045e8e8
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Wed Oct 22 09:53:19 2014 +0200

    3.16: Make WebKit1 a system module
    
    WebKit1 is currently deprecated, no new changes will be introduced, so
    the versions provided by distros should be enough for modules still
    using it. This way we avoid having to build WebKit twice.

 modulesets/gnome-suites-core-deps-3.16.modules |   33 ------------------------
 modulesets/gnome-sysdeps-3.16.modules          |    5 +++
 2 files changed, 5 insertions(+), 33 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index 474d4ce..eaddbd2 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -1618,39 +1618,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="WebKit1" makefile="GNUmakefile"
-             autogenargs="--enable-introspection --disable-webkit2">
-    <pkg-config>webkitgtk-3.0.pc</pkg-config>
-    <branch repo="webkitgtk.org"
-            module="webkitgtk-2.4.6.tar.xz" version="2.4.6"
-            hash="sha256:6fef4aa8d4a2668e03ea15472a71396ea7b776bbe56ad9459a4124b823c11457"
-            size="9862200">
-    </branch>
-    <dependencies>
-      <dep package="at-spi2-core"/>
-      <dep package="cairo"/>
-      <dep package="fontconfig"/>
-      <dep package="geoclue"/>
-      <dep package="libxml2"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gtk+"/>
-      <dep package="pango"/>
-      <dep package="libsoup"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gperf"/>
-      <dep package="libicu"/>
-      <dep package="libXt"/>
-      <dep package="ruby"/>
-      <dep package="libsecret"/>
-      <dep package="libwebp"/>
-    </dependencies>
-    <suggests>
-      <dep package="libxslt"/>
-      <dep package="sqlite3"/>
-      <dep package="enchant"/>
-    </suggests>
-  </autotools>
-
   <autotools id="zeitgeist">
     <branch repo="git.freedesktop.org"
             module="zeitgeist/zeitgeist"
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index bd353b3..fcb68b8 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -898,4 +898,9 @@
     <branch repo="system" version="2.3.0"/>
     <pkg-config>lttng-ust.pc</pkg-config>
   </systemmodule>
+
+  <systemmodule id="WebKit1">
+    <pkg-config>webkitgtk-3.0.pc</pkg-config>
+    <branch repo="system" version="2.4.6"/>
+  </systemmodule>
 </moduleset>