From 06e120b941c00c2a5e3674f7421f7818aa3f60f1 Mon Sep 17 00:00:00 2001 From: Thomas Beutlich Date: Mon, 28 Oct 2024 19:42:53 +0100 Subject: [PATCH 1/3] Bump libxml2 --- build/build_libxml2.py | 6 +++--- fmusim-gui/build/build_libxml2.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/build_libxml2.py b/build/build_libxml2.py index dc1b60a7..38c5b4fb 100644 --- a/build/build_libxml2.py +++ b/build/build_libxml2.py @@ -19,8 +19,8 @@ ) (args, _) = parser.parse_known_args() -archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.zip', - checksum='711675470075cc85ba450f56aff7424f1ecdef00bc5d1d5dced3ffecd1a9b772') +archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.13.4.zip', + checksum='9d31649a3f8c0274253e57874280647c8962eed36570b714e869939c101347ba') root = Path(__file__).parent @@ -71,7 +71,7 @@ '-D', 'LIBXML2_WITH_PYTHON=OFF', '-D', 'LIBXML2_WITH_ZLIB=OFF', '-D', 'LIBXML2_WITH_TESTS=OFF', - root / 'libxml2-2.11.5'] + root / 'libxml2-2.13.4'] ) check_call([ diff --git a/fmusim-gui/build/build_libxml2.py b/fmusim-gui/build/build_libxml2.py index 10e147fa..a3424151 100644 --- a/fmusim-gui/build/build_libxml2.py +++ b/fmusim-gui/build/build_libxml2.py @@ -4,8 +4,8 @@ from fmpy import extract -archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.zip', - checksum='711675470075cc85ba450f56aff7424f1ecdef00bc5d1d5dced3ffecd1a9b772') +archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.13.4.zip', + checksum='9d31649a3f8c0274253e57874280647c8962eed36570b714e869939c101347ba') root = Path(__file__).parent @@ -31,7 +31,7 @@ '-D', 'LIBXML2_WITH_PYTHON=OFF', '-D', 'LIBXML2_WITH_ZLIB=OFF', '-D', 'LIBXML2_WITH_TESTS=OFF', - str(root / 'libxml2-2.11.5')] + str(root / 'libxml2-2.13.4')] ) check_call([ From 10820d3e39db5f525b5f9a1ea96c6243c9fb0ae8 Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Tue, 29 Oct 2024 09:34:27 +0100 Subject: [PATCH 2/3] Include stdlib.h in FMIModelDescription.c --- fmusim/FMIModelDescription.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fmusim/FMIModelDescription.c b/fmusim/FMIModelDescription.c index 03fb47c5..98cba49c 100644 --- a/fmusim/FMIModelDescription.c +++ b/fmusim/FMIModelDescription.c @@ -2,6 +2,7 @@ #include #include +#include #include #include From 03df668fc83456747c00ff46087973eb1b7f29e8 Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Tue, 29 Oct 2024 10:26:48 +0100 Subject: [PATCH 3/3] Link fmusim against bcrypt on Windows --- fmusim/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/fmusim/CMakeLists.txt b/fmusim/CMakeLists.txt index af758e4b..e48f3631 100644 --- a/fmusim/CMakeLists.txt +++ b/fmusim/CMakeLists.txt @@ -109,6 +109,7 @@ if (WIN32) ${CVODE_DIR}/lib/sundials_cvode.lib wsock32 ws2_32 + bcrypt ) elseif(UNIX AND NOT APPLE) set(libraries