summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2014-12-31 20:02:31 +0000
committerEric Sandall2015-01-01 05:57:50 +0000
commitc960ee3f2698212779ad8d977e032ee216ece77d (patch)
tree806ace2d4d1cc27c4ae52369ff38ad50ed1bc11c
parentd970adf695803ad07b7ff1d5cfc3d6340a3f9db9 (diff)
harfbuzz: Allow forcing freetype2 dependency
e.g. for freetype2 with harfbuzz support
-rw-r--r--graphics-libs/harfbuzz/HISTORY2
-rwxr-xr-xgraphics-libs/harfbuzz/PRE_SUB_DEPENDS1
-rwxr-xr-xgraphics-libs/harfbuzz/REPAIR^3f1f7ad3cbbc751c84bbe89658297f2c^PRE_SUB_DEPENDS6
-rwxr-xr-xgraphics-libs/harfbuzz/SUB_DEPENDS1
4 files changed, 10 insertions, 0 deletions
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 52d0a1b76a..9295c1ebea 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,5 +1,7 @@
2014-12-31 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: --with-freetype2 -> --with-freetype
+ * *SUB_DEPENDS: Allow forcing freetype2 dependency (e.g. for freetype2
+ with harfbuzz support).
2014-11-23 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.9.36
diff --git a/graphics-libs/harfbuzz/PRE_SUB_DEPENDS b/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
index 069cc7ecd0..d50f45508f 100755
--- a/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
+++ b/graphics-libs/harfbuzz/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
GRAPHITE2) if [[ is_depends_enabled $SPELL graphite2 ]]; then return 0; fi ;;
+ FT) is_depends_enabled $SPELL freetype2 && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/graphics-libs/harfbuzz/REPAIR^3f1f7ad3cbbc751c84bbe89658297f2c^PRE_SUB_DEPENDS b/graphics-libs/harfbuzz/REPAIR^3f1f7ad3cbbc751c84bbe89658297f2c^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..d50f45508f
--- /dev/null
+++ b/graphics-libs/harfbuzz/REPAIR^3f1f7ad3cbbc751c84bbe89658297f2c^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ GRAPHITE2) if [[ is_depends_enabled $SPELL graphite2 ]]; then return 0; fi ;;
+ FT) is_depends_enabled $SPELL freetype2 && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/graphics-libs/harfbuzz/SUB_DEPENDS b/graphics-libs/harfbuzz/SUB_DEPENDS
index 0aaed798f7..b95ba73dfc 100755
--- a/graphics-libs/harfbuzz/SUB_DEPENDS
+++ b/graphics-libs/harfbuzz/SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
GRAPHITE2) depends graphite2 "--with-graphite2" ;;
+ FT) depends freetype2 '--with-freetype=yes' ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac