diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-php/pecl-syck/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-php/pecl-syck/files')
-rw-r--r-- | dev-php/pecl-syck/files/fix-php-5-4-support.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/dev-php/pecl-syck/files/fix-php-5-4-support.patch b/dev-php/pecl-syck/files/fix-php-5-4-support.patch new file mode 100644 index 00000000000..c88fe34ff59 --- /dev/null +++ b/dev-php/pecl-syck/files/fix-php-5-4-support.patch @@ -0,0 +1,43 @@ +Gentooo bug 409963 + + +diff --git a/ext/php/phpext.c b/ext/php/phpext.c +index a7d7500..c0b5646 100644 +--- a/ext/php/phpext.c ++++ b/ext/php/phpext.c +@@ -198,7 +198,7 @@ static int psex_determine_array_type(HashTable *myht TSRMLS_DC) /* {{{ */ + + + +-function_entry syck_functions[] = { ++zend_function_entry syck_functions[] = { + PHP_FE(syck_load, arginfo_syck_load) + PHP_FE(syck_dump, arginfo_syck_dump) + {NULL, NULL, NULL} /* Must be the last line in syck_functions[] */ +@@ -403,7 +403,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n) + + strncpy(classname, n->type_id + 12, classname_len + 1); + +- if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) { ++ if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) { + zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr); + efree(classname); + break; +@@ -439,7 +439,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n) + + strncpy(classname, n->type_id + 11, classname_len + 1); + +- if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) { ++ if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) { + zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr); + efree(classname); + break; +@@ -511,7 +511,7 @@ SYMID php_syck_handler(SyckParser *p, SyckNode *n) + + strncpy(classname, n->type_id + 10, classname_len + 1); + +- if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) { ++ if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) { + zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr); + efree(classname); + break; |