diff options
author | Konstantin V. Arkhipov <voxus@gentoo.org> | 2007-03-19 20:22:44 +0000 |
---|---|---|
committer | Konstantin V. Arkhipov <voxus@gentoo.org> | 2007-03-19 20:22:44 +0000 |
commit | f391744d1dc262d4e9f02da91be75e3693e8c7ab (patch) | |
tree | 7af4dabd5d756216e0d9bf8ee3d9fe8538b0536e /dev-php5/onphp-module/files | |
parent | Fix dbus deps so dbus-python is always there. Bug #171479 (diff) | |
download | gentoo-2-f391744d1dc262d4e9f02da91be75e3693e8c7ab.tar.gz gentoo-2-f391744d1dc262d4e9f02da91be75e3693e8c7ab.tar.bz2 gentoo-2-f391744d1dc262d4e9f02da91be75e3693e8c7ab.zip |
* ZTS-related fixes
(Portage version: 2.1.2.2)
Diffstat (limited to 'dev-php5/onphp-module/files')
-rw-r--r-- | dev-php5/onphp-module/files/digest-onphp-module-0.6.4-r1 | 3 | ||||
-rw-r--r-- | dev-php5/onphp-module/files/digest-onphp-module-0.8.6-r1 (renamed from dev-php5/onphp-module/files/digest-onphp-module-0.8.6) | 0 | ||||
-rw-r--r-- | dev-php5/onphp-module/files/onphp-module-r2861.patch | 47 |
3 files changed, 50 insertions, 0 deletions
diff --git a/dev-php5/onphp-module/files/digest-onphp-module-0.6.4-r1 b/dev-php5/onphp-module/files/digest-onphp-module-0.6.4-r1 new file mode 100644 index 000000000000..0eeb23b84df1 --- /dev/null +++ b/dev-php5/onphp-module/files/digest-onphp-module-0.6.4-r1 @@ -0,0 +1,3 @@ +MD5 175451577650013e065dc34a33253475 onphp-0.6.4.tar.bz2 105214 +RMD160 464c9598b8274992dcf799dd909d04803756c570 onphp-0.6.4.tar.bz2 105214 +SHA256 77f7713ccb6d0ffc8ebae1d46585b7e6c799687c3f7f9a25d3f6dee28ae5980a onphp-0.6.4.tar.bz2 105214 diff --git a/dev-php5/onphp-module/files/digest-onphp-module-0.8.6 b/dev-php5/onphp-module/files/digest-onphp-module-0.8.6-r1 index de86a85abd30..de86a85abd30 100644 --- a/dev-php5/onphp-module/files/digest-onphp-module-0.8.6 +++ b/dev-php5/onphp-module/files/digest-onphp-module-0.8.6-r1 diff --git a/dev-php5/onphp-module/files/onphp-module-r2861.patch b/dev-php5/onphp-module/files/onphp-module-r2861.patch new file mode 100644 index 000000000000..170a76fb0d5d --- /dev/null +++ b/dev-php5/onphp-module/files/onphp-module-r2861.patch @@ -0,0 +1,47 @@ +--- ext/src/core/Exceptions.c (revision 2857) ++++ ext/src/core/Exceptions.c (working copy) +@@ -28,7 +28,11 @@ + PHPAPI zend_class_entry *onphp_ce_WrongArgumentException; + PHPAPI zend_class_entry *onphp_ce_WrongStateException; + ++#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 2) + #define onphp_ce_Exception zend_exception_get_default() ++#else ++#define onphp_ce_Exception zend_exception_get_default(TSRMLS_C) ++#endif + + PHP_MINIT_FUNCTION(Exceptions) + { +--- ext/src/core/DB/ImaginaryDialect.c (revision 2857) ++++ ext/src/core/DB/ImaginaryDialect.c (working copy) +@@ -23,6 +23,12 @@ + #include "core/OSQL/DBValue.h" + #include "core/OSQL/DialectString.h" + ++#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 2) ++#define onphp_implode(glue, words, copy) php_implode(glue, words, copy) ++#else ++#define onphp_implode(glue, words, copy) php_implode(glue, words, copy TSRMLS_CC) ++#endif ++ + PHPAPI zend_class_entry *onphp_ce_ImaginaryDialect; + + ONPHP_METHOD(ImaginaryDialect, me) +@@ -197,7 +203,7 @@ + ZVAL_STRING(glue, " | ", 1); + } + +- php_implode(glue, words, copy); ++ onphp_implode(glue, words, copy); + + smart_str_appends(&out, "(\""); + +@@ -268,7 +274,7 @@ + ZVAL_STRING(glue, " | ", 1); + } + +- php_implode(glue, words, copy); ++ onphp_implode(glue, words, copy); + + smart_str_appends(&out, "(RANK BY \""); + |