Attachment 252261 Details for Bug 279705 – Patch for libxml2 v9

[patch] Patch for libxml2 v9

libxml2-2133.patch (text/plain), 10.33 KB, created by Daniel Engberg on 2024-07-24 19:29:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-07-24 19:29:10 UTC

Size: 10.33 KB

patch

obsolete

>diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
>index 2d5623ef7b61..f4db21f6dbd8 100644
>--- a/textproc/libxml2/Makefile
>+++ b/textproc/libxml2/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	libxml2
>-DISTVERSION=	2.11.8
>+DISTVERSION=	2.13.3
> PORTREVISION?=	0
> CATEGORIES?=	textproc gnome
> MASTER_SITES=	GNOME/sources/${PORTNAME}/${DISTVERSION:R}/
>@@ -27,20 +27,21 @@ CMAKE_TESTING_ON=	LIBXML2_WITH_TESTS
> 
> CMAKE_ARGS=	-DCMAKE_INSTALL_SYSCONFDIR=share
> CMAKE_OFF+=	LIBXML2_WITH_TESTS
>+CMAKE_ON+=	LIBXML2_WITH_HTTP \
>+		LIBXML2_WITH_LZMA \
>+		LIBXML2_WITH_ZLIB
> 
> PLIST_SUB+=	LIBVERSION=${DISTVERSION}
> 
>-OPTIONS_DEFINE=	DOCS ICU MEM_DEBUG READLINE THREAD_ALLOC
>+OPTIONS_DEFINE=	DOCS ICU READLINE THREAD_ALLOC
> OPTIONS_DEFAULT=	READLINE
> OPTIONS_SUB=		yes
> 
>-MEM_DEBUG_DESC=		Memory debugging (DEVELOPERS ONLY!)
> READLINE_DESC=		History for xmllint
> THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)
> 
> ICU_LIB_DEPENDS=		libicudata.so:devel/icu
> ICU_CMAKE_BOOL=			LIBXML2_WITH_ICU
>-MEM_DEBUG_CONFIGURE_WITH=	LIBXML2_WITH_MEM_DEBUG
> READLINE_LIB_DEPENDS=		libreadline.so:devel/readline
> READLINE_CMAKE_OFF=		-DHAVE_LIBHISTORY=false \
> 				-DHAVE_LIBREADLINE=false
>diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
>index d12bdcd5863c..2dc378f685d2 100644
>--- a/textproc/libxml2/distinfo
>+++ b/textproc/libxml2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1715748402
>-SHA256 (gnome/libxml2-2.11.8.tar.xz) = 53961af1721b72246180cd844b7ddae36ea8e1e4e27b683567990a1ee78b02c1
>-SIZE (gnome/libxml2-2.11.8.tar.xz) = 2628212
>+TIMESTAMP = 1721849187
>+SHA256 (gnome/libxml2-2.13.3.tar.xz) = 0805d7c180cf09caad71666c7a458a74f041561a532902454da5047d83948138
>+SIZE (gnome/libxml2-2.13.3.tar.xz) = 2581308
>diff --git a/textproc/libxml2/files/patch-CMakeLists.txt b/textproc/libxml2/files/patch-CMakeLists.txt
>deleted file mode 100644
>index 6926e72e1e54..000000000000
>--- a/textproc/libxml2/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,33 +0,0 @@
>---- CMakeLists.txt.orig	2023-08-11 18:59:11 UTC
>-+++ CMakeLists.txt
>-@@ -395,13 +395,17 @@ if(LIBXML2_WITH_ICU)
>- 	if(WIN32)
>- 		set(ICU_LIBS "-licudt -licuin -licuuc")
>- 	else()
>--		set(ICU_LIBS "-licudata -licui18n -licuuc")
>-+		set(ICU_LIBS_DIR "${ICU_INCLUDE_DIRS}")
>-+		STRING(REGEX REPLACE "include" "lib" ICU_LIBS_DIR ${ICU_LIBS_DIR})
>-+		set(ICU_LIBS "-L${ICU_LIBS_DIR} -licudata -licui18n -licuuc")
>- 	endif()
>- endif()
>- 
>- if(LIBXML2_WITH_LZMA)
>- 	target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA)
>--	set(LZMA_LIBS "-llzma")
>-+	set(LZMA_LIBS_DIR "${LIBLZMA_INCLUDE_DIRS}")
>-+	STRING(REGEX REPLACE "include" "lib" LZMA_LIBS_DIR ${LZMA_LIBS_DIR})
>-+	set(LZMA_LIBS "-L${LZMA_LIBS_DIR} -llzma")
>- endif()
>- 
>- if(LIBXML2_WITH_THREADS)
>-@@ -411,7 +415,9 @@ endif()
>- 
>- if(LIBXML2_WITH_ZLIB)
>- 	target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB)
>--	set(Z_LIBS "-lz")
>-+	set(Z_LIBS_DIR "${ZLIB_INCLUDE_DIRS}")
>-+	STRING(REGEX REPLACE "include" "lib" Z_LIBS_DIR ${Z_LIBS_DIR})
>-+	set(Z_LIBS "-L${Z_LIBS_DIR} -lz")
>- endif()
>- 
>- set_target_properties(
>diff --git a/textproc/libxml2/files/patch-git-01-600c6ca4bcefc9abcba7aadf4e1a172d19ef39d4 b/textproc/libxml2/files/patch-git-01-600c6ca4bcefc9abcba7aadf4e1a172d19ef39d4
>new file mode 100644
>index 000000000000..e85aeb07b078
>--- /dev/null
>+++ b/textproc/libxml2/files/patch-git-01-600c6ca4bcefc9abcba7aadf4e1a172d19ef39d4
>@@ -0,0 +1,25 @@
>+From 600c6ca4bcefc9abcba7aadf4e1a172d19ef39d4 Mon Sep 17 00:00:00 2001
>+From: Daniel E <daniel.engberg.lists@pyret.net>
>+Date: Sun, 23 Jun 2024 12:16:47 +0000
>+Subject: [PATCH] cmake: Don't install meson build scripts in documentation
>+
>+Add meson.build files as exclusions
>+---
>+ CMakeLists.txt | 1 +
>+ 1 file changed, 1 insertion(+)
>+
>+diff --git a/CMakeLists.txt b/CMakeLists.txt
>+index a207e1453..168b7c92d 100644
>+--- CMakeLists.txt
>++++ CMakeLists.txt
>+@@ -550,6 +550,7 @@ install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONEN
>+ install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
>+ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation
>+     PATTERN "Makefile.*" EXCLUDE
>++    PATTERN "meson.build" EXCLUDE
>+     PATTERN "*.1" EXCLUDE
>+     PATTERN "*.py" EXCLUDE
>+     PATTERN "*.res" EXCLUDE
>+-- 
>+GitLab
>+
>diff --git a/textproc/libxml2/files/patch-python_libxml.c b/textproc/libxml2/files/patch-python_libxml.c
>index 7bbc98d75033..cede7f2ef32d 100644
>--- a/textproc/libxml2/files/patch-python_libxml.c
>+++ b/textproc/libxml2/files/patch-python_libxml.c
>@@ -1,26 +1,23 @@
>---- python/libxml.c.orig	2023-08-11 20:30:35 UTC
>+--- python/libxml.c.orig	2024-06-12 11:17:43 UTC
> +++ python/libxml.c
>-@@ -1606,12 +1606,19 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
>+@@ -1491,6 +1491,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
>      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);
>- #endif
>+     if (libxml_xmlPythonErrorFuncHandler == NULL) {
>+         va_start(ap, msg);
>+@@ -1502,12 +1503,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
>+ 	    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++;
>++        /* Ensure the error string doesn't start at UTF8 continuation. */
>++        while (*ptr && (*ptr & 0xc0) == 0x80)
>++            ptr++;
> +#endif
>- 
> +
>-     if (libxml_xmlPythonErrorFuncHandler == NULL) {
>-         va_start(ap, msg);
>-         vfprintf(stderr, msg, ap);
>-@@ -1625,9 +1632,11 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx,
>          list = PyTuple_New(2);
>          PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
>          Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
>diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
>index 8d53acb96cd1..7576a33ee2a3 100644
>--- a/textproc/libxml2/pkg-plist
>+++ b/textproc/libxml2/pkg-plist
>@@ -113,70 +113,5 @@ share/aclocal/libxml.m4
> %%PORTDOCS%%%%DOCSDIR%%/devhelp/right.png
> %%PORTDOCS%%%%DOCSDIR%%/devhelp/style.css
> %%PORTDOCS%%%%DOCSDIR%%/devhelp/up.png
>-%%PORTDOCS%%%%DOCSDIR%%/examples/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/examples/io1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/io2.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/parse1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/parse2.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/parse3.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/parse4.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/reader1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/reader2.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/reader3.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/reader4.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/testWriter.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/tree1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/tree2.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/xpath1.c
>-%%PORTDOCS%%%%DOCSDIR%%/examples/xpath2.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apa.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apb.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apc.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apd.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ape.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apf.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/apg.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/aph.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/api.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s02.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s03.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s04.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s05.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s06.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s07.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s08.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ar01s09.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/blank.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/1.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/10.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/2.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/3.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/4.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/5.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/6.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/7.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/8.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/callouts/9.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/caution.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/draft.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/home.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/important.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/next.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/note.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/prev.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/tip.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-blank.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-minus.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/toc-plus.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/up.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/images/warning.png
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddattribute.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeaddkeyword.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includeconvert.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includegetattribute.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includekeyword.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/includexpath.c
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial/ix01.html
> %%PORTDOCS%%%%DOCSDIR%%/xmlcatalog.html
> %%PORTDOCS%%%%DOCSDIR%%/xmllint.html
>diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
>index 84796bac21b3..7b94436369d1 100644
>--- a/textproc/py-libxml2/Makefile
>+++ b/textproc/py-libxml2/Makefile
>@@ -1,28 +1,23 @@
>-PORTREVISION=	1
>+PORTREVISION=	0
> CATEGORIES=	textproc gnome python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> COMMENT=	Python interface for XML parser library for GNOME
>+MASTERDIR=	${.CURDIR}/../libxml2
> 
> USES+=		gnome python shebangfix
> USE_GNOME=	libxml2
> USE_PYTHON=	flavors
> SHEBANG_FILES=	*.py doc/*.py python/*.py python/tests/*.py
> 
>-# Help CMake determine the correct version of Python if
>-# multiple versions are installed
>-CMAKE_ARGS=	-DPython_EXECUTABLE=${PYTHON_CMD}
>-
>-MASTERDIR=	${.CURDIR}/../libxml2
>+# Tell master port we're a slave port
>+LIBXML2_SLAVE=	python
> 
> DESCR=		${.CURDIR}/pkg-descr
> PLIST=		${.CURDIR}/pkg-plist
> 
> OPTIONS_EXCLUDE=	${OPTIONS_DEFINE}
> 
>-# Tell master port we're a slave port
>-LIBXML2_SLAVE=	python
>-
> do-install:
> 		${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
> 		${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}

Actions: View | Diff

Attachments on bug 279705: 251428 | 251475 | 251491 | 251599 | 251644 | 251885 | 252032 | 252033 | 252189 | 252261 | 253697 | 255146