Date: Wednesday, May 9, 2018 @ 14:30:54
Author: heftig
Revision: 323625
fix freetype, fix patches touching configure
Added:
php/trunk/freetype.patch
Modified:
php/trunk/PKGBUILD
php/trunk/apache.patch
php/trunk/enchant-2.patch
-----------------+
PKGBUILD | 12 ++++++++----
apache.patch | 10 ----------
enchant-2.patch | 23 -----------------------
freetype.patch | 38 ++++++++++++++++++++++++++++++++++++++
4 files changed, 46 insertions(+), 37 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-09 13:01:13 UTC (rev 323624)
+++ PKGBUILD 2018-05-09 14:30:54 UTC (rev 323625)
@@ -30,15 +30,17 @@
'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl'
'libtool' 'postfix' 'freetds' 'pcre' 'libnsl')
checkdepends=('procps-ng')
source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
- 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch' enchant-2.patch)
+ 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch'
+ 'enchant-2.patch' 'freetype.patch')
sha512sums=('1d49fc6e47d2e86d4fd62396e558965502f44cc8f72459bb0d406e157298cac67703b219837952da11122722d9fa8cb4cda8ef66ddf063cb063859db34110f58'
'SKIP'
-
'7b87f785008f4e53e2837ba4009817145b10c46783ec3d19e158881f04bbc03ba0a36396058792bf72ccdc6de603b01ca3f248fae349703d08df74895eeeab46'
+
'bb9abfc51c41e1de180ef09244691c909ee64feebd9749978e1ecb7f576466a37232d9c6e97c1a01a96b8413a33c4818a91dc79f63078dc1946f56dad516bb05'
'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
'c5d57a4d06d33856082a461a6796975ec42b655e81abe14bc896692d44b5c28e9b344111e64d13af486168b3dc927d908705e543095f34052f72198f257b4c34'
'824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
'85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0'
-
'89993be67988f6db09e1102214a41fdb7223274bc6ca71f1defc5fe9548d832485f7133b8ba82860f04da00c7f655d701c7550460c0172a2a2d31ef3f3f96038')
+
'06b49fb044fe8cdeef5109aa7bb6858906396e3f3643827cdb241264029579c71b0a7661d24b78b16573c54832505491c4b2a1fd77ae7c313cb082731c2efd9e'
+
'97ca469d5234f5cc71af38bb99a60130fdab5f849ad1f49f112101779c7659ca4d6700aef72e0294c85bdcb18e487fc0cdda855cc51084b9e8cacb02ec0fb1eb')
validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
'1729F83938DA44E27BA0F4D3DBDB397470D12172')
@@ -48,7 +50,9 @@
patch -p0 -i ${srcdir}/apache.patch
patch -p0 -i ${srcdir}/php-fpm.patch
patch -p0 -i ${srcdir}/php.ini.patch
- patch -p1 -i ../enchant-2.patch
+ patch -p1 -i ${srcdir}/enchant-2.patch
+ patch -p1 -i ${srcdir}/freetype.patch
+ autoconf
rm tests/output/stream_isatty_*.phpt
}
Modified: apache.patch
===================================================================
--- apache.patch 2018-05-09 13:01:13 UTC (rev 323624)
+++ apache.patch 2018-05-09 14:30:54 UTC (rev 323625)
@@ -8,13 +8,3 @@
if test -n "$APACHE_THREADED_MPM"; then
PHP_BUILD_THREAD_SAFE
fi
---- configure.orig
-+++ configure
-@@ -7020,7 +7020,6 @@
-
- fi
- else
-- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
- if test -n "$APACHE_THREADED_MPM"; then
-
- enable_maintainer_zts=yes
Modified: enchant-2.patch
===================================================================
--- enchant-2.patch 2018-05-09 13:01:13 UTC (rev 323624)
+++ enchant-2.patch 2018-05-09 14:30:54 UTC (rev 323625)
@@ -21,29 +21,6 @@
PHP_ADD_INCLUDE($ENCHANT_INCDIR)
PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
[
---- php-7.1.13/configure.orig 2018-01-21 22:03:51.494656374 +0000
-+++ php-7.1.13/configure 2018-01-21 22:12:35.932571143 +0000
-@@ -29838,9 +29838,9 @@
- ENCHANT_SEARCH_DIRS="/usr/local /usr"
- fi
- for i in $ENCHANT_SEARCH_DIRS; do
-- if test -f $i/include/enchant/enchant.h; then
-+ if test -f $i/include/enchant-2/enchant.h; then
- ENCHANT_DIR=$i
-- ENCHANT_INCDIR=$i/include/enchant
-+ ENCHANT_INCDIR=$i/include/enchant-2
- elif test -f $i/include/enchant.h; then
- ENCHANT_DIR=$i
- ENCHANT_INCDIR=$i/include
-@@ -29862,7 +29862,7 @@
-
-
- if test "$ext_shared" = "yes"; then
-- ENCHANT_SHARED_LIBADD="-lenchant $ENCHANT_SHARED_LIBADD"
-+ ENCHANT_SHARED_LIBADD="-lenchant-2 $ENCHANT_SHARED_LIBADD"
- if test -n "$ENCHANT_LIBDIR"; then
-
- if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR"
!= "/usr/lib"; then
--- php-7.2.1/ext/enchant/enchant.c.orig 2018-01-02 22:36:05.000000000
+0000
+++ php-7.2.1/ext/enchant/enchant.c 2018-01-21 22:34:50.205791491 +0000
@@ -741,7 +741,7 @@
Added: freetype.patch
===================================================================
--- freetype.patch (rev 0)
+++ freetype.patch 2018-05-09 14:30:54 UTC (rev 323625)
@@ -0,0 +1,38 @@
+diff -u -r php-7.2.5/ext/gd/config.m4 php-7.2.5-freetype/ext/gd/config.m4
+--- php-7.2.5/ext/gd/config.m4 2018-04-24 17:09:54.000000000 +0200
++++ php-7.2.5-freetype/ext/gd/config.m4 2018-05-09 14:49:03.647108948
+0200
+@@ -186,6 +186,9 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++
++ AC_MSG_CHECKING([for freetype])
+ for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+ if test -f "$i/bin/freetype-config"; then
+ FREETYPE2_DIR=$i
+@@ -194,13 +197,20 @@
+ fi
+ done
+
+- if test -z "$FREETYPE2_DIR"; then
++ if test -n "$FREETYPE2_CONFIG"; then
++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++ AC_MSG_RESULT([found in $FREETYPE2_DIR])
++ elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then
++ FREETYPE2_DIR=pkg-config
++ FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags`
++ FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs`
++ AC_MSG_RESULT([found by pkg-config])
++ else
++ AC_MSG_RESULT([not found])
+ AC_MSG_ERROR([freetype-config not found.])
+ fi
+
+- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
+- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
+-
+ PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
+ PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
+ AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
