cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix with libxml 2.9

Browse Source
This commit is contained in:
sthen 2013-04-14 23:22:06 +00:00
parent 6dd623e6b9
commit bb2ee20682
8 changed files with 135 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/php/5.2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2013/03/21 08:33:52 landry Exp $
# $OpenBSD: Makefile,v 1.35 2013/04/14 23:22:11 sthen Exp $
# XXX use the bundled libtool because it needs some specific options we
# don't have.
@ -9,8 +9,7 @@ V= 5.2.17
SUHOSIN_PHPV= 5.2.16
SUHOSIN_P_V= 0.9.7
REVISION= 13
REVISION-imap= 14
REVISION= 14
INI_TEMPLATES= dist recommended

17
lang/php/5.2/patches/patch-ext_dom_documenttype_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-ext_dom_documenttype_c,v 1.1 2013/04/14 23:22:11 sthen Exp $
fix with libxml 2.9, adapted from
https://mail.gnome.org/archives/xml/2012-August/msg00028.html
--- ext/dom/documenttype.c.orig.port Sun Apr 14 13:29:04 2013
+++ ext/dom/documenttype.c Sun Apr 14 13:30:05 2013
@@ -215,7 +215,8 @@ int dom_documenttype_internal_subset_read(dom_object *
if (buff != NULL) {
xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset, 0, 0, NULL);
xmlOutputBufferFlush(buff);
- ZVAL_STRINGL(*retval, buff->buffer->content, buff->buffer->use, 1);
+ ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff),
+ xmlOutputBufferGetSize(buff), 1);
(void)xmlOutputBufferClose(buff);
return SUCCESS;
}

19
lang/php/5.2/patches/patch-ext_dom_node_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-ext_dom_node_c,v 1.1 2013/04/14 23:22:11 sthen Exp $
fix with libxml 2.9, adapted from
https://mail.gnome.org/archives/xml/2012-August/msg00028.html
--- ext/dom/node.c.orig.port Sun Apr 14 13:14:20 2013
+++ ext/dom/node.c Sun Apr 14 13:28:46 2013
@@ -1950,9 +1950,9 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PAR
RETVAL_FALSE;
} else {
if (mode == 0) {
- ret = buf->buffer->use;
+ ret = xmlOutputBufferGetSize(buf);
if (ret > 0) {
- RETVAL_STRINGL((char *) buf->buffer->content, ret, 1);
+ RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf), ret, 1);
} else {
RETVAL_EMPTY_STRING();
}

17
lang/php/5.2/patches/patch-ext_simplexml_simplexml_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-ext_simplexml_simplexml_c,v 1.1 2013/04/14 23:22:11 sthen Exp $
fix with libxml 2.9, adapted from
https://mail.gnome.org/archives/xml/2012-August/msg00028.html
--- ext/simplexml/simplexml.c.orig.port Sun Apr 14 13:30:14 2013
+++ ext/simplexml/simplexml.c Sun Apr 14 13:31:25 2013
@@ -1343,7 +1343,8 @@ SXE_METHOD(asXML)
xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding);
xmlOutputBufferFlush(outbuf);
- RETVAL_STRINGL((char *)outbuf->buffer->content, outbuf->buffer->use, 1);
+ RETVAL_STRINGL((char *)xmlOutputBufferGetContent(outbuf),
+ xmlOutputBufferGetSize(outbuf), 1);
xmlOutputBufferClose(outbuf);
}
} else {

4
x11/gnustep/base/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.46 2012/08/22 07:15:51 sebastia Exp $
# $OpenBSD: Makefile,v 1.47 2013/04/14 23:22:06 sthen Exp $
COMMENT= GNUstep base library
DISTNAME= gnustep-base-1.24.0
REVISION = 2
REVISION= 3
SHARED_LIBS= gnustep-base 6.0
CATEGORIES= devel

19
x11/gnustep/base/patches/patch-Source_Additions_GSXML_m Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-Source_Additions_GSXML_m,v 1.1 2013/04/14 23:22:06 sthen Exp $
libxml 2.9.0
http://lists.gnu.org/archive/html/bug-gnustep/2012-10/msg00030.html
--- Source/Additions/GSXML.m.orig Mon Jan 9 01:28:27 2012
+++ Source/Additions/GSXML.m Sun Apr 14 06:55:18 2013
@@ -984,7 +984,11 @@ static NSMapTable *nodeNames = 0;
1,
"utf-8");
xmlOutputBufferFlush(buf);
+#if LIBXML_VERSION < 20900
string = UTF8StrLen(buf->buffer->content, buf->buffer->use);
+#else
+ string = UTF8StrLen(xmlBufContent(buf->buffer), xmlBufUse(buf->buffer));
+#endif
xmlOutputBufferClose(buf);
}
return string;

