sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (0eb8dd815227db37aa9cb670164eee8b9cb438ae)
- From: Thomas Orgis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0eb8dd815227db37aa9cb670164eee8b9cb438ae)
- Date: Sun, 11 Jan 2015 17:16:11 -0600
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
graphics-libs/harfbuzz/DEPENDS | 8 ++++++--
graphics-libs/harfbuzz/HISTORY | 3 +++
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 0eb8dd815227db37aa9cb670164eee8b9cb438ae
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
harfbuzz: avoid cyclic dependency with cairo
diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index 9de226a..219c4e0 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -3,8 +3,12 @@ depends libpng &&
depends pcre &&
depends ragel &&
-optional_depends cairo "--with-cairo=yes" "--with-cairo=no" \
- "Enable tools used for command-line utilities?" &&
+if spell_ok cairo; then
+ optional_depends cairo "--with-cairo=yes" "--with-cairo=no" \
+ "Enable tools used for command-line utilities?"
+else
+ message "${PROBLEM_COLOR}cyclic ${SPELL_COLOR}cairo${PROBLEM_COLOR}
optional dependency disabled until ${SPELL_COLOR}cairo${PROBLEM_COLOR} is
cast${DEFAULT_COLOR}"
+fi &&
optional_depends icu "--with-icu=yes" "--with-icu=no" \
"Enable icu use?" &&
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index eca748d..e0159ce 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2015-01-12 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: hack around cyclic dependency with cairo and fontconfig
+
2015-01-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.37
- [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0eb8dd815227db37aa9cb670164eee8b9cb438ae), Thomas Orgis, 01/11/2015
Archive powered by MHonArc 2.6.24.