summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas2018-02-03 23:06:45 +0100
committerNiklas2018-02-03 23:06:45 +0100
commitb73a7f29e28869d0708b5bf4be8cdfa16cee08aa (patch)
tree7d27a3b529837f4d2cd5db259d1b9694eb91621b
parent866e70436e177f8219176d764d4f433891a8d264 (diff)
downloadaur-b73a7f29e28869d0708b5bf4be8cdfa16cee08aa.tar.gz
update to 7.2.2
-rw-r--r--PKGBUILD35
-rw-r--r--enchant-2.patch84
2 files changed, 103 insertions, 16 deletions
diff --git a/PKGBUILD b/PKGBUILD
index e52d007610b..3692efe9215 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,29 @@
pkgname='php7-homegear'
pkgdesc='Patched version of PHP for Homegear'
-pkgver=7.2.0
-_pthreadversion=b3e691f25cd659bcdb504b61e8da235251cb3b5a
+pkgver=7.2.2
+_pthreadversion=64fff4f6aeadbcb5da2713304e00b9135cb296fd
_pkgbase=php
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
license=('PHP')
url='http://www.php.net'
depends=('gmp' 'enchant' 'libedit' 'libmcrypt' 'libzip' 'libxml2' 'openssl')
source=("http://www.php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"
- "https://github.com/krakjoe/pthreads/archive/${_pthreadversion}.tar.gz")
-sha512sums=('828d38727edde0dbc6483add6cdc21d33527b887bffaedad2d7f53e25d58a6f661ac341a23db02741bc37248d161aaffd72026dd8ef85ac851594c127d6c0133'
- '748894d295d8c5db57261ac0317a43fc49e6365f712be6916d765543341fb622ef37e4ee7113daaafe533c485c127208262c53e52480421385f6c6608449edb5')
+ "https://github.com/krakjoe/pthreads/archive/${_pthreadversion}.tar.gz"
+ 'enchant-2.patch')
+sha512sums=('36a3565161fc481307ac3e76c8d2ccc457c265bf510f085be1907835c7da7c747a0876502192d77bd664f94a584a1b149deee2600c650481fbedbf02d72d5fd0'
+ '68d6c6c863a9cebee15eb8480f927b49b5c52fe28c3a30342a81bcda5f009fcc21d3888e73444cc3d1da2877410719180c0668c60c462e7f2bd07670c7b04057'
+ '89993be67988f6db09e1102214a41fdb7223274bc6ca71f1defc5fe9548d832485f7133b8ba82860f04da00c7f655d701c7550460c0172a2a2d31ef3f3f96038')
options=(!emptydirs)
prepare() {
- cd "${srcdir}/${_pkgbase}-${pkgver}/ext"
+ cd "${srcdir}/${_pkgbase}-${pkgver}"
+ patch -p1 -i "${srcdir}/enchant-2.patch"
- if [ ! -d "pthreads" ]; then
- mv "${srcdir}/pthreads-${_pthreadversion}" pthreads
- sed -i 's/{ZEND_STRL("cli")}/{ZEND_STRL("homegear")}/g' pthreads/php_pthreads.c
+ if [ ! -d "ext/pthreads" ]; then
+ mv "${srcdir}/pthreads-${_pthreadversion}" ext/pthreads
+ sed -i 's/{ZEND_STRL("cli")}/{ZEND_STRL("homegear")}/g' ext/pthreads/php_pthreads.c
fi
}
@@ -103,14 +106,14 @@ build() {
package() {
- cd ${srcdir}/${_pkgbase}-${pkgver}
+ cd "${srcdir}/${_pkgbase}-${pkgver}"
make INSTALL_ROOT="${pkgdir}" install
- mv ${pkgdir}/usr/include/php7-homegear/php/* ${pkgdir}/usr/include/php7-homegear/
- install -d -m755 ${pkgdir}/usr/lib
- mv ${pkgdir}/usr/lib/homegear/php/lib/libphp7.a ${pkgdir}/usr/lib/libphp7-homegear.a
+ mv "${pkgdir}/usr/include/php7-homegear/php/"* "${pkgdir}/usr/include/php7-homegear/"
+ install -d -m755 "${pkgdir}/usr/lib"
+ mv "${pkgdir}/usr/lib/homegear/php/lib/libphp7.a" "${pkgdir}/usr/lib/libphp7-homegear.a"
- rm -r ${pkgdir}/usr/lib/homegear
- rm -r ${pkgdir}/man
+ rm -r "${pkgdir}/usr/lib/homegear"
+ rm -r "${pkgdir}/man"
}
diff --git a/enchant-2.patch b/enchant-2.patch
new file mode 100644
index 00000000000..93c0ce5c269
--- /dev/null
+++ b/enchant-2.patch
@@ -0,0 +1,84 @@
+--- php-7.1.13/ext/enchant/config.m4.orig 2018-01-03 02:32:29.000000000 +0000
++++ php-7.1.13/ext/enchant/config.m4 2018-01-21 22:10:03.788875780 +0000
+@@ -14,9 +14,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
+@@ -31,7 +31,7 @@
+
+ AC_DEFINE(HAVE_ENCHANT,1,[ ])
+ PHP_SUBST(ENCHANT_SHARED_LIBADD)
+- PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(enchant-2, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
+ 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 @@
+ for (i = 0; i < n_sugg; i++) {
+ add_next_index_string(sugg, suggs[i]);
+ }
+- enchant_dict_free_suggestions(pdict->pdict, suggs);
++ enchant_dict_free_string_list(pdict->pdict, suggs);
+ }
+
+
+@@ -798,7 +798,7 @@
+ add_next_index_string(return_value, suggs[i]);
+ }
+
+- enchant_dict_free_suggestions(pdict->pdict, suggs);
++ enchant_dict_free_string_list(pdict->pdict, suggs);
+ }
+ }
+ /* }}} */
+@@ -818,7 +818,7 @@
+
+ PHP_ENCHANT_GET_DICT;
+
+- enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
++ enchant_dict_add(pdict->pdict, word, wordlen);
+ }
+ /* }}} */
+
+@@ -856,7 +856,7 @@
+
+ PHP_ENCHANT_GET_DICT;
+
+- RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
++ RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
+ }
+ /* }}} */
+