42
x11/kde/webdev/patches/patch-kxsldbg_kxsldbgpart_libxsldbg_xsldbg_cpp Normal file
View File

@ -0,0 +1,42 @@
$OpenBSD: patch-kxsldbg_kxsldbgpart_libxsldbg_xsldbg_cpp,v 1.1 2013/04/14 23:22:18 sthen Exp $
kdewebdev-3.5.10-docbParseFile.patch from fedora, fix with libxml 2.9.0
--- kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp.orig Sun Apr 14 12:53:10 2013
+++ kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp Sun Apr 14 12:53:33 2013
@@ -82,9 +82,6 @@
#include <libxml/xmlerror.h>
#include <libxml/HTMLtree.h>
#include <libxml/xmlIO.h>
-#ifdef LIBXML_DOCB_ENABLED
-#include <libxml/DOCBparser.h>
-#endif
#ifdef LIBXML_XINCLUDE_ENABLED
#include <libxml/xinclude.h>
#endif
@@ -973,13 +970,6 @@ xsldbgLoadXmlData(void)
NULL);
else
#endif
-#ifdef LIBXML_DOCB_ENABLED
- if (optionsGetIntOption(OPTIONS_DOCBOOK))
- doc = docbParseFile((char *)
- optionsGetStringOption(OPTIONS_DATA_FILE_NAME),
- NULL);
- else
-#endif
#if LIBXML_VERSION >= 20600
doc = xmlSAXParseFile(&mySAXHandler,
@@ -1023,11 +1013,6 @@ xsldbgLoadXmlTemporary(const xmlChar * path)
#ifdef LIBXML_HTML_ENABLED
if (optionsGetIntOption(OPTIONS_HTML))
doc = htmlParseFile((char *) path, NULL);
- else
-#endif
-#ifdef LIBXML_DOCB_ENABLED
- if (optionsGetIntOption(OPTIONS_DOCBOOK))
- doc = docbParseFile((char *) path, NULL);
else
#endif
doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0);

17
x11/kde/webdev/patches/patch-kxsldbg_xsldbgmain_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-kxsldbg_xsldbgmain_cpp,v 1.1 2013/04/14 23:22:18 sthen Exp $
kdewebdev-3.5.10-docbParseFile.patch from fedora, fix with libxml 2.9.0
--- kxsldbg/xsldbgmain.cpp.orig Sun Apr 14 12:52:21 2013
+++ kxsldbg/xsldbgmain.cpp Sun Apr 14 12:52:36 2013
@@ -73,10 +73,6 @@ static const KCmdLineOptions options[] =
{ "html", I18N_NOOP("The input document is(are) an HTML file(s)"), 0},
#endif
-#ifdef LIBXML_DOCB_ENABLED
- { "docbook", I18N_NOOP("The input document is SGML docbook"), 0},
-#endif
-
{ "nonet", I18N_NOOP("Disable the fetching DTDs or entities over network"), 0},
#ifdef LIBXML_CATALOG_ENABLED