diff options
Diffstat (limited to 'dev-libs/libxml2')
-rw-r--r-- | dev-libs/libxml2/Manifest | 5 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch | 34 | ||||
-rw-r--r-- | dev-libs/libxml2/libxml2-2.9.10-r4.ebuild (renamed from dev-libs/libxml2/libxml2-2.9.10-r3.ebuild) | 3 | ||||
-rw-r--r-- | dev-libs/libxml2/metadata.xml | 8 |
4 files changed, 46 insertions, 4 deletions
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index df2aa706eb11..e37bdf5f04cd 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -2,10 +2,11 @@ AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b8 AUX libxml2-2.9.10-remove-TRUE.patch 942 BLAKE2B bd5272551189d21162366318b211965aca2da947e5bbadaa8a487821369c3f552005de243c4b110392908277144317bd64c86d8641b972cbdb338d7eaf93dd08 SHA512 6abc43b95baa5540c78435654f391858c8e72667afdf00c993907510204441aee4367d1d8a038961e65e9d4d25ac8d0c4f5b7a2ee8d8357737dce5b643898502 AUX libxml2-2.9.2-python-ABIFLAG.patch 728 BLAKE2B d81b042b5000717d5aa88ac4cebf78749f5a4ef661c227537171c5695d97a16ca75c790c8b540e3481a54dc2d935112b46e0a23509c887e16e3f2886c08f1d69 SHA512 2f801329ad4e13dc70450d41f7659a510fe429b3aa9b66859fed25c4e3d95381d6f253f3a60a54002a16999296d3bd2adaca5e4cca92186492bfc7de3ac84426 AUX libxml2-2.9.8-out-of-tree-test.patch 1311 BLAKE2B 7b3e7abf273c1ab2cbc42b1fcd4ff7bef365503d8c04b315b0857574054409ac76c367f7ef0c944d448ef3ca84268082f59424758894cffa31a93925a81972c8 SHA512 4b665c7c4bea2d938f7b2021a38f274b9e40dd38c5e2085716cae02c60cd3ff9aa109185e7bfdd38d2724d76500c99da0db0968f634b56f7ef418a7a72ef144a +AUX libxml2-2.9.8-python3-unicode-errors.patch 1259 BLAKE2B 4425728c1e7a16c3b7faafba02468c01b9b87fe21dc6e2488d56f599573bc442f78386f64477a89c3332cd25f9b5ef3b4fedc47b51915c727a1b8eba06e7776d SHA512 a205c97fa1488fb8907cfa08b5f82e2055c80b86213dc3cc5c4b526fe6aa786bcc4e4eeb226c44635a1d021307b39e3940f706c42fb60e9e3e9b490a84164df7 DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe -EBUILD libxml2-2.9.10-r3.ebuild 6855 BLAKE2B 1d0f7df5292447278e6a4d69cf8604b7a60a2b55b171c22c76c118b3da29f8b9831d1a0840930c9dcb3bb063bf8451aea163a4a345d3def3147ed716fd50ee15 SHA512 e223d55f9f854497ef3d50cf1caec72e0f4a27513517f275de8838c0e550c9fc0ad0d7f4476b9a1355076df16f1db4c543dab207f88c7c2d93d2a084ca1be0eb -MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d +EBUILD libxml2-2.9.10-r4.ebuild 6934 BLAKE2B 10ea3e8d538755eaa260d1a4ea8e4661349e522169b093e3bf847286ccbc5c9b29041ca6322435fd381252b98b2ffb288b95ffc7f9d771719d26f304bc8b6260 SHA512 84b582b971e08881ee12321c9ab043b81477fab51fffefb1c240532315686f8964ec6d315e67d9ae87e02622c56e5d22b67c08d89e0dd041e507a1b61d9f3ba7 +MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a 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 new file mode 100644 index 000000000000..e87dcdedf88c --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch @@ -0,0 +1,34 @@ +Index: libxml2-2.9.5/python/libxml.c +=================================================================== +--- libxml2-2.9.5.orig/python/libxml.c ++++ libxml2-2.9.5/python/libxml.c +@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + PyObject *message; + PyObject *result; + char str[1000]; ++ unsigned char *ptr = (unsigned char *)str; + + #ifdef DEBUG_ERROR + printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); +@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU + str[999] = 0; + va_end(ap); + ++#if PY_MAJOR_VERSION >= 3 ++ /* Ensure the error string doesn't start at UTF8 continuation. */ ++ while (*ptr && (*ptr & 0xc0) == 0x80) ++ ptr++; ++#endif ++ + list = PyTuple_New(2); + PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); + Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); +- message = libxml_charPtrConstWrap(str); ++ message = libxml_charPtrConstWrap(ptr); + PyTuple_SetItem(list, 1, message); + result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); ++ /* Forget any errors caused in the error handler. */ ++ PyErr_Clear(); + Py_XDECREF(list); + Py_XDECREF(result); + } diff --git a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild index 916abdd469c6..a6678320ffe2 100644 --- a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild @@ -93,6 +93,9 @@ src_prepare() { # Fix python tests when building out of tree #565576 eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch + # bug #745162 + eapply "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch + if [[ ${CHOST} == *-darwin* ]] ; then # Avoid final linking arguments for python modules sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die diff --git a/dev-libs/libxml2/metadata.xml b/dev-libs/libxml2/metadata.xml index 137e67bdbf95..e6e5fac66f83 100644 --- a/dev-libs/libxml2/metadata.xml +++ b/dev-libs/libxml2/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> </maintainer> <upstream> <remote-id type="cpe">cpe:/a:xmlsoft:libxml2</remote-id> |