[jhbuild] Move gtk+-2 to gnome-world

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 6ae03b0e9eefc1bbb9a12eff7def49e964d34c25
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Jun 16 22:51:54 2016 -0500

    Move gtk+-2 to gnome-world
    
    Its only dependency is WebKit, which only needs it for the optional GTK+
    2 plugin process, which is only useful for Flash.

 modulesets/gnome-suites-core-deps-3.22.modules |   23 +----------------------
 modulesets/gnome-world.modules                 |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 22 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index c1a8a64..9b63967 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -666,25 +666,6 @@
     </suggests>
   </autotools>
 
-  <!-- Deprecated -->
-  <autotools id="gtk+-2">
-    <if condition-set="quartz">
-      <autogenargs value="--with-backend=quartz"/>
-    </if>
-    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gobject-introspection"/>
-    </dependencies>
-    <suggests>
-      <dep package="shared-mime-info"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gtk-doc">
     <branch/>
     <dependencies>
@@ -1541,7 +1522,7 @@
     </dependencies>
   </autotools>
 
-  <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
+  <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release -DENABLE_PLUGIN_PROCESS_GTK2=OFF">
     <if condition-unset="x11">
       <cmakeargs value="-DENABLE_X11_TARGET=OFF"/>
     </if>
@@ -1566,8 +1547,6 @@
       <dep package="gperf"/>
       <dep package="gst-plugins-base"/>
       <dep package="gtk+"/>
-      <!-- GTK+ 2.x required for the plugin process -->
-      <dep package="gtk+-2"/>
       <dep package="harfbuzz"/>
       <dep package="hyphen"/>
       <dep package="libicu"/>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 191e0d7..ab112ea 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3347,4 +3347,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtk+-2">
+    <if condition-set="quartz">
+      <autogenargs value="--with-backend=quartz"/>
+    </if>
+    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+      <dep package="pango"/>
+      <dep package="atk"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="gobject-introspection"/>
+    </dependencies>
+    <suggests>
+      <dep package="shared-mime-info"/>
+    </suggests>
+  </autotools>
+
 </moduleset>