[Lunar-commits] <moonbase> librsvg: configuration update and checks for cairo

[Duncan Gibson]

commit 4159b246764640f9010657c75c3cfb49ceda7dfe
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Thu Feb 3 02:36:28 2011 +0100

    librsvg: configuration update and checks for cairo
    
    ... to avoid circular dependency I modified POST_INSTALL and added
    POST_REMOVE to enable cairo's svg testing feature
---
 gnome2/desktop/librsvg/CONFIGURE    |   11 +++++++++++
 gnome2/desktop/librsvg/DEPENDS      |   23 ++++++++++++++++++-----
 gnome2/desktop/librsvg/POST_INSTALL |   13 +++++++++++--
 gnome2/desktop/librsvg/POST_REMOVE  |    4 ++++
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/gnome2/desktop/librsvg/CONFIGURE b/gnome2/desktop/librsvg/CONFIGURE
new file mode 100644
index 0000000..4a4b6e3
--- /dev/null
+++ b/gnome2/desktop/librsvg/CONFIGURE
@@ -0,0 +1,11 @@
+mquery GDKPIXBUF_LOADER "Enable GdkPixbuf loader?"    \
+                        y                             \
+                        "--enable-pixbuf-loader"      \
+                        "--disable-pixbuf-loader"
+
+mquery MISC_TOOLS       "Enable miscellaenous tools?" \
+                        y                             \
+                        "--enable-tools"              \
+                        "--disable-tools"
+
+mquery REBUILD_CAIRO "Rebuild cairo upon completion to enable SVG testing?" y
diff --git a/gnome2/desktop/librsvg/DEPENDS b/gnome2/desktop/librsvg/DEPENDS
index 979bebd..7ff614b 100644
--- a/gnome2/desktop/librsvg/DEPENDS
+++ b/gnome2/desktop/librsvg/DEPENDS
@@ -1,6 +1,19 @@
-depends  popt
-depends  cairo
-depends  gtk+-2
+depends  libxml2
+depends  gdk-pixbuf
+depends  cairo      # needs cairo with png enabled
+depends  pango      # needs pango with cairo enabled
 
-optional_depends libgsf   "--with-svgz"  "--without-svgz"  "for run-time decompression support"
-optional_depends libcroco "--with-croco" "--without-croco" "for CSS parsing support"
+optional_depends "libcroco"                              \
+                 "--with-croco"                          \
+                 "--without-croco"                       \
+                 "for CSS parsing support (recommended)"
+
+optional_depends "libgsf"                                \
+                 "--with-svgz"                           \
+                 "--without-svgz"                        \
+                 "for libgsf run-time decompression"
+
+optional_depends "gtk+-2"                                \
+                 "--enable-gtk-theme"                    \
+                 "--disable-gtk-theme"                   \
+                 "for GTK+ theme engine"
diff --git a/gnome2/desktop/librsvg/POST_INSTALL b/gnome2/desktop/librsvg/POST_INSTALL
index f4725e2..22c19c5 100644
--- a/gnome2/desktop/librsvg/POST_INSTALL
+++ b/gnome2/desktop/librsvg/POST_INSTALL
@@ -1,4 +1,13 @@
 if [[ -x /usr/bin/gdk-pixbuf-query-loaders ]] ; then
-	# Recreate /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-	gdk-pixbuf-query-loaders --update-cache
+  # Recreate /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+  gdk-pixbuf-query-loaders --update-cache
+fi
+
+# librsvg is not in cairo's depends (to avoid circular dependency)
+if [ "`get_module_config REBUILD_CAIRO`" = "y" ]; then
+  # will only work if this was built with gtk+-2
+  if in_depends librsvg gtk+-2; then
+    verbose_msg "Rebuilding cairo to enable svg testing ..."
+    lin -c cairo
+  fi
 fi
diff --git a/gnome2/desktop/librsvg/POST_REMOVE b/gnome2/desktop/librsvg/POST_REMOVE
new file mode 100644
index 0000000..8f19d62
--- /dev/null
+++ b/gnome2/desktop/librsvg/POST_REMOVE
@@ -0,0 +1,4 @@
+# librsvg is not in cairo's depends (to avoid circular dependency)
+if module_installed cairo ; then
+  lunar fix cairo
+fi