[jhbuild] 3.24: Remove WebKit1 and dependencies

[Michael Catanzaro <mcatanzaro src gnome org>]

commit e7a0a10a43e1ba8ee3d9c7d48e838599705d68d3
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Nov 8 07:39:15 2016 -0600

    3.24: Remove WebKit1 and dependencies
    
    I'm removing Empathy since the latest tarball still depends on
    clutter-gst2 and it doesn't pass distcheck for reasons I don't
    understand when trying to release it.
    
    Since Empathy is the last module outside unsupported world that depends
    on WebKit1, that means we can remove it at long last.
    
    Note this means Geary gets removed as fallout. Geary should really be
    added to gnome-apps, it doesn't deserve to be relegated to -world, but
    that cannot happen until it moves to WebKit2.

 modulesets/gnome-apps-3.24.modules    |   26 +++++++++++++++-
 modulesets/gnome-sysdeps-3.24.modules |    5 ---
 modulesets/gnome-world.modules        |   53 ++-------------------------------
 3 files changed, 28 insertions(+), 56 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.24.modules b/modulesets/gnome-apps-3.24.modules
index af907cd..9b42199 100644
--- a/modulesets/gnome-apps-3.24.modules
+++ b/modulesets/gnome-apps-3.24.modules
@@ -227,6 +227,24 @@
     </dependencies>
   </autotools>
 
+<!--
+  Temporarily removed until it no longer depends on WebKit1,
+
+  <autotools id="bijiben">
+    <branch/>
+    <dependencies>
+      <dep package="appstream-glib"/>
+      <dep package="tracker"/>
+      <dep package="clutter-gtk"/>
+      <dep package="gtk+-3"/>
+      <dep package="libxml2"/>
+      <dep package="glib"/>
+      <dep package="WebKit1"/>
+      <dep package="evolution-data-server"/>
+    </dependencies>
+  </autotools>
+-->
+
   <autotools id="dconf-editor">
     <branch/>
     <dependencies>
@@ -249,6 +267,10 @@
     </dependencies>
   </autotools>
 
+<!--
+  Temporarily removed until it no longer depends on WebKit1, and until the
+  latest tarball release no longer depends on clutter-gst2.
+
   <autotools id="empathy" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
@@ -291,6 +313,7 @@
       </if>
     </suggests>
   </autotools>
+-->
 
   <cmake id="evolution"
          cmakeargs="-DENABLE_LIBCRYPTUI=OFF -DENABLE_PST_IMPORT=OFF">
@@ -784,7 +807,7 @@
       <dep package="accerciser"/>
       <dep package="dconf-editor"/>
       <dep package="devhelp"/>
-      <dep package="empathy"/>
+      <!-- <dep package="empathy"/> -->
       <dep package="evolution"/>
       <dep package="ghex"/>
       <dep package="gitg"/>
@@ -810,6 +833,7 @@
   -->
   <metamodule id="meta-gnome-core-incubator">
     <dependencies>
+      <!-- <dep package="bijiben"/> -->
       <dep package="gnome-dictionary"/>
       <dep package="gnome-music"/>
       <dep package="seahorse"/>
diff --git a/modulesets/gnome-sysdeps-3.24.modules b/modulesets/gnome-sysdeps-3.24.modules
index 97a1631..53010f5 100644
--- a/modulesets/gnome-sysdeps-3.24.modules
+++ b/modulesets/gnome-sysdeps-3.24.modules
@@ -1202,11 +1202,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="WebKit1">
-    <pkg-config>webkitgtk-3.0.pc</pkg-config>
-    <branch repo="system" version="2.0.0"/>
-  </systemmodule>
-
   <systemmodule id="xmlcatalog">
     <branch repo="system"/>
     <systemdependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 8ac73cf..4b0a0c3 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -234,23 +234,6 @@
     </suggests>
   </autotools>
 
-  <cmake id="geary">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gmime"/>
-      <dep package="gnome-keyring"/>
-      <dep package="gtk+-3"/>
-      <dep package="libcanberra"/>
-      <dep package="libgee"/>
-      <dep package="libnotify"/>
-      <dep package="libunique"/>
-      <dep package="sqlite3"/>
-      <dep package="vala"/>
-      <dep package="WebKit1"/>
-    </dependencies>
-  </cmake>
-
   <autotools id="corebird">
     <branch repo="github.com" checkoutdir="corebird" module="baedert/corebird.git"/>
     <dependencies>
@@ -1968,7 +1951,7 @@
       <dep package="libxslt"/>
       <dep package="sqlite3"/>
       <dep package="libsoup"/>
-      <dep package="WebKit1"/>
+      <dep package="WebKit"/>
       <dep package="json-glib"/>
       <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -2031,21 +2014,6 @@
 
   <!-- ########## End of Pimplico Modules ########## -->
 
-  <autotools id="midori">
-    <branch repo="git.xfce.org" branch="kalikiana/midori"/>
-    <dependencies>
-      <dep package="gtk+-2"/>
-      <dep package="WebKit1"/>
-      <dep package="libsoup"/>
-      <dep package="libxml2"/>
-    </dependencies>
-    <suggests>
-      <dep package="libunique-1"/>
-      <dep package="libnotify"/>
-      <dep package="sqlite3"/>
-    </suggests>
-  </autotools>
-
   <autotools id="librsvgmm">
     <branch/>
     <dependencies>
@@ -3115,7 +3083,6 @@
       <dep package="libdmapsharing"/>
       <dep package="libgnome-keyring"/>
       <dep package="vala"/>
-      <dep package="WebKit1"/>
     </suggests>
   </autotools>
 
@@ -3228,11 +3195,11 @@
     </suggests>
   </autotools>
 
-  <autotools id="seed" autogenargs="--with-webkit=3.0">
+  <autotools id="seed" autogenargs="--with-webkit=4.0">
     <branch/>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="WebKit1"/>
+      <dep package="WebKit"/>
       <dep package="gnome-js-common"/>
       <dep package="mpfr"/>
       <dep package="readline"/>
@@ -3400,18 +3367,4 @@
     </dependencies>
   </autotools>
 
-  <autotools id="bijiben">
-    <branch/>
-    <dependencies>
-      <dep package="appstream-glib"/>
-      <dep package="tracker"/>
-      <dep package="clutter-gtk"/>
-      <dep package="gtk+-3"/>
-      <dep package="libxml2"/>
-      <dep package="glib"/>
-      <dep package="WebKit1"/>
-      <dep package="evolution-data-server"/>
-    </dependencies>
-  </autotools>
-
 </moduleset>