mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-01 18:42:22 +02:00
dev-libs/libxml2: Sync with Gentoo
It's from Gentoo commit 1c077c1f373119e25e4522d7952e34283e3b5be2.
This commit is contained in:
parent
d52b20f8da
commit
df1c221c26
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -17,13 +17,13 @@ XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
|
|||||||
XMLCONF_TARBALL="xmlts20130923.tar.gz"
|
XMLCONF_TARBALL="xmlts20130923.tar.gz"
|
||||||
|
|
||||||
DESCRIPTION="XML C parser and toolkit"
|
DESCRIPTION="XML C parser and toolkit"
|
||||||
HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
|
HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
|
||||||
if [[ ${PV} == 9999 ]] ; then
|
if [[ ${PV} == 9999 ]] ; then
|
||||||
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
|
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
|
||||||
inherit autotools git-r3
|
inherit autotools git-r3
|
||||||
else
|
else
|
||||||
inherit gnome.org libtool
|
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"
|
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SRC_URI+="
|
SRC_URI+="
|
||||||
|
@ -5,7 +5,7 @@ EAPI=8
|
|||||||
|
|
||||||
# Note: Please bump in sync with dev-libs/libxslt
|
# Note: Please bump in sync with dev-libs/libxslt
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{10..11} )
|
PYTHON_COMPAT=( python3_{10..12} )
|
||||||
PYTHON_REQ_USE="xml(+)"
|
PYTHON_REQ_USE="xml(+)"
|
||||||
inherit flag-o-matic python-r1 multilib-minimal
|
inherit flag-o-matic python-r1 multilib-minimal
|
||||||
|
|
||||||
@ -17,13 +17,13 @@ XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
|
|||||||
XMLCONF_TARBALL="xmlts20130923.tar.gz"
|
XMLCONF_TARBALL="xmlts20130923.tar.gz"
|
||||||
|
|
||||||
DESCRIPTION="XML C parser and toolkit"
|
DESCRIPTION="XML C parser and toolkit"
|
||||||
HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
|
HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
|
||||||
if [[ ${PV} == 9999 ]] ; then
|
if [[ ${PV} == 9999 ]] ; then
|
||||||
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
|
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
|
||||||
inherit autotools git-r3
|
inherit autotools git-r3
|
||||||
else
|
else
|
||||||
inherit gnome.org libtool
|
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"
|
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SRC_URI+="
|
SRC_URI+="
|
||||||
@ -42,6 +42,7 @@ RESTRICT="!test? ( test )"
|
|||||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||||
|
|
||||||
RDEPEND="
|
RDEPEND="
|
||||||
|
virtual/libiconv
|
||||||
>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
|
>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
|
||||||
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
|
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
|
||||||
lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
|
lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
|
||||||
@ -101,6 +102,12 @@ multilib_src_configure() {
|
|||||||
# Filter seemingly problematic CFLAGS (bug #26320)
|
# Filter seemingly problematic CFLAGS (bug #26320)
|
||||||
filter-flags -fprefetch-loop-arrays -funroll-loops
|
filter-flags -fprefetch-loop-arrays -funroll-loops
|
||||||
|
|
||||||
|
# Workaround for too simplistic iconv check already addressed
|
||||||
|
# upstream (bug #907065), should be dropped on next release.
|
||||||
|
if [[ ${CHOST} == *-solaris* ]] ; then
|
||||||
|
append-libs iconv
|
||||||
|
fi
|
||||||
|
|
||||||
# Notes:
|
# Notes:
|
||||||
# The meaning of the 'debug' USE flag does not apply to the --with-debug
|
# The meaning of the 'debug' USE flag does not apply to the --with-debug
|
||||||
# switch (enabling the libxml2 debug module). See bug #100898.
|
# switch (enabling the libxml2 debug module). See bug #100898.
|
||||||
|
@ -5,7 +5,7 @@ EAPI=8
|
|||||||
|
|
||||||
# Note: Please bump in sync with dev-libs/libxslt
|
# Note: Please bump in sync with dev-libs/libxslt
|
||||||
|
|
||||||
PYTHON_COMPAT=( python3_{10..11} )
|
PYTHON_COMPAT=( python3_{10..12} )
|
||||||
PYTHON_REQ_USE="xml(+)"
|
PYTHON_REQ_USE="xml(+)"
|
||||||
inherit flag-o-matic python-r1 multilib-minimal
|
inherit flag-o-matic python-r1 multilib-minimal
|
||||||
|
|
||||||
@ -17,13 +17,13 @@ XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
|
|||||||
XMLCONF_TARBALL="xmlts20130923.tar.gz"
|
XMLCONF_TARBALL="xmlts20130923.tar.gz"
|
||||||
|
|
||||||
DESCRIPTION="XML C parser and toolkit"
|
DESCRIPTION="XML C parser and toolkit"
|
||||||
HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
|
HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
|
||||||
if [[ ${PV} == 9999 ]] ; then
|
if [[ ${PV} == 9999 ]] ; then
|
||||||
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
|
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
|
||||||
inherit autotools git-r3
|
inherit autotools git-r3
|
||||||
else
|
else
|
||||||
inherit gnome.org libtool
|
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"
|
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SRC_URI+="
|
SRC_URI+="
|
||||||
@ -42,6 +42,7 @@ RESTRICT="!test? ( test )"
|
|||||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||||
|
|
||||||
RDEPEND="
|
RDEPEND="
|
||||||
|
virtual/libiconv
|
||||||
>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
|
>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
|
||||||
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
|
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
|
||||||
lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
|
lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user