diff options
| author | antoine <antoine@FreeBSD.org> | 2018-03-20 07:01:50 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2018-03-20 07:01:50 +0800 |
| commit | 3c699610ef0f99fdf3da515613906f0f1dfb6478 (patch) | |
| tree | b2945ddaf606e2e50fc3848c753cb146d88bd709 /converters | |
| parent | d4c3beeb57e2752b71a36aa5c7a3bed964117ad6 (diff) | |
| download | freebsd-ports-gnome-3c699610ef0f99fdf3da515613906f0f1dfb6478.tar.gz freebsd-ports-gnome-3c699610ef0f99fdf3da515613906f0f1dfb6478.tar.zst freebsd-ports-gnome-3c699610ef0f99fdf3da515613906f0f1dfb6478.zip | |
Fix build with oniguruma 6.8.1
PR: 226717
Submitted by: Christian Ullrich, madpilot
With hat: portmgr
Diffstat (limited to 'converters')
4 files changed, 44 insertions, 0 deletions
diff --git a/converters/php56-mbstring/files/patch-php__mbregex.c b/converters/php56-mbstring/files/patch-php__mbregex.c new file mode 100644 index 000000000000..42fa01edaa78 --- /dev/null +++ b/converters/php56-mbstring/files/patch-php__mbregex.c @@ -0,0 +1,11 @@ +--- php_mbregex.c.orig 2018-02-27 23:15:25 UTC ++++ php_mbregex.c +@@ -454,7 +454,7 @@ static php_mb_regex_t *php_mbregex_compi + OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN]; + + found = zend_hash_find(&MBREX(ht_rc), (char *)pattern, patlen+1, (void **) &rc); +- if (found == FAILURE || (*rc)->options != options || (*rc)->enc != enc || (*rc)->syntax != syntax) { ++ if (found == FAILURE || 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 TSRMLS_CC, E_WARNING, "mbregex compile err: %s", err_str); diff --git a/converters/php70-mbstring/files/patch-php__mbregex.c b/converters/php70-mbstring/files/patch-php__mbregex.c new file mode 100644 index 000000000000..c7bbf8b00f0b --- /dev/null +++ b/converters/php70-mbstring/files/patch-php__mbregex.c @@ -0,0 +1,11 @@ +--- php_mbregex.c.orig 2018-02-27 13:16:12 UTC ++++ php_mbregex.c +@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compi + 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); diff --git a/converters/php71-mbstring/files/patch-php__mbregex.c b/converters/php71-mbstring/files/patch-php__mbregex.c new file mode 100644 index 000000000000..2ff5486e0419 --- /dev/null +++ b/converters/php71-mbstring/files/patch-php__mbregex.c @@ -0,0 +1,11 @@ +--- php_mbregex.c.orig 2018-02-28 11:19:22 UTC ++++ php_mbregex.c +@@ -452,7 +452,7 @@ static php_mb_regex_t *php_mbregex_compi + 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); diff --git a/converters/php72-mbstring/files/patch-php__mbregex.c b/converters/php72-mbstring/files/patch-php__mbregex.c new file mode 100644 index 000000000000..804a5384a09a --- /dev/null +++ b/converters/php72-mbstring/files/patch-php__mbregex.c @@ -0,0 +1,11 @@ +--- php_mbregex.c.orig 2018-02-27 16:33:04 UTC ++++ php_mbregex.c +@@ -449,7 +449,7 @@ static php_mb_regex_t *php_mbregex_compi + 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); |