From 892e3b0869434bc1e3c877cf9f4a154803fef363 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:40:25 +0100 Subject: [PATCH 1/7] [libxml2] add missing include of GNUInstallDirs --- ports/libxml2/CMakeLists.txt | 2 +- ports/libxml2/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index cd6de43260917e..c92208afa617da 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(libxml2 C) - +include(GNUInstallDirs) set(WITH_TRIO 0 CACHE BOOL "Add trio support") set(WITH_THREADS 1 CACHE BOOL "Add multithread support") set(WITH_THREAD_ALLOC 0 CACHE BOOL "Add per-thread memory") diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index c5ac7c0fd32aa1..cf516de7b4e6eb 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.10", - "port-version": 3, + "port-version": 4, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "dependencies": [ From 93d0f64f0daaa37110f229428e4efb831c44867d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:41:11 +0100 Subject: [PATCH 2/7] add version info --- versions/baseline.json | 2 +- versions/l-/libxml2.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index fee501f2587e17..8c4a74f38c7eca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3586,7 +3586,7 @@ }, "libxml2": { "baseline": "2.9.10", - "port-version": 3 + "port-version": 4 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index e7a5c70f798a24..b449c16d401bb3 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ed3f34c81182a5a32967a0fb390b13e9c195750", + "version-semver": "2.9.10", + "port-version": 4 + }, { "git-tree": "7aa5a9ea1742082d57eb67708f107ade65f94c12", "version-semver": "2.9.10", From e9cfff3fc9a995a7263014527548582b527db637 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:49:40 +0100 Subject: [PATCH 3/7] add include dir to pc files .... --- ports/libxml2/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index c92208afa617da..a590bd73665605 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -170,6 +170,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) +set(XML_INCLUDEDIR "-I\"${includedir}\"") configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/libxml-2.0.pc DESTINATION lib/pkgconfig) \ No newline at end of file From 226fe4d7e943dbbbc62f596db8fd9e2a771f4477 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:50:36 +0100 Subject: [PATCH 4/7] update version --- versions/l-/libxml2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index b449c16d401bb3..bfcb4a9a3634f4 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9ed3f34c81182a5a32967a0fb390b13e9c195750", + "git-tree": "16f25a133470e3097293c31211586c381184a494", "version-semver": "2.9.10", "port-version": 4 }, From 8209029d59bd44574e3010989613441d14d14133 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:52:47 +0100 Subject: [PATCH 5/7] add escaping --- ports/libxml2/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt index a590bd73665605..2c11f0db4e4a9a 100644 --- a/ports/libxml2/CMakeLists.txt +++ b/ports/libxml2/CMakeLists.txt @@ -170,7 +170,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) -set(XML_INCLUDEDIR "-I\"${includedir}\"") +set(XML_INCLUDEDIR "-I\"\${includedir}\"") configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/libxml-2.0.pc DESTINATION lib/pkgconfig) \ No newline at end of file From 99fb3a519987567641e074b6aa1c82bb4fc52940 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 26 Mar 2021 10:53:33 +0100 Subject: [PATCH 6/7] version update --- versions/l-/libxml2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index bfcb4a9a3634f4..84f2ecd4cb45cc 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "16f25a133470e3097293c31211586c381184a494", + "git-tree": "f48df60ed523a3ee80d436d9b94b90f617905926", "version-semver": "2.9.10", "port-version": 4 }, From 32fd28450ba6320681c06bbf51a3fd0e82e69f16 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 7 Apr 2021 23:45:26 -0700 Subject: [PATCH 7/7] Update baseline version --- versions/baseline.json | 10 +++++----- versions/l-/libxml2.json | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 32accbc448d81b..524e35a838bdb7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -332,14 +332,14 @@ "baseline": "4.8.30", "port-version": 5 }, - "bext-ut": { - "baseline": "1.1.8", - "port-version": 0 - }, "bext-di": { "baseline": "1.2.0", "port-version": 0 }, + "bext-ut": { + "baseline": "1.1.8", + "port-version": 0 + }, "bfgroup-lyra": { "baseline": "1.5", "port-version": 1 @@ -3618,7 +3618,7 @@ }, "libxml2": { "baseline": "2.9.10", - "port-version": 4 + "port-version": 5 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 40b026f1cc6ef8..b30af65644cb8b 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2908a3c4c0454f12d4e14aa954952cb2824bf508", + "version-semver": "2.9.10", + "port-version": 5 + }, { "git-tree": "98c48a2d0545e6d392084260abc6411eb44f0577", "version-semver": "2.9.10",