diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-23 02:57:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-23 02:57:53 +0100 |
commit | 24c53d42e0294f4f6e36fbb051891af86c9ae503 (patch) | |
tree | b0af743b9df96807807fc6a16e77af239820b0c3 /dev-libs/libxml2 | |
parent | 351b26cfd42c558fa0f8eef51960c87bb0674026 (diff) |
gentoo auto-resync : 23:05:2023 - 02:57:53
Diffstat (limited to 'dev-libs/libxml2')
6 files changed, 0 insertions, 388 deletions
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 3bde072d7546..d3b913f13b96 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,9 +1,4 @@ AUX libxml2-2.10.3-python3-unicode-errors.patch 1208 BLAKE2B 8515db0c9d79c4397c3ef4147660ddf395b863de3658a8db27db20d2274949962172a42637bf9555d3d7bf63ead8f695d19f28ddb5e957b5302c8aed466058c7 SHA512 f2ab7934687ba14bf7541a381317d88c20d9912b424d1b206f8feb60224482f12e03c79ff4e8637025ee8d1bddd870183db932380990eafca833eea1c1373a06 -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.4.tar.xz 2626756 BLAKE2B 5d7e6388291a8473195131f5cb22aee9a4182f28fd8eed468c449b762d363cfb1713a7466c1f98e96cf819ed8f78e13a6ba930c2fadd8d63869b6efe8e8be8a8 SHA512 c1df7441c729430bdd2de52e9da69b171afc4b776e4a2eb43acbc71ada7a3814a465247fb5fca4c83ecf1c281f7745069ec3d051a7964cb7cc119a3d983f93ba DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 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 deleted file mode 100644 index 615f413c4419..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.11.2-0001-iconv.patch +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index 2253ea6211d1..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.11.2-0002-crash-old-libxslt.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index f036c5814f26..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.11.2-0003-no-xpath.patch +++ /dev/null @@ -1,245 +0,0 @@ -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 deleted file mode 100644 index 5f3d06038271..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.11.2-0004-huge-push.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 6fffb156ea9c..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.11.2-0005-icu-detection.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 |