GNOME.org
 

[gtk-osx] Update and rename gnome-icon-theme

commit 7c98aa7f43e111a803dd1d53fdb785bbbdb4b681
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Nov 20 22:30:00 2014 -0800

    Update and rename gnome-icon-theme
    
    The gnome-icon-theme, gnome-icon-theme-symbolic, and
    gnome-icon-theme-extras modules have all been combined into
    adwaita-icon-theme. It depends on librsvg for generating its symbolic
    icons.
    
    This also updates the module name in the framework build config files
    and the universal binaries module files, even though I don't believe
    those are currently supported.

 jhbuildrc-gtk-osx-cfw-10.4                  |    2 +-
 jhbuildrc-gtk-osx-cfw-10.4u                 |    4 +-
 jhbuildrc-gtk-osx-fw-10.4                   |    2 +-
 jhbuildrc-gtk-osx-fw-10.4-test              |    2 +-
 modulesets-stable/gtk-osx-themes.modules    |   29 ++++++--------------------
 modulesets-stable/gtk-osx-universal.modules |    2 +-
 modulesets-unstable/gtk-osx-themes.modules  |   23 ++++----------------
 modulesets/gtk-osx-themes.modules           |   25 +++++-----------------
 modulesets/gtk-osx-universal.modules        |    2 +-
 9 files changed, 25 insertions(+), 66 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx-cfw-10.4 b/jhbuildrc-gtk-osx-cfw-10.4
index d6e7ca1..9229dc0 100644
--- a/jhbuildrc-gtk-osx-cfw-10.4
+++ b/jhbuildrc-gtk-osx-cfw-10.4
@@ -48,7 +48,7 @@ skip.append("gtk-quartz-engine")
 skip.append("gtk-engines")
 skip.append("libglade")
 skip.append("loudmouth")
-skip.append("gnome-icon-theme")
+skip.append("adwaita-icon-theme")
 skip.append("WebKit")
 skip.append("cairomm")
 skip.append("glibmm")
