diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-10 23:44:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-10 23:44:42 +0100 |
commit | f356af92b88d56b78588e81310493d4f5a2f6d18 (patch) | |
tree | 0326fb33173ae3d096527af28f85685515533fbb /dev-libs/libxml2 | |
parent | 560358ad7081e6bb2a4e097d4c442b0bab626163 (diff) |
gentoo auto-resync : 10:05:2023 - 23:44:41
Diffstat (limited to 'dev-libs/libxml2')
-rw-r--r-- | dev-libs/libxml2/Manifest | 12 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.11.2-0001-iconv.patch | 63 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.11.2-0002-crash-old-libxslt.patch | 27 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.11.2-0003-no-xpath.patch | 245 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.11.2-0004-huge-push.patch | 27 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.11.2-0005-icu-detection.patch | 21 | ||||
-rw-r--r-- | dev-libs/libxml2/libxml2-2.10.3-r1.ebuild | 203 | ||||
-rw-r--r-- | dev-libs/libxml2/libxml2-2.11.2-r1.ebuild (renamed from dev-libs/libxml2/libxml2-2.11.1.ebuild) | 16 | ||||
-rw-r--r-- | dev-libs/libxml2/libxml2-2.11.2.ebuild | 3 |
9 files changed, 402 insertions, 215 deletions
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 70aaf00fd09e..1be488956b1f 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,14 +1,16 @@ AUX libxml2-2.10.3-python3-unicode-errors.patch 1208 BLAKE2B 8515db0c9d79c4397c3ef4147660ddf395b863de3658a8db27db20d2274949962172a42637bf9555d3d7bf63ead8f695d19f28ddb5e957b5302c8aed466058c7 SHA512 f2ab7934687ba14bf7541a381317d88c20d9912b424d1b206f8feb60224482f12e03c79ff4e8637025ee8d1bddd870183db932380990eafca833eea1c1373a06 -DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c +AUX libxml2-2.11.2-0001-iconv.patch 2085 BLAKE2B 7126800a74c053aaff78d693aff9aa5e296b321749f07b5d074d35f79687887d2b527beb3aad964e918e37200142ea7c0649194c2d15b5c708f83170e199b467 SHA512 3b499347e66b0a3cd2afe32042eb1881c09bd566255cec2e4ea73c83da18c97d74e0eda7b7e09fe3ea0e6eb240c514c413e25783aac0fad528526de287685b54 +AUX libxml2-2.11.2-0002-crash-old-libxslt.patch 697 BLAKE2B 2321e88c5303b56f8ea952f0fa2f13ab18568ff64f51174236d1cc655dca07b698e411e22721da8098f2a9fbd857a77eac16ff93434ed971c39a4c2cb4e4ad05 SHA512 ebdd877972b92e243f5bd2d65f377430c39dcbeddada4599b4871293143f1ca141bc9f447d7c89e623154c9f80ddf031dc0f9bb3e6d528db885f1d0051a51281 +AUX libxml2-2.11.2-0003-no-xpath.patch 5488 BLAKE2B 5420a76322cd450feb147ddf265ebc5155454b34a29d721229647392dda7f778059a511f702fa25f0c3e15cf58bd83382ee7b532be374228cbbb427169952d8c SHA512 4e8eff1c0b3d1d24a6314838348f52ab904b224f6dfe0f1eaa966bdb209d8906d3716f81fc5234231c63b182851c8b1fc6e70671754c1acce24b1041d3c033ce +AUX libxml2-2.11.2-0004-huge-push.patch 913 BLAKE2B 85e4b129ba5a0917a1c038b8d90bd6bb8e09f787758db175bc05a237551a342176d9dc5691cc19ec5eaf82513d3dc535938b8ddd99a9033c4db4caa8cdb70ba7 SHA512 60f4bb5da76225b062f71239264ed3ccdb4bd18444dd073934a43123837c90b173f97de6ab17e2c77a1778f630b6c6bd4faf1d876d61b99cee9fca2f6ea763f0 +AUX libxml2-2.11.2-0005-icu-detection.patch 680 BLAKE2B 0c2945a395a9f5430c3726b86aa9cb2b0578ca6307c412d00895261fc44f566eebc4f26ef86187933a352b704cee312bc8bd8c1e6338d6f17e84c6f6b791e040 SHA512 0abc52272b99ad6d6427515ac38d4c59d97e477889702b00dbe3035fd9a4fe7bed6ee9339e9a84836f3f068c2e03793c5c1bc9f36fea5b8493554f42c9d7904c DIST libxml2-2.10.4.tar.xz 2643600 BLAKE2B 5bbb63c6e58accf434513aeb974fed7349e5458de642ef89db77768c8d1383532614254e0e3f1d9471e2274c6b81a04a0a3afcb602707ce79550c2bd8e9028d9 SHA512 792c1dceb098cd353a7eca4c46d31cce6310b2553d97fd3918cf0b94d93b2480759202036511bde36c24166236bd4616f57e79959eea9afe3f60614bdfe13094 -DIST libxml2-2.11.1.tar.xz 2627948 BLAKE2B 4ae2c8583ff2fb590b29ffc250baae8d4d3978c6cb9d1d7fadbd3d9aa1d38a69ed0aeb0c9036efb060f869154e6f6d6ea6464ecbb05c7e788b7d93b1c2fa932d SHA512 cdcc06b7f8f8c2bd05ce3272dfd317b49cb52842bbf4bd6b50cd93c6f0b1bb6f57698b20369f6afeb110338b950633babfb8e9858b29f8c7d8b710fcbbec679d DIST libxml2-2.11.2.tar.xz 2627884 BLAKE2B 2785354724af03274f9796b10a5f6918a956a7b08ada2032c644cf7829a67d8628363b74d134dd2677f42d0df7f79a6f105e46e5f073416349f5bb36f6180859 SHA512 9b49522d816d7e5682bb863e7706c8e9ddc629d9148fbe6753e82aef4859c11ba6a4b6e801de967b5c3da517d44d0be2dc6b47553b0efee6f04f4cbf1d7285d5 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 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.10.3-r1.ebuild 5694 BLAKE2B 1ade1ac63d537f8b10e0f37d7e62d8f72c86bcd01bb2ace42d4c58126c62751fe7e39304354332e84992b3ebe400055cc26ebe3c7e9d02fdf128bb20353a118f SHA512 887700ecb155ac2da033b717f4118054bc0e874902269fd9d22eda771c8df2b0d0b8889a331a01f6527d13a80b0b07a35c2f4fa91666c289102e3f784a0796d3 EBUILD libxml2-2.10.4.ebuild 5694 BLAKE2B 1ade1ac63d537f8b10e0f37d7e62d8f72c86bcd01bb2ace42d4c58126c62751fe7e39304354332e84992b3ebe400055cc26ebe3c7e9d02fdf128bb20353a118f SHA512 887700ecb155ac2da033b717f4118054bc0e874902269fd9d22eda771c8df2b0d0b8889a331a01f6527d13a80b0b07a35c2f4fa91666c289102e3f784a0796d3 -EBUILD libxml2-2.11.1.ebuild 5449 BLAKE2B 6ba3a0f2a4f9999048a6216679a599f7ee4dd314d4b4b70c4bbcbf8df143722e6aa0a18e7191b8ddfd49912a29f702a4247f7faea002f11f60b8868ec45e1c69 SHA512 e55897c65b3b251a60f6e7b006ac0879527470bf5f7e602b29758b9ae035ef31c318fd52c0abf63c6ff51a00106b0bf84c8150e9f06eb5a6456ca2b6048f2eb4 -EBUILD libxml2-2.11.2.ebuild 5449 BLAKE2B 6ba3a0f2a4f9999048a6216679a599f7ee4dd314d4b4b70c4bbcbf8df143722e6aa0a18e7191b8ddfd49912a29f702a4247f7faea002f11f60b8868ec45e1c69 SHA512 e55897c65b3b251a60f6e7b006ac0879527470bf5f7e602b29758b9ae035ef31c318fd52c0abf63c6ff51a00106b0bf84c8150e9f06eb5a6456ca2b6048f2eb4 +EBUILD libxml2-2.11.2-r1.ebuild 5609 BLAKE2B ece4b5c952cc7eff5fa8d7fea0c98df81a35300d3a79a9074ed918b74eb8c2b4615642ddb6efee13b3e02acba2a673911191be5484c1e57c7642308b659fd00e SHA512 46565eb8d8bf3a8d21efab776ce296c61df18ab9d35328d60051e37e03d49fb766a684f0f54a17a60f9babd28a592669cce787899bcf414d37d2f7f6fe91a4ad +EBUILD libxml2-2.11.2.ebuild 5305 BLAKE2B 04465b5565f9f0a6ca7cfee5631764e9abb6caee3f58ca74ffac6f52088698e4d004b8aee005c2296b3292856e1ffe962fdb85bd261db4552da9e56e219d1b09 SHA512 01ed955947a4e17cf0c2a12bd9513bd7c34c5086e40f3e562b015a995620f550c959a7998f92c1f1569a7a3a76c3c4ab9c45c56549afd44cd8466b2e4efcf866 EBUILD libxml2-9999.ebuild 5305 BLAKE2B 04465b5565f9f0a6ca7cfee5631764e9abb6caee3f58ca74ffac6f52088698e4d004b8aee005c2296b3292856e1ffe962fdb85bd261db4552da9e56e219d1b09 SHA512 01ed955947a4e17cf0c2a12bd9513bd7c34c5086e40f3e562b015a995620f550c959a7998f92c1f1569a7a3a76c3c4ab9c45c56549afd44cd8466b2e4efcf866 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11 diff --git a/dev-libs/libxml2/files/libxml2-2.11.2-0001-iconv.patch b/dev-libs/libxml2/files/libxml2-2.11.2-0001-iconv.patch new file mode 100644 index 000000000000..615f413c4419 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.11.2-0001-iconv.patch @@ -0,0 +1,63 @@ +https://gitlab.gnome.org/GNOME/libxml2/-/commit/9c1f5fe7fbad2b57149c628802c4ded3e4f3d284 + +From 9c1f5fe7fbad2b57149c628802c4ded3e4f3d284 Mon Sep 17 00:00:00 2001 +From: Mike Dalessio <mike.dalessio@gmail.com> +Date: Fri, 5 May 2023 17:34:57 -0400 +Subject: [PATCH] autoconf: fix iconv library paths + +and pass cflags when building executables + +See 0f77167f for prior related work +--- a/Makefile.am ++++ b/Makefile.am +@@ -145,11 +145,12 @@ runsuite_DEPENDENCIES = $(DEPS) + runsuite_LDADD= $(LDADDS) + + xmllint_SOURCES=xmllint.c +-xmllint_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) ++xmllint_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) $(ICONV_CFLAGS) + xmllint_DEPENDENCIES = $(DEPS) + xmllint_LDADD= $(RDL_LIBS) $(LDADDS) + + xmlcatalog_SOURCES=xmlcatalog.c ++xmlcatalog_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) $(ICONV_CFLAGS) + xmlcatalog_DEPENDENCIES = $(DEPS) + xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS) + +--- a/configure.ac ++++ b/configure.ac +@@ -1036,7 +1036,7 @@ else + if test "$with_iconv" != "yes" && test "$with_iconv" != "" ; then + ICONV_DIR=$with_iconv + CPPFLAGS="$CPPFLAGS -I$ICONV_DIR/include" +- LIBS="$LIBS -L$ICONV_DIR/libs" ++ LIBS="$LIBS -L$ICONV_DIR/lib" + # Export this since our headers include iconv.h + XML_INCLUDEDIR="$XML_INCLUDEDIR -I$ICONV_DIR/include" + fi +@@ -1052,12 +1052,13 @@ else + ICONV_LIBS="-liconv"])])]) + if test "$WITH_ICONV" = "1" && test "$ICONV_DIR" != ""; then + ICONV_CFLAGS="-I$ICONV_DIR/include" +- ICONV_LIBS="-L$ICONV_DIR/libs $ICONV_LIBS" ++ ICONV_LIBS="-L$ICONV_DIR/lib $ICONV_LIBS" + fi + CPPFLAGS=$_cppflags + LIBS=$_libs + fi + AC_SUBST(WITH_ICONV) ++AC_SUBST(ICONV_CFLAGS) + + dnl + dnl Checks for ICU library. +@@ -1100,7 +1101,7 @@ else + ICU_LIBS=-licucore + if test "$ICU_DIR" != ""; then + ICU_CFLAGS="-I$ICU_DIR/include" +- ICU_LIBS="-L$ICU_DIR/libs $ICU_LIBS" ++ ICU_LIBS="-L$ICU_DIR/lib $ICU_LIBS" + fi])]) + CPPFLAGS=$_cppflags + LIBS=$_libs +-- +GitLab diff --git a/dev-libs/libxml2/files/libxml2-2.11.2-0002-crash-old-libxslt.patch b/dev-libs/libxml2/files/libxml2-2.11.2-0002-crash-old-libxslt.patch new file mode 100644 index 000000000000..2253ea6211d1 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.11.2-0002-crash-old-libxslt.patch @@ -0,0 +1,27 @@ +https://gitlab.gnome.org/GNOME/libxml2/-/commit/e6a9cc8d66778c20435a46e50d4e5866deace5f6 + +From e6a9cc8d66778c20435a46e50d4e5866deace5f6 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer <wellnhofer@aevum.de> +Date: Sat, 6 May 2023 15:28:13 +0200 +Subject: [PATCH] hash: Fix possible startup crash with old libxslt versions + +Call xmlInitParser in xmlHashCreate to make it work if the library +wasn't initialized yet. + +Otherwise, exsltRegisterAll from libxslt 1.1.24 or older might cause +a crash. + +See #534. +--- a/hash.c ++++ b/hash.c +@@ -180,6 +180,8 @@ xmlHashTablePtr + xmlHashCreate(int size) { + xmlHashTablePtr table; + ++ xmlInitParser(); ++ + if (size <= 0) + size = 256; + +-- +GitLab diff --git a/dev-libs/libxml2/files/libxml2-2.11.2-0003-no-xpath.patch b/dev-libs/libxml2/files/libxml2-2.11.2-0003-no-xpath.patch new file mode 100644 index 000000000000..f036c5814f26 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.11.2-0003-no-xpath.patch @@ -0,0 +1,245 @@ +https://gitlab.gnome.org/GNOME/libxml2/-/commit/41e78f8f8656b8e2206c06995da6bd8dcc82823d + +From 41e78f8f8656b8e2206c06995da6bd8dcc82823d Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer <wellnhofer@aevum.de> +Date: Mon, 8 May 2023 23:12:33 +0200 +Subject: [PATCH] xpath: Fix build without LIBXML_XPATH_ENABLED + +Move static function declaration into XPATH block. Also move comparison +functions. + +Fixes #537. +--- a/xpath.c ++++ b/xpath.c +@@ -145,6 +145,114 @@ + * any use of the macros IS_ASCII_CHARACTER and IS_ASCII_DIGIT) + */ + ++#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) ++ ++/************************************************************************ ++ * * ++ * Floating point stuff * ++ * * ++ ************************************************************************/ ++ ++double xmlXPathNAN = 0.0; ++double xmlXPathPINF = 0.0; ++double xmlXPathNINF = 0.0; ++ ++/** ++ * xmlXPathInit: ++ * ++ * DEPRECATED: Alias for xmlInitParser. ++ */ ++void ++xmlXPathInit(void) { ++ xmlInitParser(); ++} ++ ++/** ++ * xmlInitXPathInternal: ++ * ++ * Initialize the XPath environment ++ */ ++ATTRIBUTE_NO_SANITIZE("float-divide-by-zero") ++void ++xmlInitXPathInternal(void) { ++#if defined(NAN) && defined(INFINITY) ++ xmlXPathNAN = NAN; ++ xmlXPathPINF = INFINITY; ++ xmlXPathNINF = -INFINITY; ++#else ++ /* MSVC doesn't allow division by zero in constant expressions. */ ++ double zero = 0.0; ++ xmlXPathNAN = 0.0 / zero; ++ xmlXPathPINF = 1.0 / zero; ++ xmlXPathNINF = -xmlXPathPINF; ++#endif ++} ++ ++/** ++ * xmlXPathIsNaN: ++ * @val: a double value ++ * ++ * Returns 1 if the value is a NaN, 0 otherwise ++ */ ++int ++xmlXPathIsNaN(double val) { ++#ifdef isnan ++ return isnan(val); ++#else ++ return !(val == val); ++#endif ++} ++ ++/** ++ * xmlXPathIsInf: ++ * @val: a double value ++ * ++ * Returns 1 if the value is +Infinite, -1 if -Infinite, 0 otherwise ++ */ ++int ++xmlXPathIsInf(double val) { ++#ifdef isinf ++ return isinf(val) ? (val > 0 ? 1 : -1) : 0; ++#else ++ if (val >= xmlXPathPINF) ++ return 1; ++ if (val <= -xmlXPathPINF) ++ return -1; ++ return 0; ++#endif ++} ++ ++#endif /* SCHEMAS or XPATH */ ++ ++#ifdef LIBXML_XPATH_ENABLED ++ ++/* ++ * TODO: when compatibility allows remove all "fake node libxslt" strings ++ * the test should just be name[0] = ' ' ++ */ ++#ifdef DEBUG_XPATH_EXPRESSION ++#define DEBUG_STEP ++#define DEBUG_EXPR ++#define DEBUG_EVAL_COUNTS ++#endif ++ ++static xmlNs xmlXPathXMLNamespaceStruct = { ++ NULL, ++ XML_NAMESPACE_DECL, ++ XML_XML_NAMESPACE, ++ BAD_CAST "xml", ++ NULL, ++ NULL ++}; ++static xmlNsPtr xmlXPathXMLNamespace = &xmlXPathXMLNamespaceStruct; ++#ifndef LIBXML_THREAD_ENABLED ++/* ++ * Optimizer is disabled only when threaded apps are detected while ++ * the library ain't compiled for thread safety. ++ */ ++static int xmlXPathDisableOptimizer = 0; ++#endif ++ + static void + xmlXPathNodeSetClear(xmlNodeSetPtr set, int hasNsNodes); + +@@ -475,114 +583,6 @@ int wrap_cmp( xmlNodePtr x, xmlNodePtr y ); + #include "timsort.h" + #endif /* WITH_TIM_SORT */ + +-#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) +- +-/************************************************************************ +- * * +- * Floating point stuff * +- * * +- ************************************************************************/ +- +-double xmlXPathNAN = 0.0; +-double xmlXPathPINF = 0.0; +-double xmlXPathNINF = 0.0; +- +-/** +- * xmlXPathInit: +- * +- * DEPRECATED: Alias for xmlInitParser. +- */ +-void +-xmlXPathInit(void) { +- xmlInitParser(); +-} +- +-/** +- * xmlInitXPathInternal: +- * +- * Initialize the XPath environment +- */ +-ATTRIBUTE_NO_SANITIZE("float-divide-by-zero") +-void +-xmlInitXPathInternal(void) { +-#if defined(NAN) && defined(INFINITY) +- xmlXPathNAN = NAN; +- xmlXPathPINF = INFINITY; +- xmlXPathNINF = -INFINITY; +-#else +- /* MSVC doesn't allow division by zero in constant expressions. */ +- double zero = 0.0; +- xmlXPathNAN = 0.0 / zero; +- xmlXPathPINF = 1.0 / zero; +- xmlXPathNINF = -xmlXPathPINF; +-#endif +-} +- +-/** +- * xmlXPathIsNaN: +- * @val: a double value +- * +- * Returns 1 if the value is a NaN, 0 otherwise +- */ +-int +-xmlXPathIsNaN(double val) { +-#ifdef isnan +- return isnan(val); +-#else +- return !(val == val); +-#endif +-} +- +-/** +- * xmlXPathIsInf: +- * @val: a double value +- * +- * Returns 1 if the value is +Infinite, -1 if -Infinite, 0 otherwise +- */ +-int +-xmlXPathIsInf(double val) { +-#ifdef isinf +- return isinf(val) ? (val > 0 ? 1 : -1) : 0; +-#else +- if (val >= xmlXPathPINF) +- return 1; +- if (val <= -xmlXPathPINF) +- return -1; +- return 0; +-#endif +-} +- +-#endif /* SCHEMAS or XPATH */ +- +-#ifdef LIBXML_XPATH_ENABLED +- +-/* +- * TODO: when compatibility allows remove all "fake node libxslt" strings +- * the test should just be name[0] = ' ' +- */ +-#ifdef DEBUG_XPATH_EXPRESSION +-#define DEBUG_STEP +-#define DEBUG_EXPR +-#define DEBUG_EVAL_COUNTS +-#endif +- +-static xmlNs xmlXPathXMLNamespaceStruct = { +- NULL, +- XML_NAMESPACE_DECL, +- XML_XML_NAMESPACE, +- BAD_CAST "xml", +- NULL, +- NULL +-}; +-static xmlNsPtr xmlXPathXMLNamespace = &xmlXPathXMLNamespaceStruct; +-#ifndef LIBXML_THREAD_ENABLED +-/* +- * Optimizer is disabled only when threaded apps are detected while +- * the library ain't compiled for thread safety. +- */ +-static int xmlXPathDisableOptimizer = 0; +-#endif +- + /************************************************************************ + * * + * Error handling routines * +-- +GitLab diff --git a/dev-libs/libxml2/files/libxml2-2.11.2-0004-huge-push.patch b/dev-libs/libxml2/files/libxml2-2.11.2-0004-huge-push.patch new file mode 100644 index 000000000000..5f3d06038271 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.11.2-0004-huge-push.patch @@ -0,0 +1,27 @@ +https://gitlab.gnome.org/GNOME/libxml2/-/commit/7c14859d0779797a93ea75744266425028599944 + +From 7c14859d0779797a93ea75744266425028599944 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer <wellnhofer@aevum.de> +Date: Tue, 9 May 2023 13:28:06 +0200 +Subject: [PATCH] parser: Fix "huge input lookup" error with push parser + +Fix parsing of larger documents without XML_PARSE_HUGE. + +Should fix #538. +--- a/parserInternals.c ++++ b/parserInternals.c +@@ -418,9 +418,10 @@ xmlParserShrink(xmlParserCtxtPtr ctxt) { + xmlParserInputBufferPtr buf = in->buf; + size_t used; + +- /* Don't shrink memory buffers. */ ++ /* Don't shrink pull parser memory buffers. */ + if ((buf == NULL) || +- ((buf->encoder == NULL) && (buf->readcallback == NULL))) ++ ((ctxt->progressive == 0) && ++ (buf->encoder == NULL) && (buf->readcallback == NULL))) + return; + + used = in->cur - in->base; +-- +GitLab diff --git a/dev-libs/libxml2/files/libxml2-2.11.2-0005-icu-detection.patch b/dev-libs/libxml2/files/libxml2-2.11.2-0005-icu-detection.patch new file mode 100644 index 000000000000..6fffb156ea9c --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.11.2-0005-icu-detection.patch @@ -0,0 +1,21 @@ +https://gitlab.gnome.org/GNOME/libxml2/-/commit/55f221a4c57903ced5721008607d4133d6eb51cf + +From 55f221a4c57903ced5721008607d4133d6eb51cf Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer <wellnhofer@aevum.de> +Date: Wed, 10 May 2023 18:13:47 +0200 +Subject: [PATCH] autotools: Fix ICU detection + +Fixes #540. +--- a/configure.ac ++++ b/configure.ac +@@ -1096,7 +1096,7 @@ else + fi + + AC_CHECK_HEADER(unicode/ucnv.h, [ +- AC_CHECK_LIB([icucore], [uconv_open], [ ++ AC_CHECK_LIB([icucore], [ucnv_open], [ + WITH_ICU=1 + ICU_LIBS=-licucore + if test "$ICU_DIR" != ""; then +-- +GitLab diff --git a/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild b/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild deleted file mode 100644 index dde6d39580c9..000000000000 --- a/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Note: Please bump in sync with dev-libs/libxslt - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="xml(+)" -inherit flag-o-matic python-r1 multilib-minimal toolchain-funcs - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20130923.tar.gz" - -DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" - inherit autotools git-r3 -else - inherit gnome.org libtool - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -SRC_URI+=" - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - https://www.w3.org/XML/Test/${XMLCONF_TARBALL} - )" -S="${WORKDIR}/${PN}-${PV%_rc*}" - -LICENSE="MIT" -SLOT="2" -IUSE="debug examples +ftp icu lzma +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" -fi - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -PATCHES=( "${FILESDIR}"/${PN}-2.10.3-python3-unicode-errors.patch ) - -DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO ) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - else - local tarname=${P/_rc/-rc}.tar.xz - - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${tarname} - - if [[ -n ${PATCHSET_VERSION} ]] ; then - unpack ${PN}-${PATCHSET_VERSION}.tar.bz2 - fi - fi - - cd "${S}" || die - - if use test ; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - elibtoolize - fi -} - -multilib_src_configure() { - # Filter seemingly problematic CFLAGS (bug #26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi - - # Notes: - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --enable-ipv6 \ - $(use_with ftp) \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - # Build python bindings separately - libxml2_configure --without-python - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_configure --with-python -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}"/python >/dev/null || die - - emake top_builddir="${NATIVE_BUILD_DIR}" "$@" - - popd >/dev/null || die -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - NATIVE_BUILD_DIR="${BUILD_DIR}" - python_foreach_impl run_in_build_dir libxml2_py_emake all - fi -} - -multilib_src_test() { - ln -s "${S}"/xmlconf || die - - emake check - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake check -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install - - # Hack until automake release is made for the optimise fix - # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 - multilib_is_native_abi && use python && python_foreach_impl python_optimize -} - -multilib_src_install_all() { - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die - fi - - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ -n "${ROOT}" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # Need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}/etc/xml/catalog" - - # We don't want to clobber an existing catalog though, - # only ensure that one is there - # <obz@gentoo.org> - if [[ ! -e "${CATALOG}" ]]; then - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} diff --git a/dev-libs/libxml2/libxml2-2.11.1.ebuild b/dev-libs/libxml2/libxml2-2.11.2-r1.ebuild index bce83228cbc6..005ddba984c7 100644 --- a/dev-libs/libxml2/libxml2-2.11.1.ebuild +++ b/dev-libs/libxml2/libxml2-2.11.2-r1.ebuild @@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" inherit autotools git-r3 else - inherit gnome.org libtool + inherit autotools gnome.org libtool KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -59,8 +59,13 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/xml2-config ) -# Needs testing to see if still relevant (bug #745162) and rebasing if so -#PATCHES=( "${FILESDIR}"/${PN}-2.10.3-python3-unicode-errors.patch ) +PATCHES=( + "${FILESDIR}"/${P}-0001-iconv.patch + "${FILESDIR}"/${P}-0002-crash-old-libxslt.patch + "${FILESDIR}"/${P}-0003-no-xpath.patch + "${FILESDIR}"/${P}-0004-huge-push.patch + "${FILESDIR}"/${P}-0005-icu-detection.patch +) src_unpack() { if [[ ${PV} == 9999 ]] ; then @@ -96,7 +101,10 @@ src_prepare() { else # Please do not remove, as else we get references to PORTAGE_TMPDIR # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - elibtoolize + #elibtoolize + + # TODO: remove me >2.11.2, just here for backports + eautoreconf fi } diff --git a/dev-libs/libxml2/libxml2-2.11.2.ebuild b/dev-libs/libxml2/libxml2-2.11.2.ebuild index bce83228cbc6..b31269fea30e 100644 --- a/dev-libs/libxml2/libxml2-2.11.2.ebuild +++ b/dev-libs/libxml2/libxml2-2.11.2.ebuild @@ -59,9 +59,6 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/xml2-config ) -# Needs testing to see if still relevant (bug #745162) and rebasing if so -#PATCHES=( "${FILESDIR}"/${PN}-2.10.3-python3-unicode-errors.patch ) - src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack |