From: Anas Nashif Date: Wed, 7 Nov 2012 16:55:54 +0000 (-0800) Subject: remove patches X-Git-Tag: accepted/tizen/common/20150107.101732~6 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Flibxml2.git;a=commitdiff_plain;h=1a7c9776fc1a754911826583e89077e046011e6c remove patches --- diff --git a/packaging/fix-perl.diff b/packaging/fix-perl.diff deleted file mode 100644 index 600b259..0000000 --- a/packaging/fix-perl.diff +++ /dev/null @@ -1,136 +0,0 @@ -commit 77b77b1301e052d90e6a0967534a698506afcd86 -Author: Daniel Veillard -Date: Thu Jan 26 19:11:02 2012 +0800 - - Fix SAX2 builder in case of undefined element namespaces - - Work as in XML-1.0 before namespaces, and use prefix:localname - as the new element name (and no namespace of course) - Also fix 3 cases in the regression tests where the prefix: was - erroneously dropped in such case - -Index: SAX2.c -=================================================================== ---- SAX2.c.orig -+++ SAX2.c -@@ -2162,7 +2162,6 @@ xmlSAX2StartElementNs(void *ctx, - xmlNodePtr parent; - xmlNsPtr last = NULL, ns; - const xmlChar *uri, *pref; -- xmlChar *lname = NULL; - int i, j; - - if (ctx == NULL) return; -@@ -2182,20 +2181,6 @@ xmlSAX2StartElementNs(void *ctx, - } - - /* -- * Take care of the rare case of an undefined namespace prefix -- */ -- if ((prefix != NULL) && (URI == NULL)) { -- if (ctxt->dictNames) { -- const xmlChar *fullname; -- -- fullname = xmlDictQLookup(ctxt->dict, prefix, localname); -- if (fullname != NULL) -- localname = fullname; -- } else { -- lname = xmlBuildQName(localname, prefix, NULL, 0); -- } -- } -- /* - * allocate the node - */ - if (ctxt->freeElems != NULL) { -@@ -2208,10 +2193,7 @@ xmlSAX2StartElementNs(void *ctx, - if (ctxt->dictNames) - ret->name = localname; - else { -- if (lname == NULL) -- ret->name = xmlStrdup(localname); -- else -- ret->name = lname; -+ ret->name = xmlStrdup(localname); - if (ret->name == NULL) { - xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElementNs"); - return; -@@ -2223,11 +2205,8 @@ xmlSAX2StartElementNs(void *ctx, - if (ctxt->dictNames) - ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL, - (xmlChar *) localname, NULL); -- else if (lname == NULL) -- ret = xmlNewDocNode(ctxt->myDoc, NULL, localname, NULL); - else -- ret = xmlNewDocNodeEatName(ctxt->myDoc, NULL, -- (xmlChar *) lname, NULL); -+ ret = xmlNewDocNode(ctxt->myDoc, NULL, localname, NULL); - if (ret == NULL) { - xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElementNs"); - return; -@@ -2334,33 +2313,8 @@ xmlSAX2StartElementNs(void *ctx, - */ - if (nb_attributes > 0) { - for (j = 0,i = 0;i < nb_attributes;i++,j+=5) { -- /* -- * Handle the rare case of an undefined atribute prefix -- */ -- if ((attributes[j+1] != NULL) && (attributes[j+2] == NULL)) { -- if (ctxt->dictNames) { -- const xmlChar *fullname; -- -- fullname = xmlDictQLookup(ctxt->dict, attributes[j+1], -- attributes[j]); -- if (fullname != NULL) { -- xmlSAX2AttributeNs(ctxt, fullname, NULL, -- attributes[j+3], attributes[j+4]); -- continue; -- } -- } else { -- lname = xmlBuildQName(attributes[j], attributes[j+1], -- NULL, 0); -- if (lname != NULL) { -- xmlSAX2AttributeNs(ctxt, lname, NULL, -- attributes[j+3], attributes[j+4]); -- xmlFree(lname); -- continue; -- } -- } -- } - xmlSAX2AttributeNs(ctxt, attributes[j], attributes[j+1], -- attributes[j+3], attributes[j+4]); -+ attributes[j+3], attributes[j+4]); - } - } - -Index: result/namespaces/err_7.xml -=================================================================== ---- result/namespaces/err_7.xml.orig -+++ result/namespaces/err_7.xml -@@ -1,2 +1,2 @@ - -- -+ -Index: result/xmlid/id_tst2.xml -=================================================================== ---- result/xmlid/id_tst2.xml.orig -+++ result/xmlid/id_tst2.xml -@@ -1,6 +1,6 @@ - Object is a Node Set : - Set contains 1 nodes: --1 ELEMENT n:foo -+1 ELEMENT foo - ATTRIBUTE id - TEXT - content=bar -Index: result/xmlid/id_tst3.xml -=================================================================== ---- result/xmlid/id_tst3.xml.orig -+++ result/xmlid/id_tst3.xml -@@ -1,6 +1,6 @@ - Object is a Node Set : - Set contains 1 nodes: --1 ELEMENT f:o:o -+1 ELEMENT o:o - ATTRIBUTE id - TEXT - content=bar