diff --git a/jhbuildrc-gtk-osx-cfw-10.4u b/jhbuildrc-gtk-osx-cfw-10.4u
index 12a5bd8..a5a6d9d 100644
--- a/jhbuildrc-gtk-osx-cfw-10.4u
+++ b/jhbuildrc-gtk-osx-cfw-10.4u
@@ -91,7 +91,7 @@ append_autogenargs("gtk-i386", _i386_args + " --with-gdktarget=quartz --without-
 #set_branch("libglade", "tags/LIBGLADE_2_6_2")
 #set_branch("gtk-engines", "tags/GTK_ENGINES_2_16_1")
 #set_branch("intltool", "tags/INTLTOOL_0_40_4")
-#set_branch("gnome-icon-theme", "tags/GNOME_ICON_THEME_2_24_0")
+#set_branch("adwaita-icon-theme", "tags/GNOME_ICON_THEME_2_24_0")
 # Try if this is new enough: set_branch("gtk-doc", "tags/GTK_DOC_1_10")
 
 # Python modules.
@@ -118,7 +118,7 @@ skip.append("faad")
 #skip.append("gtk-engines")
 #skip.append("libglade")
 #skip.append("loudmouth")
-#skip.append("gnome-icon-theme")
+#skip.append("adwaita-icon-theme")
 #skip.append("WebKit")
 
 # Not needed.
diff --git a/jhbuildrc-gtk-osx-fw-10.4 b/jhbuildrc-gtk-osx-fw-10.4
index 5cfca61..04ede5a 100644
--- a/jhbuildrc-gtk-osx-fw-10.4
+++ b/jhbuildrc-gtk-osx-fw-10.4
@@ -32,7 +32,7 @@ skip.append("gtk+")
 skip.append("ige-mac-integration")
 skip.append("gtk-engines")
 skip.append("hicolor-icon-theme")
-skip.append("gnome-icon-theme")
+skip.append("adwaita-icon-theme")
 skip.append("gettext")
 skip.append("intltool")
 skip.append("libpng")
diff --git a/jhbuildrc-gtk-osx-fw-10.4-test b/jhbuildrc-gtk-osx-fw-10.4-test
index 4cf010f..7025b48 100644
--- a/jhbuildrc-gtk-osx-fw-10.4-test
+++ b/jhbuildrc-gtk-osx-fw-10.4-test
@@ -34,7 +34,7 @@ skip.append("gtk+")
 skip.append("ige-mac-integration")
 skip.append("gtk-engines")
 skip.append("hicolor-icon-theme")
-skip.append("gnome-icon-theme")
+skip.append("adwaita-icon-theme")
 skip.append("gettext")
 skip.append("intltool")
 skip.append("libpng")
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index 8e5d3b6..d36a56c 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -18,7 +18,7 @@
   <metamodule id="meta-gtk-osx-themes">
     <dependencies>
       <dep package="tango-icon-theme"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="icon-naming-utils"/>
       <dep package="gtk-engines"/>
     </dependencies>
@@ -27,7 +27,7 @@
   <metamodule id="meta-gtk-osx-gtk3-core-themes">
     <dependencies>
       <dep package="icon-naming-utils"/>
-      <dep package="gnome-icon-theme-symbolic"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="gnome-themes-standard"/>
     </dependencies>
   </metamodule>
@@ -52,38 +52,23 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-icon-theme" autogen-sh="configure">
-    <branch module="gnome-icon-theme/3.10/gnome-icon-theme-3.10.0.tar.xz"
-            version="3.10.0" hash="sha256:c65472b5846c67b97fe75200c5180faccd1347a04caa8390fc0ad23de75b36f6"/>
+  <autotools id="adwaita-icon-theme" autogen-sh="configure">
+    <branch module="adwaita-icon-theme/3.14/adwaita-icon-theme-3.14.1.tar.xz"
+            version="3.14.1" hash="sha256:b776a7ad58c97f4c1ede316e44d8d054105429cb4e3a8ec46616a14b11df48ee"/>
     <dependencies>
+      <dep package="librsvg"/>
       <dep package="hicolor-icon-theme"/>
       <dep package="icon-naming-utils"/>
     </dependencies>
   </autotools>
 
- <autotools id="gnome-icon-theme-symbolic" autogen-sh="configure">
-    <branch module="gnome-icon-theme-symbolic/3.10/gnome-icon-theme-symbolic-3.10.1.tar.xz"
-            version="3.10.1" hash="sha256:344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412"/>
-    <dependencies>
-      <dep package="gnome-icon-theme"/>
-    </dependencies>
-  </autotools>
-
- <autotools id="gnome-icon-theme-extras" autogen-sh="configure">
-    <branch module="gnome-icon-theme-extras/3.6/gnome-icon-theme-extras-3.6.2.tar.xz"
-            version="3.6.2" hash="sha256:93aaaadf40c85ebc42232a4d8e45ca507754b8e1271e797bbcdaded52bd03ec7"/>
-    <dependencies>
-      <dep package="gnome-icon-theme"/>
-    </dependencies>
-  </autotools>
-
  <autotools id="gnome-themes-standard" autogen-sh="configure"
            autogenargs='--disable-gtk2-engine'>
     <branch module="gnome-themes-standard/3.10/gnome-themes-standard-3.10.0.tar.xz"
             version="3.10.0" hash="sha256:812c6cfc534fced921dc327b436e70020d8979529284bb59d72d6f37af1f4b38"/>
     <dependencies>
       <dep package="librsvg"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="adwaita-icon-theme"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-stable/gtk-osx-universal.modules b/modulesets-stable/gtk-osx-universal.modules
index 86fb414..56b17bf 100644
--- a/modulesets-stable/gtk-osx-universal.modules
+++ b/modulesets-stable/gtk-osx-universal.modules
@@ -45,7 +45,7 @@
       <dep package='meta-glib-universal'/>
       <dep package="pango"/>
       <dep package="atk"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="gtk-ppc"/>
       <dep package="gtk-i386"/>
       <dep package="lipo-gtk"/>
diff --git a/modulesets-unstable/gtk-osx-themes.modules b/modulesets-unstable/gtk-osx-themes.modules
index 34020a4..2d6fd6b 100644
--- a/modulesets-unstable/gtk-osx-themes.modules
+++ b/modulesets-unstable/gtk-osx-themes.modules
@@ -11,7 +11,7 @@
   <metamodule id="meta-gtk-osx-themes">
     <dependencies>
       <dep package="tango-icon-theme"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="icon-naming-utils"/>
       <dep package="gtk-engines"/>
     </dependencies>
@@ -20,7 +20,7 @@
   <metamodule id="meta-gtk-osx-gtk3-core-themes">
     <dependencies>
       <dep package="icon-naming-utils"/>
-      <dep package="gnome-icon-theme-symbolic"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="gnome-themes-standard"/>
     </dependencies>
   </metamodule>
@@ -46,33 +46,20 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-icon-theme">
+  <autotools id="adwaita-icon-theme">
     <branch />
     <dependencies>
+      <dep package="librsvg"/>
       <dep package="hicolor-icon-theme"/>
       <dep package="icon-naming-utils"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-icon-theme-symbolic">
-    <branch />
-    <dependencies>
-      <dep package="gnome-icon-theme"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-icon-theme-extra">
-    <branch />
-    <dependencies>
-      <dep package="gnome-icon-theme"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-themes-standard" autogenargs='--disable-gtk2-engine'>
     <branch />
     <dependencies>
       <dep package="librsvg"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="adwaita-icon-theme"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index 90bfdf9..854a791 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -11,7 +11,7 @@
   <metamodule id="meta-gtk-osx-themes">
     <dependencies>
       <dep package="tango-icon-theme"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="icon-naming-utils"/>
       <dep package="gtk-engines"/>
     </dependencies>
@@ -20,7 +20,7 @@
   <metamodule id="meta-gtk-osx-gtk3-core-themes">
     <dependencies>
       <dep package="icon-naming-utils"/>
-      <dep package="gnome-icon-theme-symbolic"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="gnome-themes-standard"/>
     </dependencies>
   </metamodule>
@@ -46,33 +46,20 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-icon-theme">
-    <branch revision="gnome-3-10"/>
+  <autotools id="adwaita-icon-theme">
+    <branch revision="gnome-3-14"/>
     <dependencies>
+      <dep package="librsvg"/>
       <dep package="hicolor-icon-theme"/>
       <dep package="icon-naming-utils"/>
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-icon-theme-symbolic">
-    <branch revision="gnome-3-10"/>
-    <dependencies>
-      <dep package="gnome-icon-theme"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-icon-theme-extra">
-    <branch revision="3.6.2"/>
-    <dependencies>
-      <dep package="gnome-icon-theme"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-themes-standard" autogenargs="--disable-gtk2-engine">
     <branch revision="gnome-3-10"/>
     <dependencies>
       <dep package="librsvg"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="adwaita-icon-theme"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx-universal.modules b/modulesets/gtk-osx-universal.modules
index 55b3ed2..2622ba2 100644
--- a/modulesets/gtk-osx-universal.modules
+++ b/modulesets/gtk-osx-universal.modules
@@ -54,7 +54,7 @@
       <dep package="meta-glib-universal"/>
       <dep package="pango"/>
       <dep package="atk"/>
-      <dep package="gnome-icon-theme"/>
+      <dep package="adwaita-icon-theme"/>
       <dep package="gtk-ppc"/>
       <dep package="gtk-i386"/>
       <dep package="gtk-x86_64"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]