[arch-commits] Commit in php71/trunk (PKGBUILD)
Date: Thursday, February 8, 2018 @ 10:47:40
Author: spupykin
Revision: 290261
upgpkg: php71 7.1.14-1
Modified:
php71/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-02-08 10:41:09 UTC (rev 290260)
+++ PKGBUILD2018-02-08 10:47:40 UTC (rev 290261)
@@ -21,8 +21,8 @@
'php71-sqlite'
'php71-tidy'
'php71-xsl')
-pkgver=7.1.13
-pkgrel=4
+pkgver=7.1.14
+pkgrel=1
arch=('x86_64')
license=('PHP')
url='http://www.php.net'
@@ -32,7 +32,7 @@
validpgpkeys=('1729F83938DA44E27BA0F4D3DBDB397470D12172')
source=("https://php.net/distributions/${pkgbase%71}-${pkgver}.tar.xz"{,.asc}
'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch' enchant-2.patch)
-sha256sums=('1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10'
+sha256sums=('c09f0c1074f5689b492d79034adb84e6a6c6d08c6763c02282e6318d41156779'
'SKIP'
'258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3'
'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
[arch-commits] Commit in php71/trunk (PKGBUILD enchant-2.patch)
Date: Sunday, January 21, 2018 @ 22:48:34
Author: jgc
Revision: 284805
upgpkg: php71 7.1.13-4
Adjust enchant-2 patch to fix FS#56835
Modified:
php71/trunk/PKGBUILD
php71/trunk/enchant-2.patch
-+
PKGBUILD|2 +-
enchant-2.patch | 38 ++
2 files changed, 39 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-21 22:21:29 UTC (rev 284804)
+++ PKGBUILD2018-01-21 22:48:34 UTC (rev 284805)
@@ -39,7 +39,7 @@
'7d982a3cefb3eaec0b3458340e4991c2959c10d1518ecb7c1d041884b14efc73'
'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
'78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c'
-'2be98e145bda8c4af53f0013c248d11f0cec48164575de3593fac45a7431eee7')
+'b11c3de747ef222696f5135556d624e3f7f0135a3cb1b06082f1ec8e9b7eeb0a')
prepare() {
cd ${srcdir}/${pkgbase%71}-${pkgver}
Modified: enchant-2.patch
===
--- enchant-2.patch 2018-01-21 22:21:29 UTC (rev 284804)
+++ enchant-2.patch 2018-01-21 22:48:34 UTC (rev 284805)
@@ -44,3 +44,41 @@
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.0
+
php-7.2.1/ext/enchant/enchant.c2018-01-21 22:34:50.205791491 +
+@@ -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));
+ }
+ /* }}} */
+
[arch-commits] Commit in php71/trunk (PKGBUILD enchant-2.patch)
Date: Sunday, January 21, 2018 @ 22:21:19
Author: jgc
Revision: 284803
upgpkg: php71 7.1.13-4
Enchant-2 rebuild
Added:
php71/trunk/enchant-2.patch
Modified:
php71/trunk/PKGBUILD
-+
PKGBUILD|8 +---
enchant-2.patch | 46 ++
2 files changed, 51 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-21 22:01:09 UTC (rev 284802)
+++ PKGBUILD2018-01-21 22:21:19 UTC (rev 284803)
@@ -22,7 +22,7 @@
'php71-tidy'
'php71-xsl')
pkgver=7.1.13
-pkgrel=3
+pkgrel=4
arch=('x86_64')
license=('PHP')
url='http://www.php.net'
@@ -31,7 +31,7 @@
checkdepends=('procps-ng')
validpgpkeys=('1729F83938DA44E27BA0F4D3DBDB397470D12172')
source=("https://php.net/distributions/${pkgbase%71}-${pkgver}.tar.xz"{,.asc}
-'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch')
+'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch' enchant-2.patch)
sha256sums=('1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10'
'SKIP'
'258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3'
@@ -38,7 +38,8 @@
'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
'7d982a3cefb3eaec0b3458340e4991c2959c10d1518ecb7c1d041884b14efc73'
'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
-'78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c')
+'78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c'
+'2be98e145bda8c4af53f0013c248d11f0cec48164575de3593fac45a7431eee7')
prepare() {
cd ${srcdir}/${pkgbase%71}-${pkgver}
@@ -46,6 +47,7 @@
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
}
build() {
Added: enchant-2.patch
===
--- enchant-2.patch (rev 0)
+++ enchant-2.patch 2018-01-21 22:21:19 UTC (rev 284803)
@@ -0,0 +1,46 @@
+--- php-7.1.13/ext/enchant/config.m4.orig 2018-01-03 02:32:29.0
+
php-7.1.13/ext/enchant/config.m4 2018-01-21 22:10:03.788875780 +
+@@ -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 +
php-7.1.13/configure 2018-01-21 22:12:35.932571143 +
+@@ -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
[arch-commits] Commit in php71/trunk (PKGBUILD)
Date: Tuesday, January 16, 2018 @ 08:54:08
Author: spupykin
Revision: 283093
upgpkg: php71 7.1.13-3
Modified:
php71/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-16 08:43:06 UTC (rev 283092)
+++ PKGBUILD2018-01-16 08:54:08 UTC (rev 283093)
@@ -22,7 +22,7 @@
'php71-tidy'
'php71-xsl')
pkgver=7.1.13
-pkgrel=2
+pkgrel=3
arch=('x86_64')
license=('PHP')
url='http://www.php.net'
@@ -173,7 +173,7 @@
depends=('libxml2' 'curl' 'libzip' 'pcre')
conflicts=('php')
backup=('etc/php/php.ini')
- provides=("${pkgname/71/}=${pkgver}")
+ provides=("${pkgname/71/}=${pkgver}" "php71-ldap=${pkgver}"
"php-ldap=${pkgver}")
cd ${srcdir}/build
make -j1 INSTALL_ROOT=${pkgdir}
install-{modules,cli,build,headers,programs,pharcmd}
@@ -191,7 +191,7 @@
package_php71-cgi() {
pkgdesc='CGI and FCGI SAPI for PHP'
depends=('php71')
- conflicts=('php-cgit')
+ conflicts=('php-cgi')
provides=("${pkgname/71/}=${pkgver}")
cd ${srcdir}/build
[arch-commits] Commit in php71/trunk (PKGBUILD)
Date: Tuesday, January 9, 2018 @ 18:13:06
Author: spupykin
Revision: 280742
upgpkg: php71 7.1.13-2
Modified:
php71/trunk/PKGBUILD
--+
PKGBUILD | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-09 18:12:51 UTC (rev 280741)
+++ PKGBUILD2018-01-09 18:13:06 UTC (rev 280742)
@@ -22,7 +22,7 @@
'php71-tidy'
'php71-xsl')
pkgver=7.1.13
-pkgrel=1
+pkgrel=2
arch=('x86_64')
license=('PHP')
url='http://www.php.net'
@@ -173,6 +173,7 @@
depends=('libxml2' 'curl' 'libzip' 'pcre')
conflicts=('php')
backup=('etc/php/php.ini')
+ provides=("${pkgname/71/}=${pkgver}")
cd ${srcdir}/build
make -j1 INSTALL_ROOT=${pkgdir}
install-{modules,cli,build,headers,programs,pharcmd}
@@ -191,6 +192,7 @@
pkgdesc='CGI and FCGI SAPI for PHP'
depends=('php71')
conflicts=('php-cgit')
+ provides=("${pkgname/71/}=${pkgver}")
cd ${srcdir}/build
make -j1 INSTALL_ROOT=${pkgdir} install-cgi
@@ -201,6 +203,7 @@
depends=('php71' 'apache')
backup=('etc/httpd/conf/extra/php7_module.conf')
conflicts=('php-apache')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build-apache/libs/libphp7.so
${pkgdir}/usr/lib/httpd/modules/libphp7.so
install -D -m644 ${srcdir}/apache.conf
${pkgdir}/etc/httpd/conf/extra/php7_module.conf
@@ -212,6 +215,7 @@
backup=('etc/php/php-fpm.conf' 'etc/php/php-fpm.d/www.conf')
options=('!emptydirs')
conflicts=('php-fpm')
+ provides=("${pkgname/71/}=${pkgver}")
cd ${srcdir}/build
make -j1 INSTALL_ROOT=${pkgdir} install-fpm
@@ -224,6 +228,7 @@
depends=('php71' 'libsystemd')
options=('!emptydirs')
conflicts=('php-embed')
+ provides=("${pkgname/71/}=${pkgver}")
cd ${srcdir}/build
make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
@@ -234,6 +239,7 @@
depends=('php71')
options=('!emptydirs')
conflicts=('php-phpdbg')
+ provides=("${pkgname/71/}=${pkgver}")
cd ${srcdir}/build-phpdbg
make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
@@ -243,6 +249,7 @@
pkgdesc='dblib module for PHP'
depends=('php71' 'freetds')
conflicts=('php-dblib')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build/modules/pdo_dblib.so
${pkgdir}/usr/lib/php/modules/pdo_dblib.so
}
@@ -251,6 +258,7 @@
pkgdesc='enchant module for PHP'
depends=('php71' 'enchant')
conflicts=('php-enchant')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build/modules/enchant.so
${pkgdir}/usr/lib/php/modules/enchant.so
}
@@ -259,6 +267,7 @@
pkgdesc='gd module for PHP'
depends=('php71' 'gd')
conflicts=('php-gd')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build/modules/gd.so
${pkgdir}/usr/lib/php/modules/gd.so
}
@@ -267,6 +276,7 @@
pkgdesc='imap module for PHP'
depends=('php71' 'c-client')
conflicts=('php-imap')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build/modules/imap.so
${pkgdir}/usr/lib/php/modules/imap.so
}
@@ -275,6 +285,7 @@
pkgdesc='intl module for PHP'
depends=('php71' 'icu')
conflicts=('php-intl')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build/modules/intl.so
${pkgdir}/usr/lib/php/modules/intl.so
}
@@ -283,6 +294,7 @@
pkgdesc='mcrypt module for PHP'
depends=('php71' 'libmcrypt' 'libtool')
conflicts=('php-mcrypt')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build/modules/mcrypt.so
${pkgdir}/usr/lib/php/modules/mcrypt.so
}
@@ -291,6 +303,7 @@
pkgdesc='ODBC modules for PHP'
depends=('php71' 'unixodbc')
conflicts=('php-odbc')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build/modules/odbc.so
${pkgdir}/usr/lib/php/modules/odbc.so
install -D -m755 ${srcdir}/build/modules/pdo_odbc.so
${pkgdir}/usr/lib/php/modules/pdo_odbc.so
@@ -300,6 +313,7 @@
pkgdesc='PostgreSQL modules for PHP'
depends=('php71' 'postgresql-libs')
conflicts=('php-pgsql')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build/modules/pgsql.so
${pkgdir}/usr/lib/php/modules/pgsql.so
install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so
${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
@@ -309,6 +323,7 @@
pkgdesc='pspell module for PHP'
depends=('php71' 'aspell')
conflicts=('php-pspell')
+ provides=("${pkgname/71/}=${pkgver}")
install -D -m755 ${srcdir}/build/modules/pspell.so
