[105920] trunk/dports/lang/php52

[ryandesign at macports.org]

Revision: 105920
          https://trac.macports.org/changeset/105920
Author:   ryandesign at macports.org
Date:     2013-05-09 18:59:46 -0700 (Thu, 09 May 2013)
Log Message:
-----------
php52: fix build error with libxml2 @2.9.0 (#39048)

Modified Paths:
--------------
    trunk/dports/lang/php52/Portfile

Added Paths:
-----------
    trunk/dports/lang/php52/files/patch-libxml-2.9.diff

Modified: trunk/dports/lang/php52/Portfile
===================================================================
--- trunk/dports/lang/php52/Portfile	2013-05-10 01:49:21 UTC (rev 105919)
+++ trunk/dports/lang/php52/Portfile	2013-05-10 01:59:46 UTC (rev 105920)
@@ -60,6 +60,7 @@
 patch.pre_args          -p1
 patchfiles \
     patch-scripts-php-config.in.diff \
+    patch-libxml-2.9.diff \
     patch-pcre-8.30.diff \
     patch-bind.diff
 

Added: trunk/dports/lang/php52/files/patch-libxml-2.9.diff
===================================================================
--- trunk/dports/lang/php52/files/patch-libxml-2.9.diff	                        (rev 0)
+++ trunk/dports/lang/php52/files/patch-libxml-2.9.diff	2013-05-10 01:59:46 UTC (rev 105920)
@@ -0,0 +1,51 @@
+--- a/ext/dom/node.c.orig	2010-05-01 13:30:38.000000000 -0500
++++ b/ext/dom/node.c	2013-05-09 20:34:37.000000000 -0500
+@@ -1950,9 +1950,17 @@
+         RETVAL_FALSE;
+     } else {
+ 		if (mode == 0) {
++#ifdef LIBXML2_NEW_BUFFER
++            ret = xmlOutputBufferGetSize(buf);
++#else
+ 			ret = buf->buffer->use;
++#endif
+ 			if (ret > 0) {
++#ifdef LIBXML2_NEW_BUFFER
++                RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf), ret, 1);
++#else
+ 				RETVAL_STRINGL((char *) buf->buffer->content, ret, 1);
++#endif
+ 			} else {
+ 				RETVAL_EMPTY_STRING();
+ 			}
+--- a/ext/dom/documenttype.c.orig	2010-01-03 03:23:27.000000000 -0600
++++ b/ext/dom/documenttype.c	2013-05-09 20:34:37.000000000 -0500
+@@ -215,7 +215,13 @@
+ 		if (buff != NULL) {
+ 			xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset, 0, 0, NULL);
+ 			xmlOutputBufferFlush(buff);
++
++#ifdef LIBXML2_NEW_BUFFER
++			ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff),
++			             xmlOutputBufferGetSize(buff), 1);
++#else
+ 			ZVAL_STRINGL(*retval, buff->buffer->content, buff->buffer->use, 1);
++#endif
+ 			(void)xmlOutputBufferClose(buff);
+ 			return SUCCESS;
+ 		}
+--- a/ext/simplexml/simplexml.c.orig	2010-05-05 06:40:11.000000000 -0500
++++ b/ext/simplexml/simplexml.c	2013-05-09 20:34:37.000000000 -0500
+@@ -1343,7 +1343,12 @@
+ 
+ 			xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding);
+ 			xmlOutputBufferFlush(outbuf);
++#ifdef LIBXML2_NEW_BUFFER
++			RETVAL_STRINGL((char *)xmlOutputBufferGetContent(outbuf),
++			               xmlOutputBufferGetSize(outbuf), 1);
++#else
+ 			RETVAL_STRINGL((char *)outbuf->buffer->content, outbuf->buffer->use, 1);
++#endif
+ 			xmlOutputBufferClose(outbuf);
+ 		}
+ 	} else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130509/0d6600fb/attachment.html>