diff options
| author |   Brian Evans <grknight@gentoo.org> | 2018-04-04 09:20:44 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2018-04-04 09:21:39 -0400 |
| commit | 8187eb32d10a53a0c837eadb02625329310b3582 (patch) | |
| tree | 668b20f943b521baa229926a35a610a357662037 /dev-lang/php/files | |
| parent | dev-lang/ispc: version bump (diff) | |
| download | gentoo-8187eb32d10a53a0c837eadb02625329310b3582.tar.gz gentoo-8187eb32d10a53a0c837eadb02625329310b3582.tar.bz2 gentoo-8187eb32d10a53a0c837eadb02625329310b3582.zip | |
dev-lang/php: Fix compilation with dev-libs/oniguruma-6.8.1
Include upstream patch for all 7.0 versions
Limit version in 5.6.35-r1 as the patch is not the same there
Closes: https://bugs.gentoo.org/652352
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Diffstat (limited to 'dev-lang/php/files')
| -rw-r--r-- | dev-lang/php/files/mbstring-oniguruma-6.8.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/dev-lang/php/files/mbstring-oniguruma-6.8.patch b/dev-lang/php/files/mbstring-oniguruma-6.8.patch new file mode 100644 index 000000000000..c238f88007c5 --- /dev/null +++ b/dev-lang/php/files/mbstring-oniguruma-6.8.patch @@ -0,0 +1,30 @@ +From 4072b2787074ee8e247a6639585b49e10c5a55fe Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Tue, 20 Mar 2018 16:35:39 +0100 +Subject: [PATCH] Fix #76113: mbstring does not build with Oniguruma 6.8.1 + +As of Oniguruma 6.8.1, the regex structure has been moved from the +public `oniguruma.h` to the private `regint.h`. Thus, it is no longer +possible to directly access the struct's members, and actually, there +is no need to, since there are respective accessor functions available +at least of 2.3.1. +--- + ext/mbstring/php_mbregex.c | 2 +- + 1 file changed, 1 insertions(+), 1 deletion(-) + +diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c +index a5a6cd0..7a70c63 100644 +--- a/ext/mbstring/php_mbregex.c ++++ b/ext/mbstring/php_mbregex.c +@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compile_pattern(const char *pattern, int patl + OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN]; + + rc = zend_hash_str_find_ptr(&MBREX(ht_rc), (char *)pattern, patlen); +- if (!rc || rc->options != options || rc->enc != enc || rc->syntax != syntax) { ++ if (!rc || onig_get_options(rc) != options || onig_get_encoding(rc) != enc || onig_get_syntax(rc) != syntax) { + if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) { + onig_error_code_to_str(err_str, err_code, &err_info); + php_error_docref(NULL, E_WARNING, "mbregex compile err: %s", err_str); +-- +2.1.4 + |