summaryrefslogtreecommitdiffstats
path: root/x11-libs/fontconfig
diff options
context:
space:
mode:
authorArjan Bouter2011-04-14 11:28:13 +0200
committerArjan Bouter2011-04-14 11:28:13 +0200
commitb2e1990a46dc7e60e49e64fb790a08f6cf5230b3 (patch)
tree8be6fe3a5b425ee1a18f070152b09bc27d69c7c1 /x11-libs/fontconfig
parentf8308250ede5c97b639c56e7a3a08132ff4e955c (diff)
fontconfig: added optional/sub-dependable default font. fixes bug #11713
Diffstat (limited to 'x11-libs/fontconfig')
-rwxr-xr-xx11-libs/fontconfig/DEPENDS3
-rw-r--r--x11-libs/fontconfig/HISTORY4
-rwxr-xr-xx11-libs/fontconfig/PRE_SUB_DEPENDS4
-rwxr-xr-xx11-libs/fontconfig/SUB_DEPENDS6
4 files changed, 16 insertions, 1 deletions
diff --git a/x11-libs/fontconfig/DEPENDS b/x11-libs/fontconfig/DEPENDS
index ee12e3b2e4..01deb2c09d 100755
--- a/x11-libs/fontconfig/DEPENDS
+++ b/x11-libs/fontconfig/DEPENDS
@@ -11,4 +11,5 @@ optional_depends docbook-utils \
if is_depends_enabled $SPELL docbook-utils; then
depends HTML_TO_TEXT
-fi
+fi &&
+optional_depends ttf-bitstream-vera '' '' 'for a default font'
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index d3cbda34b4..895f4e3722 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,7 @@
+2011-04-14 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS, SUB_DEPENDS, PRE_SUB_DEPENDS: added bitstream-vera as
+ optional default font (fixes bug #11713)
+
2009-12-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.8.0
diff --git a/x11-libs/fontconfig/PRE_SUB_DEPENDS b/x11-libs/fontconfig/PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..9c05b03da0
--- /dev/null
+++ b/x11-libs/fontconfig/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ FONT) is_depends_enabled $SPELL ttf-bitstream-vera && return 0;;
+esac
+return 1
diff --git a/x11-libs/fontconfig/SUB_DEPENDS b/x11-libs/fontconfig/SUB_DEPENDS
new file mode 100755
index 0000000000..127563dda6
--- /dev/null
+++ b/x11-libs/fontconfig/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+FONT) echo "Default font requested, forcing bitstream vera." &&
+ depends ttf-bitstream-vera
+ ;;
+ *) echo "unknown sub-depends!"; return 1;;
+esac