diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 151 | ||||
| -rw-r--r-- | enchant2.patch | 100 |
3 files changed, 182 insertions, 75 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Oct 26 13:15:43 UTC 2017 +# Mon Feb 26 17:50:29 UTC 2018 pkgbase = php55 pkgdesc = A general-purpose scripting language that is especially suited to web development pkgver = 5.5.38 - pkgrel = 4 + pkgrel = 5 url = http://php.net arch = i686 arch = x86_64 @@ -35,6 +35,7 @@ pkgbase = php55 source = https://php.net/distributions/php-5.5.38.tar.xz source = https://php.net/distributions/php-5.5.38.tar.xz.asc source = php.ini.patch + source = enchant2.patch source = apache.conf source = php-fpm.conf.in.patch source = logrotate.d.php-fpm @@ -43,6 +44,7 @@ pkgbase = php55 sha512sums = c2cdb18b2c9edaeff66591e8f58f8ff488260f537cdf9ce09820c163f20ff5209c0def89343d429932c9506ad4ef3daacf224946dac1c59622501092483f30c6 sha512sums = SKIP sha512sums = 4d4a5707d4ceed0b3800b3f89194732f1cf7514059dc38d86ed07aaa746919bdf33422095e91f3b766b202897a7afb8e9dc3f7f7a7f3a09595af057c4244286e + sha512sums = dbb8b433605da0b98f2381d52964258f5bab3718425e1d4b83e10ada55f131810348b28ddfe39465c97a69a3ab55c4d8f5788be298549adb4efe531ceb6bcc1e sha512sums = a20711e301648c0e7080688d2a2522f8b6a94d35dc4a09169795618f7b09613490b46ae1805ffffca63bc29f3f4b1d36705dec1bcc55e293fc51a31a6c346d8c sha512sums = 4927464cfb7e47da1a1df939b2fa517e8289e1455c755eb4fa979b20312a8cb9b48f87780e26850e127434e7d1301ea97d38e2623279b09731d0a86ac4b9b61d sha512sums = 4921bf879f8d16b2b00e4de4676c001c8192eb9163fa28c5c7e3364fe119405414ad732eef865a37cdfd6348f33941b17791226841eaeb44b9b9e8e5bf2bb2d3 @@ -26,7 +26,7 @@ pkgname=("${pkgbase}" "${pkgbase}-tidy" "${pkgbase}-xsl") pkgver=5.5.38 -pkgrel=4 +pkgrel=5 pkgdesc="A general-purpose scripting language that is especially suited to web development" arch=('i686' 'x86_64') license=('PHP') @@ -38,11 +38,12 @@ makedepends=('apache' 'c-client' 'postgresql-libs' 'libldap' 'smtp-forwarder' source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz" "https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz.asc" - 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' + 'php.ini.patch' 'enchant2.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') sha512sums=('c2cdb18b2c9edaeff66591e8f58f8ff488260f537cdf9ce09820c163f20ff5209c0def89343d429932c9506ad4ef3daacf224946dac1c59622501092483f30c6' 'SKIP' '4d4a5707d4ceed0b3800b3f89194732f1cf7514059dc38d86ed07aaa746919bdf33422095e91f3b766b202897a7afb8e9dc3f7f7a7f3a09595af057c4244286e' + 'dbb8b433605da0b98f2381d52964258f5bab3718425e1d4b83e10ada55f131810348b28ddfe39465c97a69a3ab55c4d8f5788be298549adb4efe531ceb6bcc1e' 'a20711e301648c0e7080688d2a2522f8b6a94d35dc4a09169795618f7b09613490b46ae1805ffffca63bc29f3f4b1d36705dec1bcc55e293fc51a31a6c346d8c' '4927464cfb7e47da1a1df939b2fa517e8289e1455c755eb4fa979b20312a8cb9b48f87780e26850e127434e7d1301ea97d38e2623279b09731d0a86ac4b9b61d' '4921bf879f8d16b2b00e4de4676c001c8192eb9163fa28c5c7e3364fe119405414ad732eef865a37cdfd6348f33941b17791226841eaeb44b9b9e8e5bf2bb2d3' @@ -52,13 +53,17 @@ validpgpkeys=('6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3' '0BD78B5F97500D450838F95DFE857D9A90D90EC1') prepare() { - cd ${srcdir}/${_pkgbase}-${pkgver} + cd "${srcdir}/${_pkgbase}-${pkgver}" - patch -p0 -i ${srcdir}/php.ini.patch - patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + patch -p0 -i "${srcdir}/php.ini.patch" + patch -p0 -i "${srcdir}/php-fpm.conf.in.patch" # Just because our Apache 2.4 is configured with a threaded MPM by default does not mean we want to build a ZTS PHP. # Let's supress this behaviour and build a SAPI that works fine with the prefork MPM. sed '/APACHE_THREADED_MPM=/d' -i sapi/apache2handler/config.m4 -i configure + + # thanks to Jörg Schuck for providing this patch + # https://gist.github.com/jschuck/5d237974e5856a221ccb347c9ccf8711 + patch -p0 -N -i "${srcdir}/enchant2.patch" } build() { @@ -140,15 +145,15 @@ build() { --with-zlib \ " - export EXTENSION_DIR=/usr/lib/${pkgbase}/modules - export PEAR_INSTALLDIR=/usr/share/${pkgbase}/pear + export EXTENSION_DIR="/usr/lib/${pkgbase}/modules" + export PEAR_INSTALLDIR="/usr/share/${pkgbase}/pear" export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig - cd ${srcdir}/${_pkgbase}-${pkgver} + cd "${srcdir}/${_pkgbase}-${pkgver}" # php - mkdir -p ${srcdir}/build-php - cd ${srcdir}/build-php + mkdir -p "${srcdir}/build-php" + cd "${srcdir}/build-php" ln -sf ../${_pkgbase}-${pkgver}/configure ./configure ${_phpconfig} \ --disable-cgi \ @@ -159,8 +164,8 @@ build() { # cgi and fcgi # reuse the previous run; this will save us a lot of time - cp -Ta ${srcdir}/build-php ${srcdir}/build-cgi - cd ${srcdir}/build-cgi + cp -Ta "${srcdir}/build-php" "${srcdir}/build-cgi" + cd "${srcdir}/build-cgi" ./configure ${_phpconfig} \ --disable-cli \ --enable-cgi \ @@ -168,8 +173,8 @@ build() { make # apache - cp -Ta ${srcdir}/build-php ${srcdir}/build-apache - cd ${srcdir}/build-apache + cp -Ta "${srcdir}/build-php" "${srcdir}/build-apache" + cd "${srcdir}/build-apache" ./configure ${_phpconfig} \ --disable-cli \ --with-apxs2 \ @@ -177,8 +182,8 @@ build() { make # fpm - cp -Ta ${srcdir}/build-php ${srcdir}/build-fpm - cd ${srcdir}/build-fpm + cp -Ta "${srcdir}/build-php" "${srcdir}/build-fpm" + cd "${srcdir}/build-fpm" ./configure ${_phpconfig} \ --disable-cli \ --enable-fpm \ @@ -188,8 +193,8 @@ build() { make # embed - cp -Ta ${srcdir}/build-php ${srcdir}/build-embed - cd ${srcdir}/build-embed + cp -Ta "${srcdir}/build-php" "${srcdir}/build-embed" + cd "${srcdir}/build-embed" ./configure ${_phpconfig} \ --disable-cli \ --enable-embed=shared \ @@ -197,8 +202,8 @@ build() { make # pear - cp -Ta ${srcdir}/build-php ${srcdir}/build-pear - cd ${srcdir}/build-pear + cp -Ta "${srcdir}/build-php" "${srcdir}/build-pear" + cd "${srcdir}/build-pear" ./configure ${_phpconfig} \ --disable-cgi \ --with-readline \ @@ -214,41 +219,41 @@ package_php55() { backup=("etc/${pkgbase}/php.ini") provides=("${_pkgbase}=$pkgver") - cd ${srcdir}/build-php - make -j1 INSTALL_ROOT=${pkgdir} install + cd "${srcdir}/build-php" + make -j1 INSTALL_ROOT="${pkgdir}" install # install php.ini - install -D -m644 ${srcdir}/${_pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/${pkgbase}/php.ini - install -d -m755 ${pkgdir}/etc/${pkgbase}/conf.d/ + install -D -m644 "${srcdir}/${_pkgbase}-${pkgver}/php.ini-production" "${pkgdir}/etc/${pkgbase}/php.ini" + install -d -m755 "${pkgdir}/etc/${pkgbase}/conf.d/" # remove static modules - rm -f ${pkgdir}/usr/lib/${pkgbase}/modules/*.a + rm -f "${pkgdir}/usr/lib/${pkgbase}/modules/*.a" # remove modules provided by sub packages - rm -f ${pkgdir}/usr/lib/${pkgbase}/modules/{enchant,gd,imap,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + rm -f "${pkgdir}"/usr/lib/${pkgbase}/modules/{enchant,gd,imap,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so # remove empty directory - rmdir ${pkgdir}/usr/include/php/include + rmdir "${pkgdir}/usr/include/php/include" # move include directory - mv ${pkgdir}/usr/include/php ${pkgdir}/usr/include/${pkgbase} + mv "${pkgdir}/usr/include/php" "${pkgdir}/usr/include/${pkgbase}" # fix phar symlink - rm ${pkgdir}/usr/bin/phar - ln -sf phar.${pkgbase/php/phar} ${pkgdir}/usr/bin/${pkgbase/php/phar} + rm "${pkgdir}/usr/bin/phar" + ln -sf "phar.${pkgbase/php/phar}" "${pkgdir}/usr/bin/${pkgbase/php/phar}" # rename executables - mv ${pkgdir}/usr/bin/phar.{phar,${pkgbase/php/phar}} + mv "${pkgdir}"/usr/bin/phar.{phar,${pkgbase/php/phar}} # rename man pages - mv ${pkgdir}/usr/share/man/man1/{phar,${pkgbase/php/phar}}.1 - mv ${pkgdir}/usr/share/man/man1/phar.{phar,${pkgbase/php/phar}}.1 + mv "${pkgdir}"/usr/share/man/man1/{phar,${pkgbase/php/phar}}.1 + mv "${pkgdir}"/usr/share/man/man1/phar.{phar,${pkgbase/php/phar}}.1 # fix paths in executables - sed -i "/^includedir=/c \includedir=/usr/include/${pkgbase}" ${pkgdir}/usr/bin/${pkgbase/php/phpize} - sed -i "/^include_dir=/c \include_dir=/usr/include/${pkgbase}" ${pkgdir}/usr/bin/${pkgbase/php/php-config} + sed -i "/^includedir=/c \includedir=/usr/include/${pkgbase}" "${pkgdir}/usr/bin/${pkgbase/php/phpize}" + sed -i "/^include_dir=/c \include_dir=/usr/include/${pkgbase}" "${pkgdir}/usr/bin/${pkgbase/php/php-config}" # make phpize use php-config55 - sed -i "/^\[ --with-php-config=/c \[ --with-php-config=PATH Path to php-config [${pkgbase/php/php-config}]], ${pkgbase/php/php-config}, no)" ${pkgdir}/usr/lib/${pkgbase}/build/phpize.m4 + sed -i "/^\[ --with-php-config=/c \[ --with-php-config=PATH Path to php-config [${pkgbase/php/php-config}]], ${pkgbase/php/php-config}, no)" "${pkgdir}/usr/lib/${pkgbase}/build/phpize.m4" } package_php55-cgi() { @@ -256,7 +261,7 @@ package_php55-cgi() { depends=("${pkgbase}") provides=("${_pkgbase}-cgi=$pkgver") - install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/${pkgbase}-cgi + install -D -m755 "${srcdir}/build-cgi/sapi/cgi/php-cgi" "${pkgdir}/usr/bin/${pkgbase}-cgi" } package_php55-apache() { @@ -266,8 +271,8 @@ package_php55-apache() { backup=("etc/httpd/conf/extra/${pkgbase}_module.conf") install='php-apache.install' - install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/lib${pkgbase}.so - install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/${pkgbase}_module.conf + install -D -m755 "${srcdir}/build-apache/libs/libphp5.so" "${pkgdir}/usr/lib/httpd/modules/lib${pkgbase}.so" + install -D -m644 "${srcdir}/apache.conf" "${pkgdir}/etc/httpd/conf/extra/${pkgbase}_module.conf" } package_php55-fpm() { @@ -277,18 +282,18 @@ package_php55-fpm() { backup=("etc/${pkgbase}/php-fpm.conf") install='php-fpm.install' - install -d -m755 ${pkgdir}/usr/bin - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/bin/${pkgbase}-fpm + install -d -m755 "${pkgdir}/usr/bin" + install -D -m755 "${srcdir}/build-fpm/sapi/fpm/php-fpm" "${pkgdir}/usr/bin/${pkgbase}-fpm" - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/${pkgbase}-fpm.8 - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/${pkgbase}/php-fpm.conf + install -D -m644 "${srcdir}/build-fpm/sapi/fpm/php-fpm.8" "${pkgdir}/usr/share/man/man8/${pkgbase}-fpm.8" + install -D -m644 "${srcdir}/build-fpm/sapi/fpm/php-fpm.conf" "${pkgdir}/etc/${pkgbase}/php-fpm.conf" - install -d -m755 ${pkgdir}/etc/${pkgbase}/fpm.d - install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}-fpm.conf - install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/${pkgbase}-fpm.service + install -d -m755 "${pkgdir}/etc/${pkgbase}/fpm.d" + install -D -m644 "${srcdir}/php-fpm.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}-fpm.conf" + install -D -m644 "${srcdir}/php-fpm.service" "${pkgdir}/usr/lib/systemd/system/${pkgbase}-fpm.service" - install -d -m755 ${pkgdir}/etc/logrotate.d - install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/${pkgbase}-fpm + install -d -m755 "${pkgdir}/etc/logrotate.d" + install -D -m644 "${srcdir}/logrotate.d.php-fpm" "${pkgdir}/etc/logrotate.d/${pkgbase}-fpm" } package_php55-embed() { @@ -296,8 +301,8 @@ package_php55-embed() { depends=("${pkgbase}") provides=("${_pkgbase}-embed=$pkgver") - install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp55.so - install -D -m644 ${srcdir}/${_pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/${pkgbase}/sapi/embed/php_embed.h + install -D -m755 "${srcdir}/build-embed/libs/libphp5.so" "${pkgdir}/usr/lib/libphp55.so" + install -D -m644 "${srcdir}/${_pkgbase}-${pkgver}/sapi/embed/php_embed.h" "${pkgdir}/usr/include/${pkgbase}/sapi/embed/php_embed.h" } package_php55-pear() { @@ -306,13 +311,13 @@ package_php55-pear() { provides=("${_pkgbase}-pear=$pkgver") backup=("etc/${pkgbase}/pear.conf") - cd ${srcdir}/build-pear - make install-pear INSTALL_ROOT=${pkgdir} - rm -rf ${pkgdir}/usr/share/${pkgbase}/pear/.{channels,depdb,depdblock,filemap,lock,registry} + cd "${srcdir}/build-pear" + make install-pear INSTALL_ROOT="${pkgdir}" + rm -rf "${pkgdir}"/usr/share/${pkgbase}/pear/.{channels,depdb,depdblock,filemap,lock,registry} - mv ${pkgdir}/usr/bin/{pear,${pkgbase/php/pear}} - mv ${pkgdir}/usr/bin/{peardev,${pkgbase/php/peardev}} - mv ${pkgdir}/usr/bin/{pecl,${pkgbase/php/pecl}} + mv "${pkgdir}"/usr/bin/{pear,${pkgbase/php/pear}} + mv "${pkgdir}"/usr/bin/{peardev,${pkgbase/php/peardev}} + mv "${pkgdir}"/usr/bin/{pecl,${pkgbase/php/pecl}} # fix hardcoded php paths in pear sed -i 's|/usr/bin/php|/usr/bin/php55|g' "${pkgdir}/usr/bin/pear55" @@ -325,7 +330,7 @@ package_php55-enchant() { depends=("${pkgbase}" 'enchant') provides=("${_pkgbase}-enchant=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/${pkgbase}/modules/enchant.so + install -D -m755 "${srcdir}/build-php/modules/enchant.so" "${pkgdir}/usr/lib/${pkgbase}/modules/enchant.so" } package_php55-gd() { @@ -333,7 +338,7 @@ package_php55-gd() { depends=("${pkgbase}" 'gd') provides=("${_pkgbase}-gd=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/${pkgbase}/modules/gd.so + install -D -m755 "${srcdir}/build-php/modules/gd.so" "${pkgdir}/usr/lib/${pkgbase}/modules/gd.so" } package_php55-imap() { @@ -341,7 +346,7 @@ package_php55-imap() { depends=("${pkgbase}" 'c-client') provides=("${_pkgbase}-imap=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/imap.so ${pkgdir}/usr/lib/${pkgbase}/modules/imap.so + install -D -m755 "${srcdir}/build-php/modules/imap.so" "${pkgdir}/usr/lib/${pkgbase}/modules/imap.so" } package_php55-intl() { @@ -349,7 +354,7 @@ package_php55-intl() { depends=("${pkgbase}" 'icu') provides=("${_pkgbase}-intl=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/${pkgbase}/modules/intl.so + install -D -m755 "${srcdir}/build-php/modules/intl.so" "${pkgdir}/usr/lib/${pkgbase}/modules/intl.so" } package_php55-ldap() { @@ -357,7 +362,7 @@ package_php55-ldap() { depends=("${pkgbase}" 'libldap') provides=("${pkgbase}-ldap=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/${pkgbase}/modules/ldap.so + install -D -m755 "${srcdir}/build-php/modules/ldap.so" "${pkgdir}/usr/lib/${pkgbase}/modules/ldap.so" } package_php55-mcrypt() { @@ -365,7 +370,7 @@ package_php55-mcrypt() { depends=("${pkgbase}" 'libmcrypt' 'libltdl') provides=("${_pkgbase}-mcrypt=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/${pkgbase}/modules/mcrypt.so + install -D -m755 "${srcdir}/build-php/modules/mcrypt.so" "${pkgdir}/usr/lib/${pkgbase}/modules/mcrypt.so" } package_php55-mssql() { @@ -373,7 +378,7 @@ package_php55-mssql() { depends=("${pkgbase}" 'freetds') provides=("${_pkgbase}-mssql=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/${pkgbase}/modules/mssql.so + install -D -m755 "${srcdir}/build-php/modules/mssql.so" "${pkgdir}/usr/lib/${pkgbase}/modules/mssql.so" } package_php55-odbc() { @@ -381,8 +386,8 @@ package_php55-odbc() { depends=("${pkgbase}" 'unixodbc') provides=("${_pkgbase}-odbc=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/${pkgbase}/modules/odbc.so - install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/${pkgbase}/modules/pdo_odbc.so + install -D -m755 "${srcdir}/build-php/modules/odbc.so" "${pkgdir}/usr/lib/${pkgbase}/modules/odbc.so" + install -D -m755 "${srcdir}/build-php/modules/pdo_odbc.so" "${pkgdir}/usr/lib/${pkgbase}/modules/pdo_odbc.so" } package_php55-pgsql() { @@ -390,8 +395,8 @@ package_php55-pgsql() { depends=("${pkgbase}" 'postgresql-libs') provides=("${_pkgbase}-pgsql=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/${pkgbase}/modules/pgsql.so - install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/${pkgbase}/modules/pdo_pgsql.so + install -D -m755 "${srcdir}/build-php/modules/pgsql.so" "${pkgdir}/usr/lib/${pkgbase}/modules/pgsql.so" + install -D -m755 "${srcdir}/build-php/modules/pdo_pgsql.so" "${pkgdir}/usr/lib/${pkgbase}/modules/pdo_pgsql.so" } package_php55-pspell() { @@ -399,7 +404,7 @@ package_php55-pspell() { depends=("${pkgbase}" 'aspell') provides=("${_pkgbase}-pspell=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/${pkgbase}/modules/pspell.so + install -D -m755 "${srcdir}/build-php/modules/pspell.so" "${pkgdir}/usr/lib/${pkgbase}/modules/pspell.so" } package_php55-snmp() { @@ -407,7 +412,7 @@ package_php55-snmp() { depends=("${pkgbase}" 'net-snmp') provides=("${_pkgbase}-snmp=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/${pkgbase}/modules/snmp.so + install -D -m755 "${srcdir}/build-php/modules/snmp.so" "${pkgdir}/usr/lib/${pkgbase}/modules/snmp.so" } package_php55-sqlite() { @@ -415,8 +420,8 @@ package_php55-sqlite() { depends=("${pkgbase}" 'sqlite') provides=("${_pkgbase}-sqlite=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/${pkgbase}/modules/sqlite3.so - install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/${pkgbase}/modules/pdo_sqlite.so + install -D -m755 "${srcdir}/build-php/modules/sqlite3.so" "${pkgdir}/usr/lib/${pkgbase}/modules/sqlite3.so" + install -D -m755 "${srcdir}/build-php/modules/pdo_sqlite.so" "${pkgdir}/usr/lib/${pkgbase}/modules/pdo_sqlite.so" } package_php55-tidy() { @@ -424,7 +429,7 @@ package_php55-tidy() { depends=("${pkgbase}" 'tidyhtml') provides=("${_pkgbase}-tidy=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/${pkgbase}/modules/tidy.so + install -D -m755 "${srcdir}/build-php/modules/tidy.so" "${pkgdir}/usr/lib/${pkgbase}/modules/tidy.so" } package_php55-xsl() { @@ -432,5 +437,5 @@ package_php55-xsl() { depends=("${pkgbase}" 'libxslt') provides=("${_pkgbase}-xsl=$pkgver") - install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/${pkgbase}/modules/xsl.so + install -D -m755 "${srcdir}/build-php/modules/xsl.so" "${pkgdir}/usr/lib/${pkgbase}/modules/xsl.so" } diff --git a/enchant2.patch b/enchant2.patch new file mode 100644 index 000000000000..49dfa8987667 --- /dev/null +++ b/enchant2.patch @@ -0,0 +1,100 @@ +--- configure 2016-07-20 14:21:48.000000000 +0200 ++++ configure 2018-02-26 18:27:32.473932890 +0100 +@@ -34949,9 +34947,9 @@ EOF + 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 +@@ -34973,7 +34971,7 @@ $as_echo "#define HAVE_ENCHANT 1" >>conf + + + 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 +@@ -35057,7 +35055,7 @@ $as_echo "#define HAVE_ENCHANT 1" >>conf + case enchant in + c|c_r|pthread*) ;; + *) +- LIBS="-lenchant $LIBS" ++ LIBS="-lenchant-2 $LIBS" + ;; + esac + +@@ -35193,13 +35191,13 @@ $as_echo "#define HAVE_ENCHANT 1" >>conf + esac + done + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5 +-$as_echo_n "checking for enchant_broker_set_param in -lenchant... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant-2" >&5 ++$as_echo_n "checking for enchant_broker_set_param in -lenchant-2... " >&6; } + if ${ac_cv_lib_enchant_enchant_broker_set_param+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lenchant $LIBS" ++LIBS="-lenchant-2 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +--- ext/enchant/config.m4 2016-07-20 10:41:48.000000000 +0200 ++++ ext/enchant/config.m4 2018-02-26 18:38:19.950883183 +0100 +@@ -14,9 +14,9 @@ if test "$PHP_ENCHANT" != "no"; then + 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 +--- ext/enchant/enchant.c 2016-07-20 10:41:48.000000000 +0200 ++++ ext/enchant/enchant.c 2018-02-26 18:37:51.598885359 +0100 +@@ -750,7 +750,7 @@ PHP_FUNCTION(enchant_dict_quick_check) + for (i = 0; i < n_sugg; i++) { + add_next_index_string(sugg, suggs[i], 1); + } +- enchant_dict_free_suggestions(pdict->pdict, suggs); ++ enchant_dict_free_string_list(pdict->pdict, suggs); + } + + +@@ -807,7 +807,7 @@ PHP_FUNCTION(enchant_dict_suggest) + add_next_index_string(return_value, suggs[i], 1); + } + +- enchant_dict_free_suggestions(pdict->pdict, suggs); ++ enchant_dict_free_string_list(pdict->pdict, suggs); + } + } + /* }}} */ +@@ -827,7 +827,7 @@ PHP_FUNCTION(enchant_dict_add_to_persona + + PHP_ENCHANT_GET_DICT; + +- enchant_dict_add_to_personal(pdict->pdict, word, wordlen); ++ enchant_dict_add(pdict->pdict, word, wordlen); + } + /* }}} */ + +@@ -865,7 +865,7 @@ PHP_FUNCTION(enchant_dict_is_in_session) + + 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)); + } + /* }}} */ |