Unbreak compilation against latest libxml2 blead #111

Makefile.in

@@ -17,6 +17,14 @@ debug :
 coverage :
 	%MAKE% "DBG=-fprofile-arcs -ftest-coverage" "LD_DBG=-coverage -lgcov" all
 
+# compile against checked out libxml2 source (pre-built)
+all-via-libxml2-src : ../libxml2/include
+	raku Build.pm6 -I ../libxml2/include
+	%MAKE% clean
+	%MAKE% all
+	raku Build.pm6;
+	@echo "** Please set LD_LIBRARY_PATH to ../libxml2/.libs ***"
+
 resources/libraries/%LIB-NAME% : $(SRC)/dom%O% $(SRC)/domXPath%O% $(SRC)/xml6_parser_ctx%O% $(SRC)/xml6_config%O% $(SRC)/xml6_doc%O% $(SRC)/xml6_entity%O% $(SRC)/xml6_gbl%O% $(SRC)/xml6_hash%O% $(SRC)/xml6_input%O% $(SRC)/xml6_node%O% $(SRC)/xml6_notation%O%  $(SRC)/xml6_ns%O% $(SRC)/xml6_sax%O% $(SRC)/xml6_ref%O% $(SRC)/xml6_reader%O% $(SRC)/xml6_xpath%O% $(SRC)/xml6_error%O%
 	%LD% %LDSHARED% %LDFLAGS% %LDOUT%resources/libraries/%LIB-NAME% \
         $(SRC)/dom%O%  $(SRC)/domXPath%O% $(SRC)/xml6_parser_ctx%O% $(SRC)/xml6_config%O% $(SRC)/xml6_doc%O% $(SRC)/xml6_entity%O% $(SRC)/xml6_gbl%O% $(SRC)/xml6_hash%O% $(SRC)/xml6_input%O% $(SRC)/xml6_node%O%  $(SRC)/xml6_notation%O% $(SRC)/xml6_ns%O% $(SRC)/xml6_sax%O% $(SRC)/xml6_ref%O%  $(SRC)/xml6_reader%O% $(SRC)/xml6_xpath%O%  $(SRC)/xml6_error%O% \

lib/LibXML/Raw.rakumod

@@ -461,7 +461,6 @@ class xmlSAXLocator is export {
     has Pointer $.getColumnNumberFunc is rw-ptr(
         method xml6_sax_locator_set_getColumnNumber( &cb (xmlParserCtxt $ctx --> int32) ) is native($BIND-XML2) {*}
     );
-    method init is native($XML2) is symbol('xml6_sax_locator_init') {*}
 
     submethod BUILD(*%atts) {
         for %atts.pairs.sort {
@@ -1127,6 +1126,8 @@ class xmlAttr is anyNode does LibXML::Raw::DOM::Attr is export {
     has xmlNs       $.ns; # the associated namespace
     has int32    $.atype; # the attribute type if validating
     has Pointer   $.psvi; # for type/PSVI information
+    ## todo Only available in newer libxml2 versions!
+    has Pointer $!id;     # the ID struct
 
     method Free is native($XML2) is symbol('xmlFreeProp') {*}
     method xmlCopyProp(--> xmlAttr) is native($XML2) {*}

src/xml6_error.h

@@ -1,6 +1,7 @@
 #ifndef __XML6_ERROR_H
 #define __XML6_ERROR_H
 
+#include <libxml/xmlstring.h>
 #include <libxml/xmlerror.h>
 
 DLLEXPORT xmlChar*

src/xml6_sax.c

@@ -128,13 +128,6 @@ DLLEXPORT void xml6_sax_set_serror(xmlSAXHandlerPtr self, xmlStructuredErrorFunc
 
 // SaxLocator Methods
 
-DLLEXPORT void xml6_sax_locator_init(xmlSAXLocatorPtr self) {
-  self->getPublicId = xmlDefaultSAXLocator.getPublicId;
-  self->getSystemId = xmlDefaultSAXLocator.getSystemId;
-  self->getLineNumber = xmlDefaultSAXLocator.getLineNumber;
-  self->getColumnNumber = xmlDefaultSAXLocator.getColumnNumber;
-}
-
 DLLEXPORT void xml6_sax_locator_set_getPublicId(xmlSAXLocatorPtr self, void *func) {
   self->getPublicId = func;
 }

t/00native.t

@@ -16,7 +16,7 @@ for 1 ..^ @ClassMap -> $type {
     my $class := @ClassMap[$type];
     if $class ~~ anyNode|xmlNs {
        todo "has known size changes between libxml2 versions"
-           if $type == XML_ENTITY_DECL;
+           if $type == XML_ENTITY_DECL|XML_ATTRIBUTE_NODE;
        is node-size($type), nativesizeof($class), 'size of ' ~ $class.raku;
     }
     else {