sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (60374a68f0198b1baa3ba07815ecddc6563a341b)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (60374a68f0198b1baa3ba07815ecddc6563a341b)
- Date: Sun, 15 Jan 2017 20:03:39 +0000
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
x11-libs/fontconfig/DEPENDS | 18 +++++++++++-------
x11-libs/fontconfig/HISTORY | 6 +++---
2 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit 60374a68f0198b1baa3ba07815ecddc6563a341b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
fontconfig: added dependencies coming from freetype2 linking
commit e131ea8efaef3d03953f5032215d14cab99a6a79
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
Revert "fontconfig: added missing dependencies"
This reverts commit f0922418443a0e95dd34097ffa6f727bb0a5e2f8.
Conflicts:
x11-libs/fontconfig/HISTORY
diff --git a/x11-libs/fontconfig/DEPENDS b/x11-libs/fontconfig/DEPENDS
index cb81d8e..8d680c0 100755
--- a/x11-libs/fontconfig/DEPENDS
+++ b/x11-libs/fontconfig/DEPENDS
@@ -1,12 +1,16 @@
-depends automake &&
-depends expat &&
+depends pkgconfig &&
depends freetype2 &&
-depends glib2 &&
-depends harfbuzz &&
-depends libpng &&
+depends automake &&
depends libtool &&
-depends pcre &&
-depends pkgconfig &&
+depends expat &&
+
+if is_depends_enabled freetype2 libpng; then
+ depends libpng
+fi &&
+
+if is_depends_enabled freetype2 harfbuzz; then
+ depends harfbuzz
+fi &&
optional_depends docbook-utils \
"--enable-docs" \
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index dda5d8b..58004fa 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,6 @@
+2017-01-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added external optional from freetype2
+
2016-08-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated all branches to 2.12.1
@@ -7,9 +10,6 @@
2016-04-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS, PREPARE: added devel branch
-2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
- * DEPENDS: added missing dependencies
-
2014-04-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.11.1
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (60374a68f0198b1baa3ba07815ecddc6563a341b), Vlad Glagolev, 01/15/2017
Archive powered by MHonArc 2.6.24.