diff options
Diffstat (limited to 'chromium/third_party/libxml/chromium')
| -rwxr-xr-x | chromium/third_party/libxml/chromium/roll.py | 7 | ||||
| -rw-r--r-- | chromium/third_party/libxml/chromium/undo-sax-deprecation.patch | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/chromium/third_party/libxml/chromium/roll.py b/chromium/third_party/libxml/chromium/roll.py index b0d19513662..9fc5a974802 100755 --- a/chromium/third_party/libxml/chromium/roll.py +++ b/chromium/third_party/libxml/chromium/roll.py @@ -66,9 +66,7 @@ import tempfile # e. Complete the review as usual PATCHES = [ - 'chromium-issue-628581.patch', 'libxml2-2.9.4-security-xpath-nodetab-uaf.patch', - 'chromium-issue-708434.patch', 'undo-sax-deprecation.patch', ] @@ -216,6 +214,11 @@ FILES_TO_REMOVE = [ 'src/xpointer.c', 'src/xstc', 'src/xzlib.c', + 'linux/.deps', + 'linux/doc', + 'linux/example', + 'linux/fuzz', + 'linux/python', ] diff --git a/chromium/third_party/libxml/chromium/undo-sax-deprecation.patch b/chromium/third_party/libxml/chromium/undo-sax-deprecation.patch index 51f68b94ab7..d618d46ceae 100644 --- a/chromium/third_party/libxml/chromium/undo-sax-deprecation.patch +++ b/chromium/third_party/libxml/chromium/undo-sax-deprecation.patch @@ -1,8 +1,8 @@ diff --git a/include/libxml/parser.h b/include/libxml/parser.h -index f96148b5..1587b9d0 100644 +index d104b874..6dc4ca9b 100644 --- a/include/libxml/parser.h +++ b/include/libxml/parser.h -@@ -897,7 +897,9 @@ XMLPUBFUN xmlDocPtr XMLCALL +@@ -899,7 +899,9 @@ XMLPUBFUN xmlDocPtr xmlSAXParseDoc (xmlSAXHandlerPtr sax, const xmlChar *cur, int recovery); @@ -10,6 +10,6 @@ index f96148b5..1587b9d0 100644 +// TODO(https://github.com/google/maldoca/issues/87): Re-Deprecate this when +// maldoca stops using xmlSAXParseMemory. +//XML_DEPRECATED - XMLPUBFUN xmlDocPtr XMLCALL + XMLPUBFUN xmlDocPtr xmlSAXParseMemory (xmlSAXHandlerPtr sax, const char *buffer, |