From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [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 Signed-off-by: Brad Bishop --- .../libxml/libxml-filter-buffertext-perl_1.01.bb | 25 ++++++ .../libxml-libxml-perl/disable-libxml2-check.patch | 79 +++++++++++++++++++ .../fix-CATALOG-conditional-compile.patch | 31 ++++++++ .../using-DOCB-conditional.patch | 91 ++++++++++++++++++++++ .../libxml/libxml-libxml-perl_2.0132.bb | 47 +++++++++++ .../libxml/libxml-sax-writer-perl_0.57.bb | 25 ++++++ 6 files changed, 298 insertions(+) create mode 100644 meta-openembedded/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch create mode 100644 meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/fix-CATALOG-conditional-compile.patch create mode 100644 meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch create mode 100644 meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb (limited to 'meta-openembedded/meta-perl/recipes-perl/libxml') diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb new file mode 100644 index 000000000..77dd616bf --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb @@ -0,0 +1,25 @@ +SUMMARY = "XML::Filter::BufferText - Filter to put all characters() in one event" +DESCRIPTION = "\ +The XML::Filter::BufferText module is a very simple filter. One common \ +cause of grief (and programmer error) is that XML parsers aren't required \ +to provide character events in one chunk. They can, but are not forced \ +to, and most don't. This filter does the trivial but oft-repeated task \ +of putting all characters into a single event. \ +" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPLv1+" +HOMEPAGE = "http://search.cpan.org/dist/XML-Filter-BufferText/" +DEPENDS += "libxml-sax-perl-native" +RDEPENDS_${PN} += "libxml-sax-perl" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RB/RBERJON/XML-Filter-BufferText-${PV}.tar.gz" +SRC_URI[md5sum] = "2992c0387632583b966ab9c965b25512" +SRC_URI[sha256sum] = "8fd2126d3beec554df852919f4739e689202cbba6a17506e9b66ea165841a75c" + +LIC_FILES_CHKSUM = "file://BufferText.pm;beginline=88;endline=90;md5=497aa6d79cc84c3d769a2a0016bee928" + +S = "${WORKDIR}/XML-Filter-BufferText-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch new file mode 100644 index 000000000..a8e7cc1bb --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch @@ -0,0 +1,79 @@ +Do not use the _libxml_check_lib() on cross-compile + +Upstream-Status: Inappropriate [configuration] + +xml2 have been added into package's DEPENDS, so not need to use the +_libxml_check_lib() to check it again, and _libxml_check_lib() always +return false on cross-compile environment + +Signed-off-by: Roy Li +--- + Makefile.PL | 52 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 26 insertions(+), 26 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index c0485f1..09c676b 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -411,32 +411,32 @@ sub _libxml_check_lib { + } + } + +-print "Checking for ability to link against xml2..."; +-if ( _libxml_check_lib('xml2') ) { +- print "yes\n"; +-} +-else { +- print "no\n"; +- print "Checking for ability to link against libxml2..."; +- if ( _libxml_check_lib('libxml2')) { +- print "yes\n"; +- } +- else { +- print STDERR <<"DEATH"; +-libxml2, zlib, and/or the Math library (-lm) have not been found. +-Try setting LIBS and INC values on the command line +-Or get libxml2 from +- http://xmlsoft.org/ +-If you install via RPMs, make sure you also install the -devel +-RPMs, as this is where the headers (.h files) are. +- +-Also, you may try to run perl Makefile.PL with the DEBUG=1 parameter +-to see the exact reason why the detection of libxml2 installation +-failed or why Makefile.PL was not able to compile a test program. +-DEATH +- exit 0; # 0 recommended by http://cpantest.grango.org (Notes for CPAN Authors) +- } +-} ++#print "Checking for ability to link against xml2..."; ++#if ( _libxml_check_lib('xml2') ) { ++# print "yes\n"; ++#} ++#else { ++# print "no\n"; ++# print "Checking for ability to link against libxml2..."; ++# if ( _libxml_check_lib('libxml2')) { ++# print "yes\n"; ++# } ++# else { ++# print STDERR <<"DEATH"; ++#libxml2, zlib, and/or the Math library (-lm) have not been found. ++#Try setting LIBS and INC values on the command line ++#Or get libxml2 from ++# http://xmlsoft.org/ ++#If you install via RPMs, make sure you also install the -devel ++#RPMs, as this is where the headers (.h files) are. ++# ++#Also, you may try to run perl Makefile.PL with the DEBUG=1 parameter ++#to see the exact reason why the detection of libxml2 installation ++#failed or why Makefile.PL was not able to compile a test program. ++#DEATH ++# exit 0; # 0 recommended by http://cpantest.grango.org (Notes for CPAN Authors) ++# } ++#} + + # -------------------------------------------------------------------------- # + # _NOW_ write the Makefile +-- +1.7.10.4 + diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/fix-CATALOG-conditional-compile.patch b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/fix-CATALOG-conditional-compile.patch new file mode 100644 index 000000000..1dd9fb375 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/fix-CATALOG-conditional-compile.patch @@ -0,0 +1,31 @@ +[PATCH] Fix a compile error + +Upstream-Status: Pending + +Fix a compile error by conditional using 'catal' since catal +is only defined when LIBXML_CATALOG_ENABLED is enabled. + +Signed-off-by: Roy Li +--- + LibXML.xs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/LibXML.xs b/LibXML.xs +index 66da04b..45da681 100644 +--- a/LibXML.xs ++++ b/LibXML.xs +@@ -2777,9 +2777,11 @@ _default_catalog( self, catalog ) + xmlCatalogPtr catal = INT2PTR(xmlCatalogPtr,SvIV(SvRV(catalog))); + #endif + INIT: ++#ifdef LIBXML_CATALOG_ENABLED + if ( catal == NULL ) { + croak( "empty catalog\n" ); + } ++#endif + CODE: + warn( "this feature is not implemented" ); + RETVAL = 0; +-- +1.7.10.4 + diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch new file mode 100644 index 000000000..d255ec753 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch @@ -0,0 +1,91 @@ +[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 +--- + 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 + diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb new file mode 100644 index 000000000..1f1840118 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb @@ -0,0 +1,47 @@ +SUMMARY = "Perl interface to the libxml2 library" +DESCRIPTION = "This module is an interface to libxml2, providing XML and HTML parsers \ +with DOM, SAX and XMLReader interfaces, a large subset of DOM Layer 3 \ +interface and a XML::XPath-like interface to XPath API of libxml2. \ +The module is split into several packages which are not described in this \ +section; unless stated otherwise, you only need to use XML::LibXML; in \ +your programs." + +HOMEPAGE = "http://search.cpan.org/dist/XML-LibXML-1.99/" +SECTION = "libs" +LICENSE = "Artistic-1.0|GPLv1+" +DEPENDS += "libxml2 \ + libxml-sax-perl-native \ + zlib \ +" +RDEPENDS_${PN} += "\ + libxml2 \ + libxml-sax-perl \ + libxml-sax-base-perl \ + perl-module-encode \ + perl-module-data-dumper \ + zlib \ +" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/XML-LibXML-${PV}.tar.gz;name=libxml \ + file://disable-libxml2-check.patch \ + file://fix-CATALOG-conditional-compile.patch \ + file://using-DOCB-conditional.patch \ +" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=64eda1bc135f0ece1d1187f2a8ac82c1 \ + file://LICENSE;md5=97871bde150daeb5e61ad95137ff2446 \ +" +SRC_URI[libxml.md5sum] = "43546fd9a3974f19323f9fb04861ece9" +SRC_URI[libxml.sha256sum] = "721452e3103ca188f5968ab06d5ba29fe8e00e49f4767790882095050312d476" + +S = "${WORKDIR}/XML-LibXML-${PV}" + +inherit cpan + +EXTRA_CPANFLAGS = "INC=-I${STAGING_INCDIR}/libxml2 LIBS=-L${STAGING_LIBDIR}" + +BBCLASSEXTEND = "native" + +CFLAGS += " -D_GNU_SOURCE " +BUILD_CFLAGS += " -D_GNU_SOURCE " + +FILES_${PN}-dbg =+ "${libdir}/perl/vendor_perl/*/auto/XML/LibXML/.debug/" diff --git a/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb new file mode 100644 index 000000000..d1b0de093 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb @@ -0,0 +1,25 @@ +SUMMARY = "XML::SAX::Writer - SAX2 Writer" +DESCRIPTION = "\ +XML::SAX::Writer helps to serialize SAX2 representations of XML documents to \ +strings, files, and other flat representations. It handles charset encodings, \ +XML escaping conventions, and so forth. It is still considered alpha, \ +although it has been put to limited use in settings such as XML::LibXML and \ +the AxKit XML Application Server. \ +" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPLv1+" +HOMEPAGE = "http://search.cpan.org/dist/XML-SAX-Writer/" +DEPENDS += "libxml-filter-buffertext-perl-native" +RDEPENDS_${PN} += "libxml-filter-buffertext-perl" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-${PV}.tar.gz" +SRC_URI[md5sum] = "3e3023c648e3003c04de2fb04435f8bd" +SRC_URI[sha256sum] = "3d61d07ef43b0126f5b4de4f415a256fa859fa88dc4fdabaad70b7be7c682cf0" + +LIC_FILES_CHKSUM = "file://README;beginline=45;endline=46;md5=d41d8cd98f00b204e9800998ecf8427e" + +S = "${WORKDIR}/XML-SAX-Writer-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" -- cgit v1.2.3