cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with oniguruma 6.8.1

Browse Source 
PR:		226717
Submitted by:	Christian Ullrich, madpilot
With hat:	portmgr
This commit is contained in:
Antoine Brodin 2018-03-19 23:01:50 +00:00
parent 898293309a
commit 38423527e8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=465040
4 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
converters/php56-mbstring/files/patch-php__mbregex.c Normal file
View File

@ -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);

11
converters/php70-mbstring/files/patch-php__mbregex.c Normal file
View File

@ -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);

11
converters/php71-mbstring/files/patch-php__mbregex.c Normal file
View File

@ -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);

11
converters/php72-mbstring/files/patch-php__mbregex.c Normal file
View File

@ -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);