Attachment 117060 Details for Bug 159125 – patch.txt

patch.txt

patch.txt (text/plain), 2.57 KB, created by Michael Scheidell on 2011-07-23 21:24:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Scheidell

Created: 2011-07-23 21:24:10 UTC

Size: 2.57 KB

patch

obsolete

>diff -bBru /tmp/php-adodb-ext/Makefile php-adodb-ext/Makefile
>--- /tmp/php-adodb-ext/Makefile	2010-04-12 09:56:14.000000000 -0400
>+++ php-adodb-ext/Makefile	2011-07-23 16:18:11.000000000 -0400
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	adodb-ext
> PORTVERSION=	5.04
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	databases
> MASTER_SITES=	http://phplens.com/lens/dl/
> PKGNAMEPREFIX=	php-
>@@ -29,6 +29,12 @@
> PLIST_SUB=	PHP_EXT_DIR=${PHP_EXT_DIR}
> USE_DOS2UNIX=	yes
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${PHP_VER} != "52"
>+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-adodb.c
>+.endif
>+
> post-install:
> 	@${CAT} ${PKGMESSAGE}
> 
>diff -bBru /tmp/php-adodb-ext/files/extra-patch-adodb.c php-adodb-ext/files/extra-patch-adodb.c
>--- /tmp/php-adodb-ext/files/extra-patch-adodb.c	2011-07-23 16:16:33.000000000 -0400
>+++ php-adodb-ext/files/extra-patch-adodb.c	2010-04-12 09:56:14.000000000 -0400
>@@ -0,0 +1,28 @@
>+--- adodb.c.orig	2010-04-12 20:00:43.000000000 +0800
>++++ adodb.c	2010-04-12 20:05:20.000000000 +0800
>+@@ -159,11 +159,11 @@
>+ 
>+ 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;
>++	Z_TYPE_P(v) = IS_STRING;
>++	Z_STRVAL_P(v) = s;
>++	Z_STRLEN_P(v) = strlen(s);
>++	Z_UNSET_ISREF_P(v);
>++	Z_SET_REFCOUNT_P(v, 1);
>+ }
>+ 
>+ /* {{{ PHP_MINIT_FUNCTION
>+@@ -277,7 +277,7 @@
>+ 	fci.function_table = EG(function_table);
>+ 	fci.function_name = &adodb_zvals[zval_ocifetch];
>+ 	fci.symbol_table = NULL;
>+-	fci.object_pp = NULL;
>++	fci.object_ptr = NULL;
>+ 	fci.retval_ptr_ptr = &retval;
>+ 	fci.param_count = 2;
>+ 	fci.params = &params[1];
>diff -bBru /tmp/php-adodb-ext/files/patch-adodb.c php-adodb-ext/files/patch-adodb.c
>--- /tmp/php-adodb-ext/files/patch-adodb.c	2010-04-12 09:56:14.000000000 -0400
>+++ php-adodb-ext/files/patch-adodb.c	2011-07-23 16:16:23.000000000 -0400
>@@ -1,28 +0,0 @@
>---- adodb.c.orig	2010-04-12 20:00:43.000000000 +0800
>-+++ adodb.c	2010-04-12 20:05:20.000000000 +0800
>-@@ -159,11 +159,11 @@
>- 
>- 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;
>-+	Z_TYPE_P(v) = IS_STRING;
>-+	Z_STRVAL_P(v) = s;
>-+	Z_STRLEN_P(v) = strlen(s);
>-+	Z_UNSET_ISREF_P(v);
>-+	Z_SET_REFCOUNT_P(v, 1);
>- }
>- 
>- /* {{{ PHP_MINIT_FUNCTION
>-@@ -277,7 +277,7 @@
>- 	fci.function_table = EG(function_table);
>- 	fci.function_name = &adodb_zvals[zval_ocifetch];
>- 	fci.symbol_table = NULL;
>--	fci.object_pp = NULL;
>-+	fci.object_ptr = NULL;
>- 	fci.retval_ptr_ptr = &retval;
>- 	fci.param_count = 2;
>- 	fci.params = &params[1];

Actions: View

Attachments on bug 159125: 117060