summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2009-12-17 05:23:30 -0800
committerEric Sandall2010-01-02 10:10:20 -0800
commit1739ef3e66f318f55429ec07ed9b3bd86790ef7c (patch)
treecc37bc5b3c71ac8bc9e5b3b13f7ea3fe6c14490f
parentd0daa5861893be6fbb3638bd76c5b8f1ecf899ed (diff)
gnome-python-desktop: Allow forcing librsvg2 (Bug #15515)
(cherry picked from commit 8fa9dc285221f4448d03b6daa24892e94fb50f47)
-rw-r--r--gnome2-libs/gnome-python-desktop/HISTORY3
-rwxr-xr-xgnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS1
-rwxr-xr-xgnome2-libs/gnome-python-desktop/SUB_DEPENDS1
3 files changed, 5 insertions, 0 deletions
diff --git a/gnome2-libs/gnome-python-desktop/HISTORY b/gnome2-libs/gnome-python-desktop/HISTORY
index 4db3e23858..b5efe72d45 100644
--- a/gnome2-libs/gnome-python-desktop/HISTORY
+++ b/gnome2-libs/gnome-python-desktop/HISTORY
@@ -1,3 +1,6 @@
+2009-12-17 Eric Sandall <sandalle@sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing librsvg2 (Bug #15515)
+
2009-09-23 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.28.0
diff --git a/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS b/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
index 15362d4912..24ee9ab996 100755
--- a/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
+++ b/gnome2-libs/gnome-python-desktop/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
GTKHTML2) if is_depends_enabled $SPELL gtkhtml2; then return 0; fi;;
+LIBRSVG2) if is_depends_enabled $SPELL librsvg2; then return 0; fi;;
esac
return 1
diff --git a/gnome2-libs/gnome-python-desktop/SUB_DEPENDS b/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
index 048daeecef..12ad4f0b96 100755
--- a/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
+++ b/gnome2-libs/gnome-python-desktop/SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
GTKHTML2) echo "gtkhtml2 bindings requested, forcing them."; depends gtkhtml2;;
+LIBRSVG2) echo "librsvg2 support requested, forcing it."; depends librsvg2 '--enable-rsvg';;
*) echo "unknown sub-depends!"; return 1;;
esac