[gtk-osx] Add gnome theme

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-osx] Add gnome theme
Date: Fri, 31 Jan 2014 19:49:58 +0000 (UTC)
commit 43f8c81d22e287d7d2e2fd326f78eb79193d87ef
Author: John Ralls <jralls ceridwen us>
Date:   Fri Jan 31 11:45:31 2014 -0800

    Add gnome theme
    
    Gtk+-3.10 and later requires "gnome" themes for some of its standard
    icons. This change adds those packages and make the core ones a
    dependency of meta-gtk-osx-gtk3.

 modulesets-stable/gtk-osx-themes.modules   |   36 ++++++++++++++-
 modulesets-stable/gtk-osx.modules          |    1 +
 modulesets-unstable/gtk-osx-themes.modules |   29 ++++++++++++
 modulesets-unstable/gtk-osx.modules        |    1 +
 modulesets/gtk-osx-themes.modules          |   68 ++++++++++++++++++----------
 modulesets/gtk-osx.modules                 |    1 +
 6 files changed, 110 insertions(+), 26 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index c15e2f1..0cc88a1 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -24,6 +24,14 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gtk-osx-gtk3-core-themes">
+    <dependencies>
+      <dep package="icon-naming-utils"/>
+      <dep package="gnome-icon-theme-symbolic"/>
+      <dep packabe="gnome-themes-standard"/>
+    </dependencies>
+  </metamodule>
+
   <autotools id="icon-naming-utils" autogen-sh="configure">
     <branch repo="tango.freedesktop.org"  version="0.8.90"
             module="icon-naming-utils-0.8.90.tar.bz2"
@@ -45,14 +53,38 @@
   </autotools>
 
   <autotools id="gnome-icon-theme" autogen-sh="configure">
-    <branch module="gnome-icon-theme/3.6/gnome-icon-theme-3.6.0.tar.xz"
-            version="3.6.0" hash="sha256:5fbeef50b1dea1551ec9a008a6ebda0977154ebc4625ee9328695ec2b82cf0eb"/>
+    <branch module="gnome-icon-theme/3.10/gnome-icon-theme-3.10.0.tar.xz"
+            version="3.10.0" hash="sha256:c65472b5846c67b97fe75200c5180faccd1347a04caa8390fc0ad23de75b36f6"/>
     <dependencies>
       <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/3.6/gnome-icon-theme-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">
+    <branch module="gnome-icon-theme/3.10/gnome-icon-theme-3.10.0.tar.xz"
+            version="3.10.0" hash="sha256:812c6cfc534fced921dc327b436e70020d8979529284bb59d72d6f37af1f4b38"/>
+    <dependencies>
+      <dep package="gnome-icon-theme"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtk-engines" autogen-sh="configure">
     <branch module="gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"
             version="2.20.2" hash="sha256:15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"/>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index dac682d..ad125b5 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -59,6 +59,7 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
+      <dep package="meta-gtk-osx-gtk3-core-themes"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
diff --git a/modulesets-unstable/gtk-osx-themes.modules b/modulesets-unstable/gtk-osx-themes.modules
index e3a6481..b8bad46 100644
--- a/modulesets-unstable/gtk-osx-themes.modules
+++ b/modulesets-unstable/gtk-osx-themes.modules
@@ -17,6 +17,14 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gtk-osx-gtk3-core-themes">
+    <dependencies>
+      <dep package="icon-naming-utils"/>
+      <dep package="gnome-icon-theme-symbolic"/>
+      <dep packabe="gnome-themes-standard"/>
+    </dependencies>
+  </metamodule>
+
   <autotools id="icon-naming-utils" autogen-sh="configure" >
     <branch repo="freedesktop.org" module="gstreamer-sdk/icon-naming-utils" 
            revision="sdk-0.8.7"/>
@@ -46,6 +54,27 @@
     </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">
+    <branch />
+    <dependencies>
+      <dep package="gnome-icon-theme"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtk-engines">
     <branch />
     <after>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index f5db602..6411135 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -56,6 +56,7 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
+      <dep package="meta-gtk-osx-gtk3-core-themes"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index fa3bedd..0f26ccb 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -4,17 +4,9 @@
 <moduleset>
   <repository type="git" name="git.gnome.org" default="yes" 
               href="git://git.gnome.org/"/>
