From b88cc98a1a1889a578e52e55a0070304d1d1f34a Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 11 Jun 2022 17:41:43 +0800
Subject: [PATCH] up

---
 plugins/php/versions/52/install.sh |  2 +-
 plugins/php/versions/53/install.sh |  2 +-
 plugins/php/versions/54/install.sh |  2 +-
 plugins/php/versions/55/install.sh |  2 +-
 plugins/php/versions/56/install.sh |  2 +-
 scripts/lib.sh                     | 21 +++++++++++++++++++++
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh
index cee328a18..bbd58b40d 100755
--- a/plugins/php/versions/52/install.sh
+++ b/plugins/php/versions/52/install.sh
@@ -72,7 +72,7 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl"
 else
 	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
+	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old"
 	OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf"
 	OPTIONS="${OPTIONS} --with-curl"
 fi
diff --git a/plugins/php/versions/53/install.sh b/plugins/php/versions/53/install.sh
index 5a4ba452a..3d2241ed1 100755
--- a/plugins/php/versions/53/install.sh
+++ b/plugins/php/versions/53/install.sh
@@ -50,7 +50,7 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl"
 else
 	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
+	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old"
 	OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf"
 	OPTIONS="${OPTIONS} --with-curl"
 fi
diff --git a/plugins/php/versions/54/install.sh b/plugins/php/versions/54/install.sh
index a488b8699..db50b5a50 100755
--- a/plugins/php/versions/54/install.sh
+++ b/plugins/php/versions/54/install.sh
@@ -36,7 +36,7 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl"
 else
 	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
+	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old"
 	OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf"
 	OPTIONS="${OPTIONS} --with-curl"
 fi
diff --git a/plugins/php/versions/55/install.sh b/plugins/php/versions/55/install.sh
index ed8853efd..4ac81367f 100755
--- a/plugins/php/versions/55/install.sh
+++ b/plugins/php/versions/55/install.sh
@@ -35,7 +35,7 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl"
 else
 	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
+	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old"
 	OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf"
 	OPTIONS="${OPTIONS} --with-curl"
 fi
diff --git a/plugins/php/versions/56/install.sh b/plugins/php/versions/56/install.sh
index 05f651531..67f5df9b4 100755
--- a/plugins/php/versions/56/install.sh
+++ b/plugins/php/versions/56/install.sh
@@ -35,7 +35,7 @@ if [ $sysName == 'Darwin' ]; then
 	OPTIONS="${OPTIONS} --with-curl=${serverPath}/lib/curl"
 else
 	OPTIONS="--with-iconv=${serverPath}/lib/libiconv"
-	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype"
+	OPTIONS="${OPTIONS} --with-freetype-dir=${serverPath}/lib/freetype_old"
 	OPTIONS="${OPTIONS} --with-gd --enable-gd-native-ttf"
 	OPTIONS="${OPTIONS} --with-curl"
 fi
diff --git a/scripts/lib.sh b/scripts/lib.sh
index 1c5828da5..5800d940b 100755
--- a/scripts/lib.sh
+++ b/scripts/lib.sh
@@ -83,6 +83,24 @@ Install_Libiconv()
 
 Install_Freetype()
 {
+#----------------------------- freetype start -------------------------#
+    cd ${sourcePath}
+    if [ ! -d ${libPath}/freetype_old ];then
+        wget -O freetype-2.7.1.tar.gz https://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.gz  -T 5
+        tar zxvf freetype-2.7.1.tar.gz
+        cd freetype-2.7.1
+        ./configure --prefix=${libPath}/freetype_old
+        make && make install
+        cd ${sourcePath}
+        rm -rf freetype-2.7.1.tar.gz
+        rm -f freetype-2.7.1.tar.gz
+    fi
+    echo -e "Install_Freetype_Old" >> ${libPath}/lib.pl
+#----------------------------- freetype end -------------------------#
+}
+
+Install_Freetype_New()
+{
 #----------------------------- freetype start -------------------------#
     cd ${sourcePath}
     if [ ! -d ${libPath}/freetype ];then
@@ -261,7 +279,10 @@ Install_Libiconv
 # Install_Libmemcached
 # Install_Curl
 # Install_Zlib
+
 Install_Freetype
+Install_Freetype_New
+
 # Install_OpenSSL
 Install_Libzip