diff options
| author |   Konstantin V. Arkhipov <voxus@gentoo.org> | 2007-10-20 16:42:05 +0000 |
|---|---|---|
| committer | Konstantin V. Arkhipov <voxus@gentoo.org> | 2007-10-20 16:42:05 +0000 |
| commit | 211d3b991299579eefe4c9eeb76819bd5a506424 (patch) | |
| tree | ab1048613e425f2002e26bf79d60e76da095fc9c /dev-php5 | |
| parent | Version bump wrt #153823. (diff) | |
| download | gentoo-2-211d3b991299579eefe4c9eeb76819bd5a506424.tar.gz gentoo-2-211d3b991299579eefe4c9eeb76819bd5a506424.tar.bz2 gentoo-2-211d3b991299579eefe4c9eeb76819bd5a506424.zip | |
+ upstream's r4389
(Portage version: 2.1.3.15)
Diffstat (limited to 'dev-php5')
4 files changed, 31 insertions, 49 deletions
diff --git a/dev-php5/onphp-module/ChangeLog b/dev-php5/onphp-module/ChangeLog index bfe2e20ecf5c..ba8a221736e7 100644 --- a/dev-php5/onphp-module/ChangeLog +++ b/dev-php5/onphp-module/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-php5/onphp-module # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/onphp-module/ChangeLog,v 1.24 2007/10/20 16:30:22 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/onphp-module/ChangeLog,v 1.25 2007/10/20 16:42:04 voxus Exp $ + + 20 Oct 2007; Konstantin V. Arkhipov <voxus@gentoo.org> + -files/onphp-module-r2861.patch, + +files/onphp-module-0.10.7-wrong_propagation.patch, + onphp-module-0.10.7.ebuild: + Added trivial patch from upstream's r4389. *onphp-module-0.10.7 (20 Oct 2007) diff --git a/dev-php5/onphp-module/files/onphp-module-0.10.7-wrong_propagation.patch b/dev-php5/onphp-module/files/onphp-module-0.10.7-wrong_propagation.patch new file mode 100644 index 000000000000..5765dfcb0459 --- /dev/null +++ b/dev-php5/onphp-module/files/onphp-module-0.10.7-wrong_propagation.patch @@ -0,0 +1,16 @@ +--- branches/0.10/ext/src/core/OSQL/FieldTable.c ++++ branches/0.10/ext/src/core/OSQL/FieldTable.c +@@ -29,7 +29,12 @@ ONPHP_METHOD(FieldTable, __construct) + ONPHP_UPDATE_PROPERTY(getThis(), "field", field); + } + +-ONPHP_GETTER(FieldTable, getField, field); ++ONPHP_METHOD(FieldTable, getField) ++{ ++ zval *field = ONPHP_READ_PROPERTY(getThis(), "field"); ++ ++ RETURN_ZVAL(field, 1, 0); ++} + + ONPHP_METHOD(FieldTable, toDialectString) + { diff --git a/dev-php5/onphp-module/files/onphp-module-r2861.patch b/dev-php5/onphp-module/files/onphp-module-r2861.patch deleted file mode 100644 index 170a76fb0d5d..000000000000 --- a/dev-php5/onphp-module/files/onphp-module-r2861.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 \""); - diff --git a/dev-php5/onphp-module/onphp-module-0.10.7.ebuild b/dev-php5/onphp-module/onphp-module-0.10.7.ebuild index 8139ac2414df..b5c484b9f828 100644 --- a/dev-php5/onphp-module/onphp-module-0.10.7.ebuild +++ b/dev-php5/onphp-module/onphp-module-0.10.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/onphp-module/onphp-module-0.10.7.ebuild,v 1.1 2007/10/20 16:30:22 voxus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/onphp-module/onphp-module-0.10.7.ebuild,v 1.2 2007/10/20 16:42:04 voxus Exp $ PHP_EXT_NAME="onphp" PHP_EXT_INI="yes" @@ -27,6 +27,13 @@ PHP_SHARED_CAT="php5" S="${WORKDIR}/onphp-${PV}/ext" +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${P}-wrong_propagation.patch +} + pkg_setup() { has_php |