[jhbuild] 3.14: add back proper dependencies on gnome-icon-theme, and the module

[Frederic Peters <fpeters src gnome org>]

commit a8827936cf7331b1daf2a3f78ce8e0a9c9ad1e4f
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat Apr 26 10:49:25 2014 +0200

    3.14: add back proper dependencies on gnome-icon-theme, and the module
    
    Several modules do still declare dependencies on gnome-icon-theme (not
    adwaita-icon-theme) in their configure.ac. To make them build (that's the
    purpose of jhbuild) we need to checkout an older gnome-icon-theme, and
    restore the dependencies to mention gnome-icon-theme, not adwaita-icon-theme.

 modulesets/gnome-apps-3.14.modules        |    4 ++--
 modulesets/gnome-suites-core-3.14.modules |   19 +++++++++++++++----
 modulesets/gnome-world-3.14.modules       |    6 +++---
 3 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.14.modules b/modulesets/gnome-apps-3.14.modules
index 4553396..87080d1 100644
--- a/modulesets/gnome-apps-3.14.modules
+++ b/modulesets/gnome-apps-3.14.modules
@@ -140,7 +140,7 @@
       <dep package="enchant"/>
       <dep package="iso-codes"/>
       <dep package="libsoup"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-icon-theme"/>
     </dependencies>
   </autotools>
 
@@ -506,7 +506,7 @@
       <dep package="bogofilter"/>
       <dep package="evolution-data-server"/>
       <dep package="gnome-desktop"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-icon-theme"/>
       <dep package="gnome-online-accounts"/>
       <dep package="gstreamer"/>
       <dep package="gtk+"/>
diff --git a/modulesets/gnome-suites-core-3.14.modules b/modulesets/gnome-suites-core-3.14.modules
index 4c09533..a1122a9 100644
--- a/modulesets/gnome-suites-core-3.14.modules
+++ b/modulesets/gnome-suites-core-3.14.modules
@@ -194,6 +194,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-icon-theme">
+    <branch repo="git.gnome.org" module="adwaita-icon-theme" revision="gnome-3-12"/>
+    <dependencies>
+      <dep package="hicolor-icon-theme"/>
+      <dep package="icon-naming-utils"/>
+      <dep package="gnome-common"/>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-icon-theme-extras">
     <branch/>
     <dependencies>
@@ -551,7 +562,7 @@
       <dep package="gdk-pixbuf"/>
       <dep package="gtk+"/>
       <dep package="gnome-desktop"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-icon-theme"/>
       <dep package="gobject-introspection"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="libjpeg"/>
@@ -599,7 +610,7 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="libxml2"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-icon-theme"/>
       <dep package="libsecret"/>
       <dep package="poppler"/>
       <dep package="nautilus"/>
@@ -704,7 +715,7 @@
       <dep package="libwnck"/>
       <dep package="libgtop"/>
       <dep package="gtk+"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-icon-theme"/>
       <dep package="gtkmm"/>
       <dep package="libxml2"/>
       <dep package="librsvg"/>
@@ -792,7 +803,7 @@
       <dep package="clutter-gtk"/>
       <dep package="gdk-pixbuf"/>
       <dep package="glib"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-icon-theme"/>
       <dep package="grilo"/>
       <dep package="grilo-plugins"/>
       <dep package="gsettings-desktop-schemas"/>
diff --git a/modulesets/gnome-world-3.14.modules b/modulesets/gnome-world-3.14.modules
index 5d9ae38..ad8334e 100644
--- a/modulesets/gnome-world-3.14.modules
+++ b/modulesets/gnome-world-3.14.modules
@@ -1283,7 +1283,7 @@
     <dependencies>
       <dep package="gupnp"/>
       <dep package="gtk+-2"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-icon-theme"/>
     </dependencies>
   </autotools>
 
@@ -2225,7 +2225,7 @@
       <dep package="intltool"/>
       <dep package="libgnomeprint"/>
       <dep package="gtk+-2"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-icon-theme"/>
     </dependencies>
   </autotools>
 
@@ -2696,7 +2696,7 @@
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
       <dep package="pygobject2"/>
-      <dep package="adwaita-icon-theme"/>
+      <dep package="gnome-icon-theme"/>
       <dep package="libxml2"/>
       <dep package="polkit"/>
       <dep package="NetworkManager"/>