commit: a54298ad9cd0f92c370573c087ad77e432e692ab Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Apr 17 04:57:43 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 18 01:38:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54298ad
dev-libs/libxml2: tidy up patches Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch | 7 ------- dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch | 8 -------- dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch | 5 ----- dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch | 8 -------- dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch | 7 +++---- 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch index e405feb37c3..c979c841477 100644 --- a/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch +++ b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch @@ -10,11 +10,6 @@ icu-68.1 removed macro definitions for TRUE and FALSE Signed-off-by: Lars Wendler <[email protected]> --- - encoding.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/encoding.c b/encoding.c -index ad4d8a63..ea1fa99e 100644 --- a/encoding.c +++ b/encoding.c @@ -1958,7 +1958,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, @@ -27,5 +22,3 @@ index ad4d8a63..ea1fa99e 100644 #endif /* LIBXML_ICU_ENABLED */ else { -- -2.29.2 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch index 179f3a8c384..205b26b54f8 100644 --- a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch +++ b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch @@ -12,12 +12,6 @@ Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for the report. Fixes #178. ---- - xmllint.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/xmllint.c b/xmllint.c -index f6a8e463..c647486f 100644 --- a/xmllint.c +++ b/xmllint.c @@ -528,6 +528,12 @@ static void @@ -34,5 +28,3 @@ index f6a8e463..c647486f 100644 if (result) { xmlGenericError(xmlGenericErrorContext, "%s", result); -- -GitLab - diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch b/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch index 14dd5bc7342..7c5557f9915 100644 --- a/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch +++ b/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch @@ -1,8 +1,3 @@ - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 14ac0a8..f787b12 100644 --- a/configure.ac +++ b/configure.ac @@ -844,7 +844,7 @@ if test "$with_python" != "no" ; then diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch index fcc441d05de..1e269c3387b 100644 --- a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch +++ b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch @@ -9,12 +9,6 @@ When building out of tree, the relative path this test uses doesn't work. Resolve the path relative to the test script itself instead. Url: https://bugs.gentoo.org/565576 ---- - python/tests/reader5.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/python/tests/reader5.py b/python/tests/reader5.py -index 82d0daea474a..da5355ffc4c6 100755 --- a/python/tests/reader5.py +++ b/python/tests/reader5.py @@ -4,6 +4,7 @@ @@ -36,5 +30,3 @@ index 82d0daea474a..da5355ffc4c6 100755 reader = input.newTextReader("REC") res="" -- -2.19.1 - diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch b/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch index e87dcdedf88..db20221afe4 100644 --- a/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch +++ b/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch @@ -1,7 +1,6 @@ -Index: libxml2-2.9.5/python/libxml.c -=================================================================== ---- libxml2-2.9.5.orig/python/libxml.c -+++ libxml2-2.9.5/python/libxml.c +https://bugs.gentoo.org/745162 +--- a/python/libxml.c ++++ b/python/libxml.c @@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU PyObject *message; PyObject *result;
