The php5 iconv patch in ~/aports/main/php/gd-iconv.patch also applies ok
in php7
Timo prefers that to be applied instead of mine.
Stuart.
On 04/04/2016 07:48 PM, Valery Kartel wrote:
> I join your patch to my newly created one to add it all in one shot
>
> 2016-04-03 20:23 GMT+03:00 Stuart Cardall <developer@it-offshore.co.uk
> <mailto:developer@it-offshore.co.uk>>:
>
> ---
> Changes v1 -> v2:
> - pkgrel bumped correctly
> = this should apply cleanly after Valery's 7.0.5 patch sent today
>
> testing/php7/APKBUILD | 27 +++++++++++++++++----------
> testing/php7/libintl-iconv.patch | 10 ++++++++++
> 2 files changed, 27 insertions(+), 10 deletions(-)
> create mode 100644 testing/php7/libintl-iconv.patch
>
> diff --git a/testing/php7/APKBUILD b/testing/php7/APKBUILD
> index 34a2408..1b62a93 100644
> --- a/testing/php7/APKBUILD
> +++ b/testing/php7/APKBUILD
> @@ -3,7 +3,7 @@
> pkgname=php7
> _pkgreal=php
> pkgver=7.0.5
> -pkgrel=0
> +pkgrel=1
> pkgdesc="The PHP language runtime engine - 7th branch"
> url="http://www.php.net/"
> arch="x86_64 armhf"
> @@ -16,8 +16,8 @@ makedepends="autoconf bison re2c apache2-dev
> libxml2-dev libxslt-dev libzip-dev
> libical-dev openssl-dev openldap-dev net-snmp-dev db-dev
> krb5-dev gdbm-dev sqlite-dev
> freetds-dev mariadb-dev postgresql-dev unixodbc-dev
> freetype-dev tidyhtml-dev libxpm-dev
> libpng-dev libwebp-dev libjpeg-turbo-dev libmcrypt-dev
> libmbfl-dev gsoap-dev recode-dev
> - readline-dev mhash-dev paxmark
> -"
> + readline-dev mhash-dev paxmark gettext-dev
> + "
>
> subpackages="$pkgname-dev $pkgname-doc
> $pkgname-apache2 $pkgname-phpdbg $pkgname-embed
> $pkgname-litespeed $pkgname-cgi $pkgname-fpm
> @@ -35,6 +35,7 @@ subpackages="$pkgname-dev $pkgname-doc
> $pkgname-gd
> $pkgname-gettext
> $pkgname-gmp
> + $pkgname-iconv
> $pkgname-imap
> $pkgname-intl
> $pkgname-json
> @@ -87,6 +88,7 @@
> source="http://php.net/distributions/$_pkgreal-$pkgver.tar.bz2
> includedir.patch
> pid_log.patch
> fix-crypt.patch
> + libintl-iconv.patch
> "
>
> _apiver="20151012"
> @@ -142,6 +144,7 @@ _build() {
> --with-gettext=shared \
> --with-gmp=shared \
> --with-mhash=shared \
> + --with-iconv=shared \
> --with-imap=shared --with-imap-ssl \
> --enable-intl=shared --with-icu-dir=/usr \
> --enable-json=shared \
> @@ -187,7 +190,7 @@ build() {
> # phpdbg
> _build --enable-phpdbg \
> --enable-phpdbg \
> - --enable-phpdbg-webhelper \
> + --enable-phpdbg-webhelper \
> --enable-phpdbg-debug \
> --disable-cgi \
> --disable-cli \
> @@ -355,6 +358,7 @@ ftp() { _mv_ext ftp; }
> gd() { _mv_ext gd; }
> gettext() { _mv_ext gettext; }
> gmp() { _mv_ext gmp; }
> +iconv() { _mv_ext iconv; }
> imap() { _mv_ext imap; }
> intl() { _mv_ext intl; }
> json() { _mv_ext json; }
> @@ -400,7 +404,7 @@ xsl() { _mv_ext xsl $pkgname-dom; }
> zip() { _mv_ext zip; }
> zlib() { _mv_ext zlib; }
>
> -md5sums="0171201350941327399a5c3e678a86e5 php-7.0.4.tar.bz2
> +md5sums="b15e6836babcbf0aa446678ee38f896b php-7.0.5.tar.bz2
> a340f27e83ed4482d2fbb98658ef71cb php7-fpm.initd
> 25bde13e7894c2930d97fad68d5dd3b3 php7-fpm.logrotate
> 47be6cd1ed92f21579e15bf2003a709f php7-module.conf
> @@ -408,8 +412,9 @@ a340f27e83ed4482d2fbb98658ef71cb php7-fpm.initd
> 66f0037a029f9eed2b31d2e1d50f1860 tidy-buffio.patch
> d872e633c9b33c3c9f629dd2edd2e5c5 includedir.patch
> 6ba762ab7a105163b8e5b3913deae109 pid_log.patch
> -7f12fabdd1494e1c994cadd167e401d8 fix-crypt.patch"
> -sha256sums="a246c503709c189ba8e1e22ed2cb22abc27da43a997ff1b3318e181baf529dcc
> php-7.0.4.tar.bz2
> +7f12fabdd1494e1c994cadd167e401d8 fix-crypt.patch
> +c11468cd2c8524a2aefcd82b3b7d43d1 libintl-iconv.patch"
> +sha256sums="2c09af7fe64537ea795f098b9b542ead407ef83f7cdc65b3787115ccbbb51de9
> php-7.0.5.tar.bz2
> eca59e8b0498c1c93b35f9a5109ae56d0cda9d94822727d689371ccad31b3615
> php7-fpm.initd
> 6e4406f21b69085714cdb9d9a67c08e27a1c737ab353f9813cb2fc268352d2c6
> php7-fpm.logrotate
> 276c823ee666ea73b36d4e97174eeea05713125b61f7f8681e350453c4123143
> php7-module.conf
> @@ -417,8 +422,9 @@
> f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab
> install-pear.p
> 5dc8f32e5e2b1cd6317ada5a5adb9b5f0802ed6e0dbe065d7bfcc0f55d47e0d5
> tidy-buffio.patch
> ea74966a23b1b54548ee35e9ccc2fc8d2b7c2285c385c44d6b23d9e2f25ea1a7
> includedir.patch
> 0cca8729c64682387a8c44ed74f0966da697f2817152d8d05bb25bedc7eaafec
> pid_log.patch
> -ffc10d325be398a5560fe9265e89f056ef2eba27981c98300be30bbc2f18a4ec
> fix-crypt.patch"
> -sha512sums="9d1dc761cdd9103a91299e01117c1790550e3b94e7694dcc2555d83e5abe3d2170acd6226e8501c5f2a77b5c374b1c9f5ea009999d476818c2682a54def86b96
> php-7.0.4.tar.bz2
> +ffc10d325be398a5560fe9265e89f056ef2eba27981c98300be30bbc2f18a4ec
> fix-crypt.patch
> +2b181861240249236f13302ed5669810fd9e57928fad39583ee6d91fd73da2c2
> libintl-iconv.patch"
> +sha512sums="13d6dcd339211b22761586f2804c7470634e00b36e5e0b7bcf5188c017f950cbf49a2d4dd41047a7d44c70ed9474097a7290fc84ee3c26532e2ad8a2cbe706d7
> php-7.0.5.tar.bz2
> 89076ab8e170a8f886b88bb30aa3e6a6b4463155a18ea53485cc9e3898c81afa3d01fb8403d28a45dc1680f09c645c2d81d8272bc8b9c7ced41e59b0ba226216
> php7-fpm.initd
> cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691
> php7-fpm.logrotate
> fbf9a1572d37370ec0d126502e1d066e045a992484d8fc4f1e2ede330134c1a15f4029f29fa4daebd48eed78b045dc051ced69fbf1f11efc7ad81d884a639a99
> php7-module.conf
> @@ -426,4 +432,5 @@
> f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c93976
> 6894c9cba7752a3406e774d9efc0e058c37433493c1c20101e9563bf247c112157a67e306b06b9517b0422eca521f543d637a6cbd2cea7639e43f13d773b3d2b
> tidy-buffio.patch
> 199aecdbd3b4035aabf5379c215f82412d3c98b79a1ee186944e7fe1f0ed6f40789ea30e2355149491de6be34fc66c5e486e2a79a7e41ab2ae18706ef3ffe79b
> includedir.patch
> 82231c7b27b4d044272857dc713674884715ed8e36e54be06faa5d2a949ba4bca597628958a9c5683ec51c36e05a00f6be811c7e95112b0314c98528f584a8d6
> pid_log.patch
> -b4badb1850bf99210498d6e27136ee275379b5c39c52904b292aed204d5c95a845ed53db7dd56856121b3019ffefc7632419f9b2c45f431165ec0b5c5cbe974d
> fix-crypt.patch"
> +b4badb1850bf99210498d6e27136ee275379b5c39c52904b292aed204d5c95a845ed53db7dd56856121b3019ffefc7632419f9b2c45f431165ec0b5c5cbe974d
> fix-crypt.patch
> +7bbcc016f37277f80b31cd6fc552c9cd411faad377fb7a02bb56097250574c4d486a211cff75282cef6aa2be70e7b6e83a3e6b2a830e05a82c618a1b757b92cd
> libintl-iconv.patch"
> diff --git a/testing/php7/libintl-iconv.patch
> b/testing/php7/libintl-iconv.patch
> new file mode 100644
> index 0000000..13c0e22
> --- /dev/null
> +++ b/testing/php7/libintl-iconv.patch
> @@ -0,0 +1,10 @@
> +--- php-7.0.4/ext/standard/string.c
> ++++ php-7.0.4/ext/standard/string.c.new
> +@@ -23,6 +23,7 @@
> + /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
> +
> + #include <stdio.h>
> ++#include <libintl.h>
> + #include "php.h"
> + #include "php_rand.h"
> + #include "php_string.h"
> --
> 2.8.0
>
>
>
> ---
> Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
> <alpine-aports%2Bunsubscribe@lists.alpinelinux.org>
> Help: alpine-aports+help@lists.alpinelinux.org
> <alpine-aports%2Bhelp@lists.alpinelinux.org>
> ---
>
>