From b047ebb3a6b1ad92dde89b400169cd091d2da568 Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Sat, 20 Jun 2009 01:30:42 +0000 Subject: Stage 1 of massive libxml2 reorganization. git-svn-id: http://svn.telesphoreo.org/trunk@626 514c082c-b64e-11dc-b46d-3d985efe055d --- data/_libxml2/_metadata/depiction | 1 + data/_libxml2/_metadata/description | 1 + data/_libxml2/_metadata/homepage | 1 + data/_libxml2/_metadata/license | 27 +++++++++++++++++++++++++ data/_libxml2/_metadata/maintainer | 1 + data/_libxml2/_metadata/priority | 1 + data/_libxml2/_metadata/role | 1 + data/_libxml2/_metadata/section | 1 + data/_libxml2/_metadata/tags | 1 + data/_libxml2/_metadata/version | 1 + data/_libxml2/formed.diff | 38 ++++++++++++++++++++++++++++++++++++ data/_libxml2/libxml2-2.6.32.tar.gz | Bin 0 -> 4722227 bytes data/_libxml2/make.sh | 4 ++++ data/_libxml2/nspop.diff | 10 ++++++++++ data/libxml2/_metadata/depiction | 1 - data/libxml2/_metadata/description | 1 - data/libxml2/_metadata/homepage | 1 - data/libxml2/_metadata/license | 27 ------------------------- data/libxml2/_metadata/maintainer | 1 - data/libxml2/_metadata/priority | 1 - data/libxml2/_metadata/role | 1 - data/libxml2/_metadata/section | 1 - data/libxml2/_metadata/tags | 1 - data/libxml2/_metadata/version | 1 - data/libxml2/formed.diff | 38 ------------------------------------ data/libxml2/libxml2-2.6.32.tar.gz | Bin 4722227 -> 0 bytes data/libxml2/make.sh | 4 ---- data/libxml2/nspop.diff | 10 ---------- 28 files changed, 88 insertions(+), 88 deletions(-) create mode 100644 data/_libxml2/_metadata/depiction create mode 100644 data/_libxml2/_metadata/description create mode 100644 data/_libxml2/_metadata/homepage create mode 100644 data/_libxml2/_metadata/license create mode 120000 data/_libxml2/_metadata/maintainer create mode 100644 data/_libxml2/_metadata/priority create mode 100644 data/_libxml2/_metadata/role create mode 100644 data/_libxml2/_metadata/section create mode 100644 data/_libxml2/_metadata/tags create mode 100644 data/_libxml2/_metadata/version create mode 100644 data/_libxml2/formed.diff create mode 100644 data/_libxml2/libxml2-2.6.32.tar.gz create mode 100644 data/_libxml2/make.sh create mode 100644 data/_libxml2/nspop.diff delete mode 100644 data/libxml2/_metadata/depiction delete mode 100644 data/libxml2/_metadata/description delete mode 100644 data/libxml2/_metadata/homepage delete mode 100644 data/libxml2/_metadata/license delete mode 120000 data/libxml2/_metadata/maintainer delete mode 100644 data/libxml2/_metadata/priority delete mode 100644 data/libxml2/_metadata/role delete mode 100644 data/libxml2/_metadata/section delete mode 100644 data/libxml2/_metadata/tags delete mode 100644 data/libxml2/_metadata/version delete mode 100644 data/libxml2/formed.diff delete mode 100644 data/libxml2/libxml2-2.6.32.tar.gz delete mode 100644 data/libxml2/make.sh delete mode 100644 data/libxml2/nspop.diff (limited to 'data') diff --git a/data/_libxml2/_metadata/depiction b/data/_libxml2/_metadata/depiction new file mode 100644 index 000000000..e14987749 --- /dev/null +++ b/data/_libxml2/_metadata/depiction @@ -0,0 +1 @@ +http://cydia.saurik.com/info/libxml2/ diff --git a/data/_libxml2/_metadata/description b/data/_libxml2/_metadata/description new file mode 100644 index 000000000..4fa2b6136 --- /dev/null +++ b/data/_libxml2/_metadata/description @@ -0,0 +1 @@ +very popular XML parser from Gnome diff --git a/data/_libxml2/_metadata/homepage b/data/_libxml2/_metadata/homepage new file mode 100644 index 000000000..3257c46a0 --- /dev/null +++ b/data/_libxml2/_metadata/homepage @@ -0,0 +1 @@ +http://xmlsoft.org/ diff --git a/data/_libxml2/_metadata/license b/data/_libxml2/_metadata/license new file mode 100644 index 000000000..417e95531 --- /dev/null +++ b/data/_libxml2/_metadata/license @@ -0,0 +1,27 @@ +Except where otherwise noted in the source code (e.g. the files hash.c, +list.c and the trio files, which are covered by a similar licence but +with different Copyright notices) all the files are: + + Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Daniel Veillard shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from him. + diff --git a/data/_libxml2/_metadata/maintainer b/data/_libxml2/_metadata/maintainer new file mode 120000 index 000000000..0fa66e077 --- /dev/null +++ b/data/_libxml2/_metadata/maintainer @@ -0,0 +1 @@ +../../../people/saurik \ No newline at end of file diff --git a/data/_libxml2/_metadata/priority b/data/_libxml2/_metadata/priority new file mode 100644 index 000000000..fad9e164a --- /dev/null +++ b/data/_libxml2/_metadata/priority @@ -0,0 +1 @@ +required diff --git a/data/_libxml2/_metadata/role b/data/_libxml2/_metadata/role new file mode 100644 index 000000000..8d0320866 --- /dev/null +++ b/data/_libxml2/_metadata/role @@ -0,0 +1 @@ +developer diff --git a/data/_libxml2/_metadata/section b/data/_libxml2/_metadata/section new file mode 100644 index 000000000..e0eb96881 --- /dev/null +++ b/data/_libxml2/_metadata/section @@ -0,0 +1 @@ +Development diff --git a/data/_libxml2/_metadata/tags b/data/_libxml2/_metadata/tags new file mode 100644 index 000000000..a8928cec8 --- /dev/null +++ b/data/_libxml2/_metadata/tags @@ -0,0 +1 @@ +purpose::library diff --git a/data/_libxml2/_metadata/version b/data/_libxml2/_metadata/version new file mode 100644 index 000000000..2edd3d459 --- /dev/null +++ b/data/_libxml2/_metadata/version @@ -0,0 +1 @@ +2.6.32 diff --git a/data/_libxml2/formed.diff b/data/_libxml2/formed.diff new file mode 100644 index 000000000..9ff684d7c --- /dev/null +++ b/data/_libxml2/formed.diff @@ -0,0 +1,38 @@ +diff -ru libxml2-2.6.32/parser.c libxml2-2.6.32+iPhone/parser.c +--- libxml2-2.6.32/parser.c 2008-04-08 14:47:58.000000000 +0000 ++++ libxml2-2.6.32+iPhone/parser.c 2008-08-28 07:30:34.000000000 +0000 +@@ -10003,7 +10003,7 @@ + xmlParseGetLasts(ctxt, &lastlt, &lastgt); + + while (1) { +- if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1)) ++ if ((ctxt->wellFormed != 1) && (ctxt->disableSAX == 1)) + return(0); + + +@@ -10881,7 +10881,7 @@ + + if (ctxt == NULL) + return(XML_ERR_INTERNAL_ERROR); +- if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1)) ++ if ((ctxt->wellFormed != 1) && (ctxt->disableSAX == 1)) + return(ctxt->errNo); + if (ctxt->instate == XML_PARSER_START) + xmlDetectSAX2(ctxt); +@@ -10932,7 +10932,7 @@ + (ctxt->input->buf != NULL)) { + xmlParserInputBufferPush(ctxt->input->buf, 1, "\r"); + } +- if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1)) ++ if ((ctxt->wellFormed != 1) && (ctxt->disableSAX == 1)) + return(ctxt->errNo); + if (terminate) { + /* +@@ -10962,6 +10962,7 @@ + } + ctxt->instate = XML_PARSER_EOF; + } ++ if (ctxt->wellFormed) return(0); + return((xmlParserErrors) ctxt->errNo); + } + diff --git a/data/_libxml2/libxml2-2.6.32.tar.gz b/data/_libxml2/libxml2-2.6.32.tar.gz new file mode 100644 index 000000000..5e3a6f4f0 Binary files /dev/null and b/data/_libxml2/libxml2-2.6.32.tar.gz differ diff --git a/data/_libxml2/make.sh b/data/_libxml2/make.sh new file mode 100644 index 000000000..457bfd295 --- /dev/null +++ b/data/_libxml2/make.sh @@ -0,0 +1,4 @@ +pkg:setup +pkg:configure --without-python +make +pkg:install diff --git a/data/_libxml2/nspop.diff b/data/_libxml2/nspop.diff new file mode 100644 index 000000000..c324af8ac --- /dev/null +++ b/data/_libxml2/nspop.diff @@ -0,0 +1,10 @@ +--- libxml2-2.6.16/parser.c 2004-11-09 15:48:18.000000000 +0000 ++++ libxml2-2.6.16+iPhone/parser.c 2007-08-10 01:39:38.000000000 +0000 +@@ -9253,6 +9276,8 @@ + (!ctxt->disableSAX)) + ctxt->sax->endElementNs(ctxt->userData, name, prefix, URI); ++ if (ctxt->nsNr - nsNr > 0) ++ nsPop(ctxt, ctxt->nsNr - nsNr); + #ifdef LIBXML_SAX1_ENABLED + } else { + if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL) && diff --git a/data/libxml2/_metadata/depiction b/data/libxml2/_metadata/depiction deleted file mode 100644 index e14987749..000000000 --- a/data/libxml2/_metadata/depiction +++ /dev/null @@ -1 +0,0 @@ -http://cydia.saurik.com/info/libxml2/ diff --git a/data/libxml2/_metadata/description b/data/libxml2/_metadata/description deleted file mode 100644 index 4fa2b6136..000000000 --- a/data/libxml2/_metadata/description +++ /dev/null @@ -1 +0,0 @@ -very popular XML parser from Gnome diff --git a/data/libxml2/_metadata/homepage b/data/libxml2/_metadata/homepage deleted file mode 100644 index 3257c46a0..000000000 --- a/data/libxml2/_metadata/homepage +++ /dev/null @@ -1 +0,0 @@ -http://xmlsoft.org/ diff --git a/data/libxml2/_metadata/license b/data/libxml2/_metadata/license deleted file mode 100644 index 417e95531..000000000 --- a/data/libxml2/_metadata/license +++ /dev/null @@ -1,27 +0,0 @@ -Except where otherwise noted in the source code (e.g. the files hash.c, -list.c and the trio files, which are covered by a similar licence but -with different Copyright notices) all the files are: - - Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of Daniel Veillard shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from him. - diff --git a/data/libxml2/_metadata/maintainer b/data/libxml2/_metadata/maintainer deleted file mode 120000 index 0fa66e077..000000000 --- a/data/libxml2/_metadata/maintainer +++ /dev/null @@ -1 +0,0 @@ -../../../people/saurik \ No newline at end of file diff --git a/data/libxml2/_metadata/priority b/data/libxml2/_metadata/priority deleted file mode 100644 index fad9e164a..000000000 --- a/data/libxml2/_metadata/priority +++ /dev/null @@ -1 +0,0 @@ -required diff --git a/data/libxml2/_metadata/role b/data/libxml2/_metadata/role deleted file mode 100644 index 8d0320866..000000000 --- a/data/libxml2/_metadata/role +++ /dev/null @@ -1 +0,0 @@ -developer diff --git a/data/libxml2/_metadata/section b/data/libxml2/_metadata/section deleted file mode 100644 index e0eb96881..000000000 --- a/data/libxml2/_metadata/section +++ /dev/null @@ -1 +0,0 @@ -Development diff --git a/data/libxml2/_metadata/tags b/data/libxml2/_metadata/tags deleted file mode 100644 index a8928cec8..000000000 --- a/data/libxml2/_metadata/tags +++ /dev/null @@ -1 +0,0 @@ -purpose::library diff --git a/data/libxml2/_metadata/version b/data/libxml2/_metadata/version deleted file mode 100644 index 2edd3d459..000000000 --- a/data/libxml2/_metadata/version +++ /dev/null @@ -1 +0,0 @@ -2.6.32 diff --git a/data/libxml2/formed.diff b/data/libxml2/formed.diff deleted file mode 100644 index 9ff684d7c..000000000 --- a/data/libxml2/formed.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff -ru libxml2-2.6.32/parser.c libxml2-2.6.32+iPhone/parser.c ---- libxml2-2.6.32/parser.c 2008-04-08 14:47:58.000000000 +0000 -+++ libxml2-2.6.32+iPhone/parser.c 2008-08-28 07:30:34.000000000 +0000 -@@ -10003,7 +10003,7 @@ - xmlParseGetLasts(ctxt, &lastlt, &lastgt); - - while (1) { -- if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1)) -+ if ((ctxt->wellFormed != 1) && (ctxt->disableSAX == 1)) - return(0); - - -@@ -10881,7 +10881,7 @@ - - if (ctxt == NULL) - return(XML_ERR_INTERNAL_ERROR); -- if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1)) -+ if ((ctxt->wellFormed != 1) && (ctxt->disableSAX == 1)) - return(ctxt->errNo); - if (ctxt->instate == XML_PARSER_START) - xmlDetectSAX2(ctxt); -@@ -10932,7 +10932,7 @@ - (ctxt->input->buf != NULL)) { - xmlParserInputBufferPush(ctxt->input->buf, 1, "\r"); - } -- if ((ctxt->errNo != XML_ERR_OK) && (ctxt->disableSAX == 1)) -+ if ((ctxt->wellFormed != 1) && (ctxt->disableSAX == 1)) - return(ctxt->errNo); - if (terminate) { - /* -@@ -10962,6 +10962,7 @@ - } - ctxt->instate = XML_PARSER_EOF; - } -+ if (ctxt->wellFormed) return(0); - return((xmlParserErrors) ctxt->errNo); - } - diff --git a/data/libxml2/libxml2-2.6.32.tar.gz b/data/libxml2/libxml2-2.6.32.tar.gz deleted file mode 100644 index 5e3a6f4f0..000000000 Binary files a/data/libxml2/libxml2-2.6.32.tar.gz and /dev/null differ diff --git a/data/libxml2/make.sh b/data/libxml2/make.sh deleted file mode 100644 index 457bfd295..000000000 --- a/data/libxml2/make.sh +++ /dev/null @@ -1,4 +0,0 @@ -pkg:setup -pkg:configure --without-python -make -pkg:install diff --git a/data/libxml2/nspop.diff b/data/libxml2/nspop.diff deleted file mode 100644 index c324af8ac..000000000 --- a/data/libxml2/nspop.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- libxml2-2.6.16/parser.c 2004-11-09 15:48:18.000000000 +0000 -+++ libxml2-2.6.16+iPhone/parser.c 2007-08-10 01:39:38.000000000 +0000 -@@ -9253,6 +9276,8 @@ - (!ctxt->disableSAX)) - ctxt->sax->endElementNs(ctxt->userData, name, prefix, URI); -+ if (ctxt->nsNr - nsNr > 0) -+ nsPop(ctxt, ctxt->nsNr - nsNr); - #ifdef LIBXML_SAX1_ENABLED - } else { - if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL) && -- cgit v1.2.3