[gtk-osx] Make librsvg module consistent across modulesets

[John Ralls <jralls src gnome org>]

commit 652171a09d76d3dea6238927fe76eb9fc6432ec7
Author: John Ralls <jralls ceridwen us>
Date:   Mon Nov 19 17:17:09 2012 +0900

    Make librsvg module consistent across modulesets

 modulesets-stable/gtk-osx-themes.modules   |    7 +------
 modulesets-unstable/gtk-osx-themes.modules |   22 ++++++++++++++++++++++
 modulesets/gtk-osx-themes.modules          |    7 +++++--
 3 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index 633507f..caa5909 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -64,13 +64,11 @@
 	    hash="sha256:e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912"/>
   </autotools>
 
-  <autotools id="librsvg2" autogenargs="--disable-Bsymbolic">
+  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
     <branch module="librsvg/2.36/librsvg-2.36.4.tar.xz" version="2.36.4"
 	    hash="sha256:1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2"/>
     <dependencies>
       <dep package="libcroco"/>
-      <dep package="libgsf"/>
-      <!--dep package="libart_lgpl"/><goffice.modules -->
     </dependencies>
   </autotools>
 
@@ -78,9 +76,6 @@
 	     autogen-sh="configure">
     <branch module="libcroco/0.6/libcroco-0.6.8.tar.xz" version="0.6.8"
 	    hash="sha256:ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570"/>
-    <dependencies>
-      <!--dep package="librsvg"/-->
-    </dependencies>
   </autotools>
 
   <autotools id="libccss" autogenargs="--disable-examples">
diff --git a/modulesets-unstable/gtk-osx-themes.modules b/modulesets-unstable/gtk-osx-themes.modules
index ba442fd..e3a6481 100644
--- a/modulesets-unstable/gtk-osx-themes.modules
+++ b/modulesets-unstable/gtk-osx-themes.modules
@@ -53,6 +53,28 @@
     </after>
   </autotools>
 
+  <autotools id="murrine-engine">
+    <branch module="murrine"/>
+  </autotools>
+
+  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
+    <branch module="librsvg"/>
+    <dependencies>
+      <dep package="libcroco"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libcroco" autogenargs="--disable-Bsymbolic">
+    <branch/>
+  </autotools>
+
+  <autotools id="libcss" autogenargs="--disable-examples">
+    <branch module="ccss" repo="freedesktop.org" tag="ccss-0.5.0"/>
+    <dependencies>
+      <dep package="libcroco"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gtk-css-engine">
     <branch />
     <after>
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index eecc3ca..fa3bedd 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -64,11 +64,14 @@
     <branch module="murrine" tag="173b7fc19f15b87ffe1bed4de661007b15719aa5"/>
   </autotools>
 
-  <autotools id="librsvg">
+  <autotools id="librsvg" autogenargs="--disable-Bsymbolic">
     <branch module="librsvg" tag="2.36.4"/>
+    <dependencies>
+      <dep package="libcroco"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="libcroco">
+  <autotools id="libcroco" autogenargs="--disable-Bsymbolic">
     <branch tag="0.6.8"/>
   </autotools>