public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/libxml2] f45: Update to 2.15.3 (#2293065)
@ 2026-09-10 18:02 David King
  0 siblings, 0 replies; only message in thread
From: David King @ 2026-09-10 18:02 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/libxml2
            Branch : f45
            Commit : c6f723806e0def3150d09a8cab374890d010bda1
            Author : David King <amigadave@amigadave.com>
            Date   : 2026-09-08T18:53:43+02:00
            Stats  : +29/-86 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/libxml2/c/c6f723806e0def3150d09a8cab374890d010bda1?branch=f45

            Log:
            Update to 2.15.3 (#2293065)

Switch to meson. Deprecate Python bindings (will be removed in 2.16
upstream).

https://fedoraproject.org/wiki/Changes/Libxml215

---
diff --git a/.gitignore b/.gitignore
index e174c81..0c94c64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,9 @@ libxml2-2.7.7.tar.gz
 /libxml2-2.12.9.tar.xz
 /libxml2-2.12.10.tar.xz
 /libxml2-2.13.9.tar.xz
+/libxml2-2.14.0.tar.xz
+/libxml2-2.14.1.tar.xz
+/libxml2-2.14.2.tar.xz
+/libxml2-2.14.5.tar.xz
+/libxml2-2.14.6.tar.xz
+/libxml2-2.15.3.tar.xz

diff --git a/libxml2-2.12.0-python3-unicode-errors.patch b/libxml2-2.12.0-python3-unicode-errors.patch
deleted file mode 100644
index b07e404..0000000
--- a/libxml2-2.12.0-python3-unicode-errors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/python/libxml.c b/python/libxml.c
-index bf048006..5f42e5b7 100644
---- a/python/libxml.c
-+++ b/python/libxml.c
-@@ -1505,6 +1505,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg,
-     PyObject *message;
-     PyObject *result;
-     char str[1000];
-+    unsigned char *ptr = (unsigned char *)str;
- 
-     if (libxml_xmlPythonErrorFuncHandler == NULL) {
-         va_start(ap, msg);
-@@ -1516,12 +1517,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg,
- 	    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 = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list);
-+        /* Forget any errors caused in the error handler. */
-+        PyErr_Clear();
-         Py_XDECREF(list);
-         Py_XDECREF(result);
-     }

diff --git a/libxml2.spec b/libxml2.spec
index 629151a..d6bf705 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -1,5 +1,5 @@
 Name:           libxml2
-Version:        2.13.9
+Version:        2.15.3
 Release:        %autorelease
 Summary:        Library providing XML and HTML support
 
@@ -8,22 +8,19 @@ Summary:        Library providing XML and HTML support
 # Source1, Source2 and Source3 is covered by W3C
 License:        MIT AND ISC-Veillard AND W3C
 URL:            https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home
-Source0:        https://download.gnome.org/sources/%{name}/2.13/%{name}-%{version}.tar.xz
-# https://www.w3.org/XML/Test/xmlconf-20080827.html
-Source1:        https://www.w3.org/XML/Test/xmlts20080827.tar.gz
-# https://www.w3.org/XML/2004/xml-schema-test-suite/index.html
-Source2:        https://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz
-Source3:        https://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz
+Source0:        https://download.gnome.org/sources/%{name}/2.15/%{name}-%{version}.tar.xz
 Patch0:         libxml2-multilib.patch
-# Patch from openSUSE.
-# See:  https://bugzilla.gnome.org/show_bug.cgi?id=789714
-Patch1:         libxml2-2.12.0-python3-unicode-errors.patch
 
 BuildRequires:  cmake-rpm-macros
+BuildRequires:  docbook-style-xsl
+BuildRequires:  doxygen
 BuildRequires:  gcc
-BuildRequires:  make
-BuildRequires:  pkgconfig(zlib)
+BuildRequires:  git
+BuildRequires:  meson
 BuildRequires:  pkgconfig(liblzma)
+BuildRequires:  pkgconfig(readline)
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  /usr/bin/xsltproc
 
 %description
 This library allows to manipulate XML files. It includes support
@@ -67,6 +64,8 @@ BuildRequires:  python3-devel
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-python3 < %{version}-%{release}
 Provides:       %{name}-python3 = %{version}-%{release}
+# Will be removed upstream in 2.16.
+Provides:       deprecated()
 
 %description -n python3-%{name}
 The libxml2-python3 package contains a Python 3 module that permits
@@ -82,58 +81,34 @@ at parse time or later once the document has been modified.
 %autosetup -p1
 find doc -type f -executable -print -exec chmod 0644 {} ';'
 
+%conf
+%meson -Ddefault_library=both
+
 %build
-# see https://bugzilla.redhat.com/show_bug.cgi?id=2139546 , several
-# of these options are needed to (mostly) retain ABI compatibility
-# with earlier versions
-%configure \
-    --enable-static \
-    --with-legacy \
-    --with-ftp \
-    --with-python=%{__python3}
-%make_build
+%meson_build
 
 %install
-%make_install
-
-# multiarch crazyness on timestamp differences or Makefile/binaries for examples
-touch -m --reference=%{buildroot}%{_includedir}/libxml2/libxml/parser.h %{buildroot}%{_bindir}/xml2-config
+%meson_install
 
-find %{buildroot} -type f -name '*.la' -print -delete
-rm -vf %{buildroot}{%{python2_sitearch},%{python3_sitearch}}/*.a
-rm -vrf %{buildroot}%{_datadir}/doc/
-gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 
 %check
-# Tests require the XML conformance suite.
-tar -xzvf %{SOURCE1}
-%make_build check
-rm -rf xmlconf
-# Schema tests use the schema test suite.
-cp %{SOURCE2} %{SOURCE3} xstc/
-pushd xstc
-mkdir Tests
-%make_build tests
-popd
+%meson_test
 
 %ldconfig_scriptlets
 
 %files
 %license Copyright
 %doc NEWS README.md
-%{_libdir}/libxml2.so.2*
+%{_libdir}/libxml2.so.16{,.*}
 %{_bindir}/xmlcatalog
 %{_bindir}/xmllint
 %{_mandir}/man1/xmlcatalog.1*
 %{_mandir}/man1/xmllint.1*
 
 %files devel
-%doc doc/*.html
-%doc doc/libxml2-api.xml.gz
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/aclocal/libxml.m4
-%{_datadir}/gtk-doc/html/libxml2/
+%doc %{_docdir}/libxml2/*.html
+%doc %{_docdir}/libxml2/html/
+%doc example
 %{_includedir}/libxml2/
 %{_libdir}/libxml2.so
 %{_libdir}/pkgconfig/libxml-2.0.pc
@@ -146,8 +121,7 @@ popd
 %{_libdir}/libxml2.a
 
 %files -n python3-%{name}
-%doc doc/*.py
-%{python3_sitearch}/libxml2mod.so
+%{python3_sitearch}/libxml2mod.*.so
 %{python3_sitelib}/libxml2.py
 %{python3_sitelib}/__pycache__/libxml2.*
 %{python3_sitelib}/drv_libxml2.py

diff --git a/sources b/sources
index 0c2b51f..ecc02db 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-SHA512 (libxml2-2.13.9.tar.xz) = 62d4813860124c969f204aaf33b497105dbc32a6c5655f5a86168743660e10987d687d7e5e7ee49fdfdeb8f6ad9fa4503f81fcce2e4d459094895f02436d1b13
-SHA512 (xmlts20080827.tar.gz) = 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
-SHA512 (xsts-2002-01-16.tar.gz) = 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
-SHA512 (xsts-2004-01-14.tar.gz) = 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
+SHA512 (libxml2-2.15.3.tar.xz) = 6f7f1aabd012454553e851bd1ee548fbd14d21c576f2b2ab9eeedab3dfba51392083f74b34f060e9b538baeea212cdb462b8669c214c711771fb9a897fdc1c60

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-10 18:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-10 18:02 [rpms/libxml2] f45: Update to 2.15.3 (#2293065) David King

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox