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

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 862cfc1069001405713eed90b33055247ccf5b70
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Jun 18 19:33:40 2016 -0500

    Revert "Move gtk+-2 to gnome-world"
    
    This reverts commit 6ae03b0e9eefc1bbb9a12eff7def49e964d34c25.
    
    gnome-themes-standard still wants it

 modulesets/gnome-suites-core-deps-3.22.modules |   23 ++++++++++++++++++++++-
 modulesets/gnome-world.modules                 |   18 ------------------
 2 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index 7c50b13..257843d 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -665,6 +665,25 @@
     </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>
@@ -1521,7 +1540,7 @@
     </dependencies>
   </autotools>
 
-  <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release -DENABLE_PLUGIN_PROCESS_GTK2=OFF">
+  <cmake id="WebKit" cmakeargs="-DPORT=GTK -DCMAKE_BUILD_TYPE=Release">
     <if condition-unset="x11">
       <cmakeargs value="-DENABLE_X11_TARGET=OFF"/>
     </if>
@@ -1546,6 +1565,8 @@
       <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 ab112ea..191e0d7 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3347,22 +3347,4 @@
     </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>