sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (9fcd92aab4823262e958761cf22f22a95d8d0ae1)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (9fcd92aab4823262e958761cf22f22a95d8d0ae1)
- Date: Wed, 1 Apr 2015 10:02:24 -0500
GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
php-pear/php/HISTORY | 4 ++++
php-pear/php/PRE_BUILD | 5 +++++
2 files changed, 9 insertions(+)
New commits:
commit 9fcd92aab4823262e958761cf22f22a95d8d0ae1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
php: fixed build with new freetype2 (legacy/previous branch)
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 16c2786..917a541 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2015-04-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: fixed build of previous and legacy branches against new
+ freetype2
+
2015-02-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.4.38 (stable); SECURITY_PATCH++
(CVE-2015-0235, CVE-2015-0273)
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
index 96280bb..e224f25 100755
--- a/php-pear/php/PRE_BUILD
+++ b/php-pear/php/PRE_BUILD
@@ -10,4 +10,9 @@ fi &&
if [[ "${PHP5_SUHOSIN}" == "y" ]]; then
unpack_file 2 &&
zcat "${SOURCE_CACHE}/${SOURCE2}" | patch -p1
+fi &&
+
+# freetype2 >=2.5 fix
+if [[ $PHP5_BRANCH == legacy ]] || [[ $PHP5_BRANCH == previous ]]; then
+ sedit "s:freetype/freetype.h:freetype.h:" configure
fi
- [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (9fcd92aab4823262e958761cf22f22a95d8d0ae1), Vlad Glagolev, 04/01/2015
Archive powered by MHonArc 2.6.24.