Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (ab89178078802326005d359bab39b89b30edfeee)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (ab89178078802326005d359bab39b89b30edfeee)
  • Date: Wed, 24 Feb 2016 20:47:28 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

graphics-libs/freetype2/BUILD | 9 +--------
graphics-libs/freetype2/DEPENDS | 5 ++++-
graphics-libs/freetype2/HISTORY | 3 +++
3 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit ab89178078802326005d359bab39b89b30edfeee
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

freetype2: fix first time building

diff --git a/graphics-libs/freetype2/BUILD b/graphics-libs/freetype2/BUILD
index 78ceee2..e1b0a5c 100755
--- a/graphics-libs/freetype2/BUILD
+++ b/graphics-libs/freetype2/BUILD
@@ -1,9 +1,2 @@
-# Fix freetype2 casting for the first time
-# freetype2 with harfbuzz support requires harfbuzz built with freetype2...
-# see http://wiki.linuxfromscratch.org/blfs/ticket/5331#comment:2
-if is_depends_enabled harfbuzz ${SPELL} && ! spell_ok ${SPELL}; then
- message "${WARNING_COLOR}Disabling harfbuzz for first
cast${DEFAULT_COLOR}" &&
- list_remove OPTS '--with-harfbuzz=yes' &&
- OPTS="--with-harfbuzz=no ${OPTS}"
-fi
+OPTS+=" $FREETYPE_OPTS" &&
default_build
diff --git a/graphics-libs/freetype2/DEPENDS b/graphics-libs/freetype2/DEPENDS
index cc17202..d5f6f69 100755
--- a/graphics-libs/freetype2/DEPENDS
+++ b/graphics-libs/freetype2/DEPENDS
@@ -18,5 +18,8 @@ if spell_ok ${SPELL}; then
fi
fi
else
- message "${PROBLEM_COLOR}harfbuzz optional dependency disabled until
${DEFAULT_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${PROBLEM_COLOR} is
cast.${DEFAULT_COLOR}"
+ message "${PROBLEM_COLOR}harfbuzz optional dependency disabled until
${DEFAULT_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${PROBLEM_COLOR} is
cast.${DEFAULT_COLOR}" &&
+ persistent_add FREETYPE_OPTS &&
+ list_add FREETYPE_OPTS "--with-harfbuzz=no"
fi
+
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 5abf3fc..d89d75d 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,6 @@
+2016-02-24 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS, BUILD: fix first time building
+
2015-11-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.6.2




  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (ab89178078802326005d359bab39b89b30edfeee), Remko van der Vossen, 02/24/2016

Archive powered by MHonArc 2.6.24.

Top of Page