Merge branch 'thirdparty'

# Conflicts:
#	libs/expat/lib/xmlparse.c

Source commit: bfb164c606b7aacc35a236b57433186ed25faa75

libs/expat/CMake.README

@@ -3,25 +3,25 @@
 The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual
 Studio) and should work on all other platform cmake supports.
 
-Assuming ~/expat-2.6.0 is the source directory of expat, add a subdirectory
+Assuming ~/expat-2.6.1 is the source directory of expat, add a subdirectory
 build and change into that directory:
-~/expat-2.6.0$ mkdir build && cd build
-~/expat-2.6.0/build$
+~/expat-2.6.1$ mkdir build && cd build
+~/expat-2.6.1/build$
 
 From that directory, call cmake first, then call make, make test and
 make install in the usual way:
-~/expat-2.6.0/build$ cmake ..
+~/expat-2.6.1/build$ cmake ..
 -- The C compiler identification is GNU
 -- The CXX compiler identification is GNU
 ....
 -- Configuring done
 -- Generating done
--- Build files have been written to: /home/patrick/expat-2.6.0/build
+-- Build files have been written to: /home/patrick/expat-2.6.1/build
 
 If you want to specify the install location for your files, append
 -DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call.
 
-~/expat-2.6.0/build$ make && make test && make install
+~/expat-2.6.1/build$ make && make test && make install
 Scanning dependencies of target expat
 [  5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o
 [ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o

libs/expat/CMakeLists.txt

@@ -38,7 +38,7 @@ cmake_minimum_required(VERSION 3.5.0)
 
 project(expat
     VERSION
-        2.6.0
+        2.6.1
     LANGUAGES
         C
 )
@@ -466,7 +466,7 @@ foreach(build_type_upper
 endforeach()
 
 set(LIBCURRENT 10)  # sync
-set(LIBREVISION 0)  # with
+set(LIBREVISION 1)  # with
 set(LIBAGE 9)       # configure.ac!
 math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")
 
@@ -676,6 +676,8 @@ if(EXPAT_BUILD_TESTS)
     )
 
     foreach(_target ${_EXPAT_TEST_TARGETS})
+        target_compile_definitions(${_target} PRIVATE -DXML_TESTING)
+
         set_property(TARGET ${_target} PROPERTY RUNTIME_OUTPUT_DIRECTORY tests)
         expat_add_test(${_target} $<TARGET_FILE:${_target}>)
 

libs/expat/Changes

@@ -2,6 +2,27 @@ NOTE: We are looking for help with a few things:
       https://github.com/libexpat/libexpat/labels/help%20wanted
       If you can help, please get in touch.  Thanks!
 
+Release 2.6.1 Thu February 29 2024
+        Bug fixes:
+            #817  Make tests independent of CPU speed, and thus more robust
+       #828 #836  Expose billion laughs API with XML_DTD defined and
+                    XML_GE undefined, regression from 2.6.0
+
+        Other changes:
+            #829  Hide test-only code behind new internal macro
+            #833  Autotools: Reject expat_config.h.in defining SIZEOF_VOID_P
+            #819  Address compiler warnings
+       #832 #834  Version info bumped from 10:0:9 (libexpat*.so.1.9.0)
+                    to 10:1:9 (libexpat*.so.1.9.1); see https://verbump.de/
+                    for what these numbers do
+
+        Infrastructure:
+            #818  CI: Adapt to breaking changes in clang-format
+
+        Special thanks to:
+            David Hall
+            Snild Dolkow
+
 Release 2.6.0 Tue February 6 2024
         Security fixes:
       #789 #814  CVE-2023-52425 -- Fix quadratic runtime issues with big tokens

libs/expat/README.md

@@ -5,7 +5,7 @@
 [![Downloads GitHub](https://img.shields.io/github/downloads/libexpat/libexpat/total?label=Downloads%20GitHub)](https://github.com/libexpat/libexpat/releases)
 
 
-# Expat, Release 2.6.0
+# Expat, Release 2.6.1
 
 This is Expat, a C99 library for parsing
 [XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by

libs/expat/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for expat 2.6.0.
+# Generated by GNU Autoconf 2.71 for expat 2.6.1.
 #
 # Report bugs to <https://github.com/libexpat/libexpat/issues>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='expat'
 PACKAGE_TARNAME='expat'
-PACKAGE_VERSION='2.6.0'
-PACKAGE_STRING='expat 2.6.0'
+PACKAGE_VERSION='2.6.1'
+PACKAGE_STRING='expat 2.6.1'
 PACKAGE_BUGREPORT='https://github.com/libexpat/libexpat/issues'
 PACKAGE_URL=''
 
@@ -681,8 +681,12 @@ EXPAT_MIN_SIZE
 EXPAT_LARGE_SIZE
 EXPAT_DTD
 EXPAT_ATTR_INFO
-WITH_DOCBOOK_FALSE
-WITH_DOCBOOK_TRUE
+WITH_DISTRIBUTABLE_MANPAGE_FALSE
+WITH_DISTRIBUTABLE_MANPAGE_TRUE
+WITH_PREBUILT_MANPAGE_FALSE
+WITH_PREBUILT_MANPAGE_TRUE
+WITH_MANPAGE_FALSE
+WITH_MANPAGE_TRUE
 DOCBOOK_TO_MAN
 FILEMAP
 LIBM
@@ -1420,7 +1424,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures expat 2.6.0 to adapt to many kinds of systems.
+\`configure' configures expat 2.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1491,7 +1495,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of expat 2.6.0:";;
+     short | recursive ) echo "Configuration of expat 2.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1628,7 +1632,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-expat configure 2.6.0
+expat configure 2.6.1
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2259,7 +2263,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by expat $as_me 2.6.0, which was
+It was created by expat $as_me 2.6.1, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3825,7 +3829,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='expat'
- VERSION='2.6.0'
+ VERSION='2.6.1'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3956,7 +3960,7 @@ fi
 
 
 LIBCURRENT=10  # sync
-LIBREVISION=0  # with
+LIBREVISION=1  # with
 LIBAGE=9       # CMakeLists.txt!
 
 ac_config_headers="$ac_config_headers expat_config.h"
@@ -20151,20 +20155,93 @@ fi
 if test -f "${srcdir}"/doc/xmlwf.1
 then :
    if true; then
-  WITH_DOCBOOK_TRUE=
-  WITH_DOCBOOK_FALSE='#'
+  WITH_MANPAGE_TRUE=
+  WITH_MANPAGE_FALSE='#'
 else
-  WITH_DOCBOOK_TRUE='#'
-  WITH_DOCBOOK_FALSE=
+  WITH_MANPAGE_TRUE='#'
+  WITH_MANPAGE_FALSE=
+fi
+
+   if test "x$with_docbook" = xno -o "x${DOCBOOK_TO_MAN}" = x
+then :
+   if true; then
+  WITH_PREBUILT_MANPAGE_TRUE=
+  WITH_PREBUILT_MANPAGE_FALSE='#'
+else
+  WITH_PREBUILT_MANPAGE_TRUE='#'
+  WITH_PREBUILT_MANPAGE_FALSE=
+fi
+
+       if false; then
+  WITH_DISTRIBUTABLE_MANPAGE_TRUE=
+  WITH_DISTRIBUTABLE_MANPAGE_FALSE='#'
+else
+  WITH_DISTRIBUTABLE_MANPAGE_TRUE='#'
+  WITH_DISTRIBUTABLE_MANPAGE_FALSE=
+fi
+
+else $as_nop
+   if false; then
+  WITH_PREBUILT_MANPAGE_TRUE=
+  WITH_PREBUILT_MANPAGE_FALSE='#'
+else
+  WITH_PREBUILT_MANPAGE_TRUE='#'
+  WITH_PREBUILT_MANPAGE_FALSE=
+fi
+
+       if true; then
+  WITH_DISTRIBUTABLE_MANPAGE_TRUE=
+  WITH_DISTRIBUTABLE_MANPAGE_FALSE='#'
+else
+  WITH_DISTRIBUTABLE_MANPAGE_TRUE='#'
+  WITH_DISTRIBUTABLE_MANPAGE_FALSE=
+fi
+
 fi
 
 else $as_nop
-   if test "x${DOCBOOK_TO_MAN}" != x; then
-  WITH_DOCBOOK_TRUE=
-  WITH_DOCBOOK_FALSE='#'
+  if test "x$with_docbook" != xno -a "x${DOCBOOK_TO_MAN}" != x
+then :
+   if true; then
+  WITH_MANPAGE_TRUE=
+  WITH_MANPAGE_FALSE='#'
 else
-  WITH_DOCBOOK_TRUE='#'
-  WITH_DOCBOOK_FALSE=
+  WITH_MANPAGE_TRUE='#'
+  WITH_MANPAGE_FALSE=
+fi
+
+       if true; then
+  WITH_DISTRIBUTABLE_MANPAGE_TRUE=
+  WITH_DISTRIBUTABLE_MANPAGE_FALSE='#'
+else
+  WITH_DISTRIBUTABLE_MANPAGE_TRUE='#'
+  WITH_DISTRIBUTABLE_MANPAGE_FALSE=
+fi
+
+else $as_nop
+   if false; then
+  WITH_MANPAGE_TRUE=
+  WITH_MANPAGE_FALSE='#'
+else
+  WITH_MANPAGE_TRUE='#'
+  WITH_MANPAGE_FALSE=
+fi
+
+       if false; then
+  WITH_DISTRIBUTABLE_MANPAGE_TRUE=
+  WITH_DISTRIBUTABLE_MANPAGE_FALSE='#'
+else
+  WITH_DISTRIBUTABLE_MANPAGE_TRUE='#'
+  WITH_DISTRIBUTABLE_MANPAGE_FALSE=
+fi
+
+fi
+    if false; then
+  WITH_PREBUILT_MANPAGE_TRUE=
+  WITH_PREBUILT_MANPAGE_FALSE='#'
+else
+  WITH_PREBUILT_MANPAGE_TRUE='#'
+  WITH_PREBUILT_MANPAGE_FALSE=
 fi
 
 fi
@@ -20258,6 +20335,14 @@ printf "%s\n" "#define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h
 
 
 
+if grep -F -q SIZEOF_VOID_P "${srcdir}"/expat_config.h.in
+then :
+  as_fn_error $? "Plain autoreconf/autoheader does not cut it,
+                  please use ./buildconf.sh or imitate its effect
+                  through other means, so that file expat_config.h.in
+                  no longer defines macro SIZEOF_VOID_P, as that would
+                  break multilib support.  Thank you." "$LINENO" 5
+fi
 
 
 
@@ -20462,12 +20547,44 @@ if test -z "${_INTERNAL_LARGE_SIZE_TRUE}" && test -z "${_INTERNAL_LARGE_SIZE_FAL
   as_fn_error $? "conditional \"_INTERNAL_LARGE_SIZE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_DOCBOOK_TRUE}" && test -z "${WITH_DOCBOOK_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_DOCBOOK\" was never defined.
+if test -z "${WITH_MANPAGE_TRUE}" && test -z "${WITH_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_MANPAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_PREBUILT_MANPAGE_TRUE}" && test -z "${WITH_PREBUILT_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_PREBUILT_MANPAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_DISTRIBUTABLE_MANPAGE_TRUE}" && test -z "${WITH_DISTRIBUTABLE_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_DISTRIBUTABLE_MANPAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_PREBUILT_MANPAGE_TRUE}" && test -z "${WITH_PREBUILT_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_PREBUILT_MANPAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_DISTRIBUTABLE_MANPAGE_TRUE}" && test -z "${WITH_DISTRIBUTABLE_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_DISTRIBUTABLE_MANPAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_MANPAGE_TRUE}" && test -z "${WITH_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_MANPAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_DISTRIBUTABLE_MANPAGE_TRUE}" && test -z "${WITH_DISTRIBUTABLE_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_DISTRIBUTABLE_MANPAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_MANPAGE_TRUE}" && test -z "${WITH_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_MANPAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_DISTRIBUTABLE_MANPAGE_TRUE}" && test -z "${WITH_DISTRIBUTABLE_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_DISTRIBUTABLE_MANPAGE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_DOCBOOK_TRUE}" && test -z "${WITH_DOCBOOK_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_DOCBOOK\" was never defined.
+if test -z "${WITH_PREBUILT_MANPAGE_TRUE}" && test -z "${WITH_PREBUILT_MANPAGE_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_PREBUILT_MANPAGE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -20860,7 +20977,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by expat $as_me 2.6.0, which was
+This file was extended by expat $as_me 2.6.1, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20928,7 +21045,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-expat config.status 2.6.0
+expat config.status 2.6.1
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"