[gentoo-commits] gentoo-x86 commit in dev-php5/adodb-ext/files: php53.patch

[gentoo-commits] gentoo-x86 commit in dev-php5/adodb-ext/files: php53.patch

[Matti Bickel (mabi)]

mabi        10/09/11 12:45:54

  Added:                php53.patch
  Log:
  add patch to make adodb-ext compatible with php-5.3 (patch taken from http://github.com/wojo/adodb-ext)
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-php5/adodb-ext/files/php53.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php5/adodb-ext/files/php53.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php5/adodb-ext/files/php53.patch?rev=1.1&content-type=text/plain

Index: php53.patch
===================================================================
diff --git a/adodb.c b/adodb.c
index 3afc443..6e3bf95 100644
--- a/adodb.c
+++ b/adodb.c
@@ -159,11 +159,7 @@ static zval adodb_zvals[5];
 
 static void adodb_init_zval(zval *v, char *s)
 {
-	v->type = IS_STRING;
-	v->value.str.val = s;
-	v->value.str.len = strlen(s);
-	v->is_ref = 0;
-	v->refcount = 1;
+	ZVAL_STRING(v, s, 0);
 }
 
 /* {{{ PHP_MINIT_FUNCTION
@@ -277,7 +273,7 @@ zval		**fields;
 	fci.function_table = EG(function_table);
 	fci.function_name = &adodb_zvals[zval_ocifetch];
 	fci.symbol_table = NULL;
-	fci.object_pp = NULL;
+	/* fci.object_pp = NULL; */
 	fci.retval_ptr_ptr = &retval;
 	fci.param_count = 2;
 	fci.params = &params[1];

[gentoo-commits] gentoo-x86 commit in dev-php5/adodb-ext/files: php53.patch

[Ole Markus With (olemarkus)]

olemarkus    11/03/06 21:32:07

  Modified:             php53.patch
  Log:
  The old patch seemed to have incorrect line endings in it and would not apply. #357025
  
  (Portage version: 2.1.9.41/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-php5/adodb-ext/files/php53.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php5/adodb-ext/files/php53.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php5/adodb-ext/files/php53.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php5/adodb-ext/files/php53.patch?r1=1.1&r2=1.2

Index: php53.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-php5/adodb-ext/files/php53.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php53.patch	11 Sep 2010 12:45:54 -0000	1.1
+++ php53.patch	6 Mar 2011 21:32:07 -0000	1.2
@@ -1,21 +1,19 @@
-diff --git a/adodb.c b/adodb.c
-index 3afc443..6e3bf95 100644
---- a/adodb.c
-+++ b/adodb.c
-@@ -159,11 +159,7 @@ static zval adodb_zvals[5];
- 
- static void adodb_init_zval(zval *v, char *s)
- {
--	v->type = IS_STRING;
--	v->value.str.val = s;
--	v->value.str.len = strlen(s);
--	v->is_ref = 0;
--	v->refcount = 1;
-+	ZVAL_STRING(v, s, 0);
- }
- 
- /* {{{ PHP_MINIT_FUNCTION
-@@ -277,7 +273,7 @@ zval		**fields;
+--- a/adodb.c	2005-11-25 20:00:56.000000000 +0100
++++ b/adodb.c	2011-03-06 22:27:06.000000000 +0100
+@@ -159,11 +159,7 @@
+ 
+ static void adodb_init_zval(zval *v, char *s)
+ {
+-	v->type = IS_STRING;
+-	v->value.str.val = s;
+-	v->value.str.len = strlen(s);
+-	v->is_ref = 0;
+-	v->refcount = 1;
++	ZVAL_STRING(v, s, 0);
+ }
+ 
+ /* {{{ PHP_MINIT_FUNCTION
+@@ -277,7 +273,7 @@
  	fci.function_table = EG(function_table);
  	fci.function_name = &adodb_zvals[zval_ocifetch];
  	fci.symbol_table = NULL;

[gentoo-commits] gentoo-x86 commit in dev-php5/adodb-ext/files: php53.patch

[Ole Markus With (olemarkus)]

olemarkus    11/04/09 19:29:54

  Removed:              php53.patch
  Log:
  Moving dev-php5/adodb-ext to dev-php/adodb-ext