-  <repository type="cvs" name="tango.freedesktop.org"
-              cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/tango"
-              password=""/>
-  <repository type="cvs" name="icon.freedesktop.org"
-              cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/icon-theme"
-              password=""/>
   <repository type="git" name="freedesktop.org"
               href="git://anongit.freedesktop.org/"/>
   <repository type="git" name="github.com" href="git://github.com/"/>
-  <repository type="tarball" name="tango-rel.freedesktop.org"
-              href="http://tango.freedesktop.org/releases/"/>
 
   <metamodule id="meta-gtk-osx-themes">
     <dependencies>
@@ -25,8 +17,17 @@
     </dependencies>
   </metamodule>
 
-  <autotools id="icon-naming-utils" >
-    <branch repo="icon.freedesktop.org" tag="ICON_NAMING_UTILS_0_8_90"/>
+  <metamodule id="meta-gtk-osx-gtk3-core-themes">
+    <dependencies>
+      <dep package="icon-naming-utils"/>
+      <dep package="gnome-icon-theme-symbolic"/>
+      <dep packabe="gnome-themes-standard"/>
+    </dependencies>
+  </metamodule>
+
+  <autotools id="icon-naming-utils" autogen-sh="configure" >
+    <branch repo="freedesktop.org" module="gstreamer-sdk/icon-naming-utils" 
+           revision="sdk-0.8.7"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
@@ -35,10 +36,10 @@
   <!-- Requires Inkscape to build icons from SVG and for some reason
        the perl is wedged, looking in the wrong place for
        ParserOptions.ini. Use the tarball -->
-  <autotools id="tango-icon-theme" autogenargs="--disable-icon-framing" 
-             autogen-sh="configure">
-    <branch repo="tango-rel.freedesktop.org" version="0.8.90"
-            module="tango-icon-theme-0.8.90.tar.gz"/>
+  <autotools id="tango-icon-theme" autogenargs="--disable-icon-framing"
+            autogen-sh="configure">
+    <branch repo="freedesktop.org" module="gstreamer-sdk/tango-icon-theme"
+           revision="sdk-0.8.1"/>
     <dependencies>
       <dep package="icon-naming-utils"/>
       <dep package="hicolor-icon-theme"/>
@@ -46,33 +47,54 @@
   </autotools>
 
   <autotools id="gnome-icon-theme">
-    <branch tag="3.6.0"/>
+    <branch revision="gnome-3-10"/>
     <dependencies>
       <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">
+    <branch revision="gnome-3-10"/>
+    <dependencies>
+      <dep package="gnome-icon-theme"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtk-engines">
-    <branch revision="gtk-engines-2-20"/>
+    <branch />
     <after>
       <dep package="meta-gtk-osx-core"/>
     </after>
   </autotools>
 
   <autotools id="murrine-engine">
-    <branch module="murrine" tag="173b7fc19f15b87ffe1bed4de661007b15719aa5"/>
+    <branch module="murrine"/>
   </autotools>
 
   <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
-    <branch module="librsvg" tag="2.36.4"/>
+    <branch module="librsvg"/>
     <dependencies>
       <dep package="libcroco"/>
     </dependencies>
   </autotools>
 
   <autotools id="libcroco" autogenargs="--disable-Bsymbolic">
-    <branch tag="0.6.8"/>
+    <branch/>
   </autotools>
 
   <autotools id="libcss" autogenargs="--disable-examples">
@@ -83,17 +105,15 @@
   </autotools>
 
   <autotools id="gtk-css-engine">
-    <branch tag="gtk-css-engine-0.3.1"/>
-    <dependencies>
-      <dep package="libccss"/>
-    </dependencies>
+    <branch />
     <after>
       <dep package="meta-gtk-osx-core"/>
     </after>
   </autotools>
 
   <autotools id="gtk-quartz-engine">
-    <branch />
+    <branch module="jralls/gtk-quartz-engine"
+            repo="github.com"  />
     <after>
       <dep package="meta-gtk-osx-core"/>
     </after>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index db6f5f4..e3cfb39 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -54,6 +54,7 @@
     <dependencies>
       <dep package="gtk+-3.0"/>
       <dep package="gtk-mac-integration"/>
+      <dep package="meta-gtk-osx-gtk3-core-themes"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]