[libxml2] Update to 2.14.5 (#46858)

2025-08-11 21:07:52 +02:00 · 2025-08-11 21:07:52 +02:00 · 085820b35f
parent b6889e55e1
commit 085820b35f
15 changed files with 109 additions and 123 deletions
--- a/ports/libosmscout/fix-libxml2.patch
+++ b/ports/libosmscout/fix-libxml2.patch
@ -0,0 +1,26 @@
+diff --git a/libosmscout-import/src/osmscout/import/PreprocessOSM.cpp b/libosmscout-import/src/osmscout/import/PreprocessOSM.cpp
+index acf2ed97c4..9f006aa7ac 100644
+--- a/libosmscout-import/src/osmscout/import/PreprocessOSM.cpp	
+++ b/libosmscout-import/src/osmscout/import/PreprocessOSM.cpp
+@@ -339,7 +339,7 @@ namespace osmscout {
+     return xmlGetPredefinedEntity(name);
+   }
+ 
+-  static void StructuredErrorHandler(void* /*data*/, xmlErrorPtr error)
+  static void StructuredErrorHandler(void* /*data*/, const xmlError* error)
+   {
+     std::cerr << "XML error, line " << error->line << ": " << error->message << std::endl;
+   }
+diff --git a/libosmscout-gpx/src/osmscout/gpx/Import.cpp b/libosmscout-gpx/src/osmscout/gpx/Import.cpp
+index a18648fd34..d2492324e0 100644
+--- a/libosmscout-gpx/src/osmscout/gpx/Import.cpp
+++ b/libosmscout-gpx/src/osmscout/gpx/Import.cpp
+@@ -288,7 +288,7 @@ public:
+     return xmlGetPredefinedEntity(name);
+   }
+ 
+-  static void StructuredErrorHandler(void* data, xmlErrorPtr error)
+  static void StructuredErrorHandler(void* data, const xmlError* error)
+   {
+     auto* parser=static_cast<GpxParser*>(data);
+     parser->Error("XML error, line " + std::to_string(error->line) + ": " + error->message);
--- a/ports/libosmscout/portfile.cmake
+++ b/ports/libosmscout/portfile.cmake
@ -4,7 +4,9 @@ vcpkg_from_github(
    REF c81e1d9a0f69cc5b93588dbe330b2af587162c5f
    SHA512 d6ddbc49dd40b1f938ae2cd1ea9342cab0a52db46bf7ed6716111a91d0a38acba12ff2e273d457db51fc240d578a5b849af77b53e600482cf52c3b22306f8c45
    HEAD_REF master
-    PATCHES protobuf-linkage.patch
+    PATCHES
+        protobuf-linkage.patch
+        fix-libxml2.patch
 )

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
--- a/ports/libosmscout/vcpkg.json
+++ b/ports/libosmscout/vcpkg.json
@ -1,11 +1,11 @@
 {
  "name": "libosmscout",
  "version": "1.1.1",
-  "port-version": 6,
+  "port-version": 7,
  "description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.",
  "homepage": "https://libosmscout.sourceforge.net/",
  "documentation": "https://libosmscout.sourceforge.net/documentation/",
-  "supports": "!uwp & !arm & !arm64 & !static & !wasm32 & !emscripten",
+  "supports": "!uwp & !(windows & arm) & !android & !(windows & static) & !wasm32 & !emscripten",
  "dependencies": [
    "libiconv",
    "liblzma",
--- a/ports/librsvg/fix-libxml2-2.13.5.patch
+++ b/ports/librsvg/fix-libxml2-2.13.5.patch
@ -11,3 +11,15 @@ index 5b359a206..4f59281b6 100644
 {
 }
 
+diff --git a/rsvg-private.h b/rsvg-private.h
+index 82157bc..fb9c4e0 100644
+--- a/rsvg-private.h
+++ b/rsvg-private.h
+@@ -33,6 +33,7 @@
+
+ #include <libxml/SAX.h>
+ #include <libxml/xmlmemory.h>
+#include <libxml/tree.h>
+ #include <pango/pango.h>
+ #include <glib.h>
+ #include <glib-object.h>
--- a/ports/librsvg/vcpkg.json
+++ b/ports/librsvg/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "librsvg",
  "version": "2.40.21",
+  "port-version": 1,
  "description": "A small library to render Scalable Vector Graphics (SVG)",
  "homepage": "https://gitlab.gnome.org/GNOME/librsvg",
  "license": "LGPL-2.0-or-later",
--- a/ports/libxml2/cxx-for-icu.diff
+++ b/ports/libxml2/cxx-for-icu.diff
@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2af1e6f..a2c134c 100644
+index b952d7bf..6d43569b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -10,7 +10,7 @@ foreach(line ${CONFIGURE_AC_LINES})
- endforeach()
- set(VERSION "${LIBXML_MAJOR_VERSION}.${LIBXML_MINOR_VERSION}.${LIBXML_MICRO_VERSION}")
+@@ -8,7 +8,7 @@ if(${VERSION} MATCHES [[([0-9]+)\.([0-9]+)\.([0-9]+)]])
+     set(LIBXML_MICRO_VERSION ${CMAKE_MATCH_3})
+ endif()
 
 -project(libxml2 VERSION ${VERSION} LANGUAGES C)
 +project(libxml2 VERSION ${VERSION} LANGUAGES C CXX)
 
- include(CheckCSourceCompiles)
- include(CheckFunctionExists)
+ set(CMAKE_C_STANDARD 11)
+ 
--- a/ports/libxml2/disable-docs.patch
+++ b/ports/libxml2/disable-docs.patch
@ -1,22 +1,24 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f99fd368..38dcd377 100644
+index b952d7bf..f5254a20 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -586,17 +586,6 @@ if(LIBXML2_WITH_PYTHON)
+@@ -568,19 +568,6 @@ if(LIBXML2_WITH_PYTHON)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2.py DESTINATION ${LIBXML2_PYTHON_INSTALL_DIR} COMPONENT runtime)
 endif()
 
 -install(FILES doc/xml2-config.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
-install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
-install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
+-if(LIBXML2_WITH_PROGRAMS)
+-    install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
+-    install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation)
+-endif()
 -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
 -    PATTERN "*.xml" EXCLUDE
 -    PATTERN "*.xsl" EXCLUDE)
-
+ 
 configure_package_config_file(
     libxml2-config.cmake.cmake.in libxml2-config.cmake
-     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION}
--- a/ports/libxml2/fix_cmakelist.patch
+++ b/ports/libxml2/fix_cmakelist.patch
@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f99fd368..3246a42c 100644
+index b952d7bf..9196ebe4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -438,7 +438,7 @@ set_target_properties(
-     SOVERSION ${LIBXML_MAJOR_VERSION}
+@@ -425,7 +425,7 @@ set_target_properties(
+     MACHO_CURRENT_VERSION "${LIBXML_MACHO_COMPAT}.${LIBXML_MICRO_VERSION}"
 )
 
 -if(MSVC)
@ -11,7 +11,7 @@ index f99fd368..3246a42c 100644
     if(BUILD_SHARED_LIBS)
         set_target_properties(
             LibXml2
-@@ -653,7 +653,11 @@ list(JOIN XML_PRIVATE_LIBS " " XML_PRIVATE_LIBS)
+@@ -634,7 +634,11 @@ list(JOIN XML_PRIVATE_LIBS " " XML_PRIVATE_LIBS)
 
 set(XML_INCLUDEDIR "-I\${includedir}/libxml2")
 set(XML_LIBDIR "-L\${libdir}")
@ -23,7 +23,7 @@ index f99fd368..3246a42c 100644
 
 if(BUILD_SHARED_LIBS)
     set(XML_PC_PRIVATE ".private")
-@@ -679,7 +683,7 @@ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+@@ -669,7 +673,7 @@ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
 configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT development)
 
--- a/ports/libxml2/fix_ios_compilation.patch
+++ b/ports/libxml2/fix_ios_compilation.patch
@ -1,98 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a48dbbfe..9f51cf6e 100644
+index b952d7bf..d555d25a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -136,7 +136,12 @@ if (NOT MSVC)
-     check_include_files(fcntl.h HAVE_FCNTL_H)
-     check_function_exists(fpclass HAVE_FPCLASS)
-     check_function_exists(ftime HAVE_FTIME)
-    check_function_exists(getentropy HAVE_GETENTROPY)
-+    if (APPLE)
-+        # In old macOS SDKs (ex: 10.15), sys/random.h fails to include header files it needs, so add them here.
-+        check_symbol_exists(getentropy "Availability.h;stddef.h;sys/random.h" HAVE_GETENTROPY)
-+    else()
-+        check_symbol_exists(getentropy sys/random.h HAVE_GETENTROPY)
-+    endif()
-     check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
-     check_library_exists(history append_history "" HAVE_LIBHISTORY)
-     check_library_exists(readline readline "" HAVE_LIBREADLINE)
-@@ -149,12 +154,6 @@ if (NOT MSVC)
-     check_function_exists(stat HAVE_STAT)
-     check_include_files(stdint.h HAVE_STDINT_H)
-     check_include_files(sys/mman.h HAVE_SYS_MMAN_H)
-    if (APPLE)
-        # In old macOS SDKs (ex: 10.15), sys/random.h fails to include header files it needs, so add them here.
-        check_include_files("Availability.h;stddef.h;sys/random.h" HAVE_SYS_RANDOM_H)
-    else()
-        check_include_files(sys/random.h HAVE_SYS_RANDOM_H)
-    endif()
-     check_include_files(sys/select.h HAVE_SYS_SELECT_H)
-     check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
-     check_include_files(sys/stat.h HAVE_SYS_STAT_H)
-diff --git a/config.h.cmake.in b/config.h.cmake.in
-index 2f4aeba3..36c068fd 100644
--- a/config.h.cmake.in
-+++ b/config.h.cmake.in
-@@ -69,9 +69,6 @@
- /* Define to 1 if you have the <sys/mman.h> header file. */
- #cmakedefine HAVE_SYS_MMAN_H 1
- 
-/* Define to 1 if you have the <sys/random.h> header file. */
-#cmakedefine HAVE_SYS_RANDOM_H 1
-
- /* Define to 1 if you have the <sys/select.h> header file. */
- #cmakedefine HAVE_SYS_SELECT_H 1
- 
-diff --git a/configure.ac b/configure.ac
-index 478bb4eb..ad49a9ac 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -305,7 +305,6 @@ AC_CHECK_HEADERS([stdint.h])
- AC_CHECK_HEADERS([fcntl.h unistd.h sys/stat.h])
- AC_CHECK_HEADERS([sys/mman.h])
- AC_CHECK_HEADERS([sys/time.h sys/timeb.h])
-AC_CHECK_HEADERS([sys/random.h])
- AC_CHECK_HEADERS([dl.h dlfcn.h])
- AC_CHECK_HEADERS([glob.h])
- AM_CONDITIONAL(WITH_GLOB, test "$ac_cv_header_glob_h" = "yes")
-@@ -318,9 +317,7 @@ AH_VERBATIM([HAVE_MUNMAP_AFTER],[/* mmap() is no good without munmap() */
- #  undef /**/ HAVE_MMAP
- #endif])
- 
-AC_CHECK_DECL([getentropy],
-              [AC_DEFINE([HAVE_GETENTROPY], [1], [getentropy])], [],
-              [#include <sys/random.h>])
-+AC_CHECK_DECLS([getentropy], [], [], [#include <sys/random.h>])
- 
- dnl
- dnl Checks for inet libraries
-diff --git a/dict.c b/dict.c
-index a238cd9d..ce501cb5 100644
--- a/dict.c
-+++ b/dict.c
-@@ -929,13 +929,11 @@ xmlDictQLookup(xmlDictPtr dict, const xmlChar *prefix, const xmlChar *name) {
-   #include <windows.h>
-   #include <bcrypt.h>
- #else
-  #if defined(HAVE_GETENTROPY)
-+  #if HAVE_GETENTROPY
-     #ifdef HAVE_UNISTD_H
-       #include <unistd.h>
-     #endif
-    #ifdef HAVE_SYS_RANDOM_H
-      #include <sys/random.h>
-    #endif
-+    #include <sys/random.h>
-   #endif
-   #include <time.h>
- #endif
-@@ -969,7 +967,7 @@ xmlInitRandom(void) {
- #else
-         int var;
- 
-#if defined(HAVE_GETENTROPY)
-+#if HAVE_GETENTROPY
-         while (1) {
-             if (getentropy(globalRngState, sizeof(globalRngState)) == 0)
-                 return;
-
+@@ -134,7 +134,12 @@ check_c_source_compiles("
+     f(void) {}
+     int main(void) { return 0; }
+ " HAVE_FUNC_ATTRIBUTE_DESTRUCTOR)
+-check_symbol_exists(getentropy "sys/random.h" HAVE_DECL_GETENTROPY)
+if (APPLE)
+    # In old macOS SDKs (ex: 10.15), sys/random.h fails to include header files it needs, so add them here.
+    check_symbol_exists(getentropy "Availability.h;stddef.h;sys/random.h" HAVE_GETENTROPY)
+else()
+    check_symbol_exists(getentropy sys/random.h HAVE_GETENTROPY)
+endif()
+ check_symbol_exists(glob "glob.h" HAVE_DECL_GLOB)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_DECL_MMAP)
+ check_include_files(stdint.h HAVE_STDINT_H)
--- a/ports/libxml2/portfile.cmake
+++ b/ports/libxml2/portfile.cmake
@ -2,7 +2,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO GNOME/libxml2
    REF "v${VERSION}"
-    SHA512 6d32311feda4b415f50236dbc1b982094fafe46f86bb3f2ad21365183bd7e9011d00e12c0c23827daf851022a20c99f7cc646e5957a10946300bdc836f91f924
+    SHA512 30bc2f10cd7c29ae4e8580afcf6626fb14e5ef5046bad1242c2e6b433a374d6eaaa6093cd3682b84392c9dd75ba90d7090b6899b732a5b98e8790173bddd3020
    HEAD_REF master
    PATCHES
        cxx-for-icu.diff
--- a/ports/libxml2/vcpkg.json
+++ b/ports/libxml2/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "libxml2",
-  "version": "2.13.8",
-  "port-version": 1,
+  "version": "2.14.5",
  "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
  "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home",
  "license": "MIT",
@ -41,7 +40,16 @@
      ]
    },
    "legacy": {
-      "description": "Add deprecated APIs for compatibility"
+      "description": "Add deprecated APIs for compatibility",
+      "dependencies": [
+        {
+          "name": "libxml2",
+          "default-features": false,
+          "features": [
+            "zlib"
+          ]
+        }
+      ]
    },
    "lzma": {
      "description": "Use LZMA",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -5198,7 +5198,7 @@
    },
    "libosmscout": {
      "baseline": "1.1.1",
-      "port-version": 6
+      "port-version": 7
    },
    "libp7-baical": {
      "baseline": "replaced",
@ -5302,7 +5302,7 @@
    },
    "librsvg": {
      "baseline": "2.40.21",
-      "port-version": 0
+      "port-version": 1
    },
    "librsync": {
      "baseline": "2.3.4",
@ -5693,8 +5693,8 @@
      "port-version": 0
    },
    "libxml2": {
-      "baseline": "2.13.8",
-      "port-version": 1
+      "baseline": "2.14.5",
+      "port-version": 0
    },
    "libxmlb": {
      "baseline": "0.3.22",
--- a/versions/l-/libosmscout.json
+++ b/versions/l-/libosmscout.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4006b3fc78252ee15866ddca75a568a4b8530ee2",
+      "version": "1.1.1",
+      "port-version": 7
+    },
    {
      "git-tree": "abd262984a1f0a805fd306f4ef659907870de6af",
      "version": "1.1.1",
--- a/versions/l-/librsvg.json
+++ b/versions/l-/librsvg.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4d44f8793a7574cfbb0c401c944de5c79028f240",
+      "version": "2.40.21",
+      "port-version": 1
+    },
    {
      "git-tree": "13a61a8e2a4e6ca73d71dfbe8a6e0b366d2300f8",
      "version": "2.40.21",
--- a/versions/l-/libxml2.json
+++ b/versions/l-/libxml2.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "8e80e2104513a62275ab5ea5412acbf5a02d73fd",
+      "version": "2.14.5",
+      "port-version": 0
+    },
    {
      "git-tree": "4de3f2b200fc0d79cbedf567cbbef9c422d2f79b",
      "version": "2.13.8",