summaryrefslogtreecommitdiffstats
path: root/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch
diff options
context:
space:
mode:
authorDave Cobbley <david.j.cobbley@linux.intel.com>2018-08-14 10:05:37 -0700
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-08-22 21:26:31 -0400
commiteb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch)
treede291a73dc37168da6370e2cf16c347d1eba9df8 /import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch
parent9c3cf826d853102535ead04cebc2d6023eff3032 (diff)
downloadtalos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.gz
talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.zip
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch')
-rw-r--r--import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch91
1 files changed, 0 insertions, 91 deletions
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch b/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch
deleted file mode 100644
index d255ec753..000000000
--- a/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-[PATCH] Fix a compile error
-
-Upstream-Status: Pending
-
-by conditional using 'XML_DOCB_DOCUMENT_NODE' since it is only
-defined when LIBXML_DOCB_ENABLED is enabled in xmlversion.h.
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
----
- LibXML.xs | 9 +-
- dom.c | 2 +
- perl-libxml-mm.c | 4 +
- 4 files changed, 678 insertions(+), 658 deletions(-)
-
-diff --git a/LibXML.xs b/LibXML.xs
-index b299ba4..66da04b 100644
---- a/LibXML.xs
-+++ b/LibXML.xs
-@@ -5026,7 +5026,9 @@ addChild( self, nNode )
- XSRETURN_UNDEF;
- case XML_DOCUMENT_NODE :
- case XML_HTML_DOCUMENT_NODE :
-+#ifdef LIBXML_DOCB_ENABLED
- case XML_DOCB_DOCUMENT_NODE :
-+#endif
- croak("addChild: HIERARCHY_REQUEST_ERR\n");
- XSRETURN_UNDEF;
- case XML_NOTATION_NODE :
-@@ -5286,7 +5288,9 @@ _toStringC14N(self, comments=0, xpath=&PL_sv_undef, exclusive=0, inc_prefix_list
- if ( nodepath == NULL
- && self->type != XML_DOCUMENT_NODE
- && self->type != XML_HTML_DOCUMENT_NODE
-+#ifdef LIBXML_DOCB_ENABLED
- && self->type != XML_DOCB_DOCUMENT_NODE
-+#endif
- ) {
- if (comments)
- nodepath = xmlStrdup( (const xmlChar *) "(. | .//node() | .//@* | .//namespace::*)" );
-@@ -5297,7 +5301,10 @@ _toStringC14N(self, comments=0, xpath=&PL_sv_undef, exclusive=0, inc_prefix_list
- if ( nodepath != NULL ) {
- if ( self->type == XML_DOCUMENT_NODE
- || self->type == XML_HTML_DOCUMENT_NODE
-- || self->type == XML_DOCB_DOCUMENT_NODE ) {
-+#ifdef LIBXML_DOCB_ENABLED
-+ || self->type == XML_DOCB_DOCUMENT_NODE
-+#endif
-+ ) {
- refNode = xmlDocGetRootElement( self->doc );
- }
- if (SvOK(xpath_context)) {
-diff --git a/dom.c b/dom.c
-index 87eb61d..cbd391b 100644
---- a/dom.c
-+++ b/dom.c
-@@ -654,7 +654,9 @@ domName(xmlNodePtr node) {
-
- case XML_DOCUMENT_NODE :
- case XML_HTML_DOCUMENT_NODE :
-+#ifdef LIBXML_DOCB_ENABLED
- case XML_DOCB_DOCUMENT_NODE :
-+#endif
- name = (const xmlChar *) "#document";
- break;
-
-diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c
-index d162b06..7ac5436 100644
---- a/perl-libxml-mm.c
-+++ b/perl-libxml-mm.c
-@@ -331,7 +331,9 @@ PmmNewNode(xmlNodePtr node)
- switch ( node->type ) {
- case XML_DOCUMENT_NODE:
- case XML_HTML_DOCUMENT_NODE:
-+#ifdef LIBXML_DOCB_ENABLED
- case XML_DOCB_DOCUMENT_NODE:
-+#endif
- proxy = (ProxyNodePtr)xmlMalloc(sizeof(struct _DocProxyNode));
- if (proxy != NULL) {
- ((DocProxyNodePtr)proxy)->psvi_status = Pmm_NO_PSVI;
-@@ -550,7 +552,9 @@ PmmNodeToSv( xmlNodePtr node, ProxyNodePtr owner )
- switch ( node->type ) {
- case XML_DOCUMENT_NODE:
- case XML_HTML_DOCUMENT_NODE:
-+#ifdef LIBXML_DOCB_ENABLED
- case XML_DOCB_DOCUMENT_NODE:
-+#endif
- if ( ((xmlDocPtr)node)->encoding != NULL ) {
- SetPmmENCODING(dfProxy, (int)xmlParseCharEncoding( (const char*)((xmlDocPtr)node)->encoding ));
- }
---
-1.7.10.4
-
OpenPOWER on IntegriCloud