home  bbs  files  messages ]

      ZZLI4416             linux.debian.bugs.dist             15322 messages      

[ previous | next | reply ]

[ list messages | list forums ]

  Msg # 61 of 15322 on ZZLI4416, Monday 10-12-25, 1:11  
  From: GUILHEM MOULIN  
  To: ALL  
  Subj: Bug#1117844: bookworm-pu: package libxml  
 [continued from previous message] 
  
  @@ -970,7 +970,7 @@ xmlSAX2StartDocument(void *ctx) 
        xmlSAX2ErrMemory(ctxt, "xmlSAX2StartDocument"); 
        return; 
 @@ -109,10 +116,10 @@ 
        doc->parseFlags = ctxt->options; 
        if (ctxt->encoding != NULL) 
     doc->encoding = xmlStrdup(ctxt->encoding); 
 -Index: libxml2-2.9.14+dfsg/include/libxml/tree.h 
 -=================================================================== 
 ---- libxml2-2.9.14+dfsg.orig/include/libxml/tree.h 
 -+++ libxml2-2.9.14+dfsg/include/libxml/tree.h 
 +diff --git a/include/libxml/tree.h b/include/libxml/tree.h 
 +index 1e79be9..61178b2 100644 
 +--- a/include/libxml/tree.h 
 ++++ b/include/libxml/tree.h 
  @@ -365,7 +365,6 @@ struct _xmlElement { 
   #endif 
   }; 
 @@ -155,11 +162,11 @@ 
  
   typedef struct _xmlDOMWrapCtxt xmlDOMWrapCtxt; 
   typedef xmlDOMWrapCtxt *xmlDOMWrapCtxtPtr; 
 -Index: libxml2-2.9.14+dfsg/parser.c 
 -=================================================================== 
 ---- libxml2-2.9.14+dfsg.orig/parser.c 
 -+++ libxml2-2.9.14+dfsg/parser.c 
 -@@ -5523,7 +5523,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt 
 +diff --git a/parser.c b/parser.c 
 +index 603c0b3..f859296 100644 
 +--- a/parser.c 
 ++++ b/parser.c 
 +@@ -5523,7 +5523,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) { 
          xmlErrMemory(ctxt, "New Doc failed"); 
          return; 
      } 
 @@ -168,7 +175,7 @@ 
         } 
         if (ctxt->myDoc->intSubset == NULL) 
      ctxt->myDoc->intSubset = xmlNewDtd(ctxt->myDoc, 
 -@@ -5594,7 +5594,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt 
 +@@ -5594,7 +5594,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) { 
              xmlErrMemory(ctxt, "New Doc failed"); 
       return; 
          } 
 @@ -177,7 +184,7 @@ 
      } 
  
      if (ctxt->myDoc->intSubset == NULL) 
 -@@ -7035,7 +7035,7 @@ xmlParseExternalSubset(xmlParserCtxtPtr 
 +@@ -7035,7 +7035,7 @@ xmlParseExternalSubset(xmlParserCtxtPtr ctxt, const 
 xmlChar *ExternalID, 
        xmlErrMemory(ctxt, "New Doc failed"); 
        return; 
    } 
 @@ -186,7 +193,7 @@ 
       } 
       if ((ctxt->myDoc != NULL) && (ctxt->myDoc->intSubset == NULL)) 
           xmlCreateIntSubset(ctxt->myDoc, NULL, ExternalID, SystemID); 
 -@@ -7419,7 +7419,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) 
 +@@ -7419,7 +7419,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { 
          (nw != NULL) && 
          (nw->type == XML_ELEMENT_NODE) && 
          (nw->children == NULL)) 
 @@ -195,11 +202,74 @@ 
  
      break; 
         } 
 -Index: libxml2-2.9.14+dfsg/runxmlconf.c 
 -=================================================================== 
 ---- libxml2-2.9.14+dfsg.orig/runxmlconf.c 
 -+++ libxml2-2.9.14+dfsg/runxmlconf.c 
 -@@ -197,7 +197,7 @@ xmlconfTestInvalid(const char *id, const 
 +@@ -10858,13 +10858,13 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) { 
 +     } 
 + 
 +     if ((ctxt->wellFormed) && (ctxt->myDoc != NULL)) { 
 +-        ctxt->myDoc->properties |= XML_DOC_WELLFORMED; 
 ++        XML_DOC_ADD_PROPERTIES(ctxt->myDoc, XML_DOC_WELLFORMED); 
 +  if (ctxt->valid) 
 +-     ctxt->myDoc->properties |= XML_DOC_DTDVALID; 
 ++     XML_DOC_ADD_PROPERTIES(ctxt->myDoc, XML_DOC_DTDVALID); 
 +  if (ctxt->nsWellFormed) 
 +-     ctxt->myDoc->properties |= XML_DOC_NSVALID; 
 ++     XML_DOC_ADD_PROPERTIES(ctxt->myDoc, XML_DOC_NSVALID); 
 +  if (ctxt->options & XML_PARSE_OLD10) 
 +-     ctxt->myDoc->properties |= XML_DOC_OLD10; 
 ++     XML_DOC_ADD_PROPERTIES(ctxt->myDoc, XML_DOC_OLD10); 
 +     } 
 +     if (! ctxt->wellFormed) { 
 +  ctxt->valid = 0; 
 +@@ -12748,7 +12748,7 @@ xmlIOParseDTD(xmlSAXHandlerPtr sax, xml 
 arserInputBufferPtr input, 
 +  xmlErrMemory(ctxt, "New Doc failed"); 
 +  return(NULL); 
 +     } 
 +-    ctxt->myDoc->properties = XML_DOC_INTERNAL; 
 ++    XML_DOC_SET_PROPERTIES(ctxt->myDoc, XML_DOC_INTERNAL); 
 +     ctxt->myDoc->extSubset = xmlNewDtd(ctxt->myDoc, BAD_CAST "none", 
 +                                 BAD_CAST "none", BAD_CAST "none"); 
 + 
 +@@ -12897,7 +12897,7 @@ xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar 
 *ExternalID, 
 +  xmlFreeParserCtxt(ctxt); 
 +  return(NULL); 
 +     } 
 +-    ctxt->myDoc->properties = XML_DOC_INTERNAL; 
 ++    XML_DOC_SET_PROPERTIES(ctxt->myDoc, XML_DOC_INTERNAL); 
 +     ctxt->myDoc->extSubset = xmlNewDtd(ctxt->myDoc, BAD_CAST "none", 
 +                                 ExternalID, SystemID); 
 +     xmlParseExternalSubset(ctxt, ExternalID, SystemID); 
 +@@ -13047,7 +13047,7 @@ xmlParseExternalEntityPrivate(xmlDocPtr doc, 
 xmlParserCtxtPtr oldctxt, 
 +  xmlFreeParserCtxt(ctxt); 
 +  return(XML_ERR_INTERNAL_ERROR); 
 +     } 
 +-    newDoc->properties = XML_DOC_INTERNAL; 
 ++    XML_DOC_SET_PROPERTIES(newDoc, XML_DOC_INTERNAL); 
 +     if (doc) { 
 +         newDoc->intSubset = doc->intSubset; 
 +         newDoc->extSubset = doc->extSubset; 
 +@@ -13366,7 +13366,7 @@ xmlParseBalancedChunkMemor 
 yInternal(xmlParserCtxtPtr 
 oldctxt, 
 +      xmlFreeParserCtxt(ctxt); 
 +      return(XML_ERR_INTERNAL_ERROR); 
 +  } 
 +- newDoc->properties = XML_DOC_INTERNAL; 
 ++ XML_DOC_SET_PROPERTIES(newDoc, XML_DOC_INTERNAL); 
 +  newDoc->dict = ctxt->dict; 
 +  xmlDictReference(newDoc->dict); 
 +  ctxt->myDoc = newDoc; 
 +@@ -13768,7 +13768,7 @@ xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc, 
 xmlSAXHandlerPtr sax, 
 +  xmlFreeParserCtxt(ctxt); 
 +  return(-1); 
 +     } 
 +-    newDoc->properties = XML_DOC_INTERNAL; 
 ++    XML_DOC_SET_PROPERTIES(newDoc, XML_DOC_INTERNAL); 
 +     if ((doc != NULL) && (doc->dict != NULL)) { 
 +         xmlDictFree(ctxt->dict); 
 +  ctxt->dict = doc->dict; 
 +diff --git a/runxmlconf.c b/runxmlconf.c 
 +index 8a37aa8..601a0af 100644 
 +--- a/runxmlconf.c 
 ++++ b/runxmlconf.c 
 +@@ -197,7 +197,7 @@ xmlconfTestInvalid(const char *id, const char 
 *filename, 
 int options) { 
             id, filename); 
       } else { 
       /* invalidity should be reported both in the context and in the 
 document 
 */ 
 @@ -208,7 +278,7 @@ 
        test_log("test %s : %s failed to detect invalid document\\n", 
          id, filename); 
        nb_errors++; 
 -@@ -229,7 +229,7 @@ xmlconfTestValid(const char *id, const c 
 +@@ -229,7 +229,7 @@ xmlconfTestValid(const char *id, const char *filename, 
 int options) { 
    ret = 0; 
       } else { 
       /* validity should be reported both in the context and in the 
 document */ 
 @@ -217,10 +287,10 @@ 
        test_log("test %s : %s failed to validate a valid document\\n", 
          id, filename); 
        nb_errors++; 
 -Index: libxml2-2.9.14+dfsg/tree.c 
 -=================================================================== 
 ---- libxml2-2.9.14+dfsg.orig/tree.c 
 -+++ libxml2-2.9.14+dfsg/tree.c 
 +diff --git a/tree.c b/tree.c 
 +index 60cc6f4..2ce9f7e 100644 
 +--- a/tree.c 
 ++++ b/tree.c 
  @@ -1192,7 +1192,7 @@ xmlNewDoc(const xmlChar *version) { 
       cur->compression = -1; /* not initialized */ 
       cur->doc = cur; 
 @@ -239,7 +309,7 @@ 
        xmlRemoveID(cur->doc, cur); 
       } 
       if (cur->children != NULL) xmlFreeNodeList(cur->children); 
 -@@ -2838,7 +2838,7 @@ xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr 
 +@@ -2838,7 +2838,7 @@ xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) { 
    if(tree->type == XML_ELEMENT_NODE) { 
        prop = tree->properties; 
        while (prop != NULL) { 
 @@ -248,7 +318,7 @@ 
                       xmlRemoveID(tree->doc, prop); 
                   } 
  
 -@@ -6952,9 +6952,9 @@ xmlSetNsProp(xmlNodePtr node, xmlNsPtr n 
 +@@ -6952,9 +6952,9 @@ xmlSetNsProp(xmlNodePtr node, xmlNsPtr ns, const 
 xmlChar *name, 
    /* 
    * Modify the attribute's value. 
    */ 
 @@ -260,7 +330,7 @@ 
    } 
    if (prop->children != NULL) 
        xmlFreeNodeList(prop->children); 
 -@@ -6974,7 +6974,7 @@ xmlSetNsProp(xmlNodePtr node, xmlNsPtr n 
  
 [continued in next message] 
  
 --- SoupGate-Win32 v1.05 
  * Origin: you cannot sedate... all the things you hate (1:229/2) 

[ list messages | list forums | previous | next | reply ]

search for:

328,128 visits
(c) 1994,  bbs@darkrealms.ca