diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index 19bee0af1..907e50745 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,5 +1,5 @@ Source: libarchive -Version: 3.4.0-1 +Version: 3.4.0-2 Homepage: https://github.com/libarchive/libarchive Description: Library for reading and writing streaming archives Build-Depends: zlib diff --git a/ports/libarchive/fix-cpu-set.patch b/ports/libarchive/fix-cpu-set.patch new file mode 100644 index 000000000..8d1924dbe --- /dev/null +++ b/ports/libarchive/fix-cpu-set.patch @@ -0,0 +1,15 @@ +diff --git a/libarchive/archive_random.c b/libarchive/archive_random.c +index 65ea691..63217ec 100644 +--- a/libarchive/archive_random.c ++++ b/libarchive/archive_random.c +@@ -48,6 +48,10 @@ __FBSDID("$FreeBSD$"); + #include + #endif + #ifdef HAVE_PTHREAD_H ++#ifdef __GNUC__ ++#define _GNU_SOURCE ++#include ++#endif + #include + #endif + diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 3b69a69b9..61d1dfd4a 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( fix-dependencies.patch fix-lz4.patch fix-zstd.patch + fix-cpu-set.patch ) set(BUILD_libarchive_bzip2 OFF) diff --git a/ports/openvpn3/CMakeLists.txt b/ports/openvpn3/CMakeLists.txt index 2b005d608..58514cbb0 100644 --- a/ports/openvpn3/CMakeLists.txt +++ b/ports/openvpn3/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(openvpncli CXX) find_path(ASIO_HPP asio.hpp) @@ -13,6 +13,9 @@ if(WIN32) endif() add_definitions(-DNOMINMAX -DUSE_ASIO -DUSE_MBEDTLS -D_WIN32_WINNT=0x0600) +if(LINUX) + add_compile_options(-include bits/endian.h) +endif() add_library(ovpncli client/ovpncli.cpp) target_link_libraries(ovpncli PRIVATE Iphlpapi.lib Wininet.lib Setupapi.lib Cfgmgr32.lib Rpcrt4.lib Fwpuclnt.lib Wtsapi32.lib ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB}) diff --git a/ports/openvpn3/CONTROL b/ports/openvpn3/CONTROL index 23292afac..7ec063918 100644 --- a/ports/openvpn3/CONTROL +++ b/ports/openvpn3/CONTROL @@ -1,4 +1,4 @@ Source: openvpn3 -Version: 3.4.1 +Version: 3.4.1-1 Build-Depends: asio, tap-windows6 (windows), mbedtls Description: a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch. diff --git a/ports/xalan-c/CONTROL b/ports/xalan-c/CONTROL index b9e3d8584..dcefa5172 100644 --- a/ports/xalan-c/CONTROL +++ b/ports/xalan-c/CONTROL @@ -1,5 +1,5 @@ Source: xalan-c -Version: 1.11-10 +Version: 1.11-11 Homepage: https://github.com/apache/xalan-c Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types Build-Depends: xerces-c diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake index a40d9a068..78ae19cf2 100644 --- a/ports/xalan-c/portfile.cmake +++ b/ports/xalan-c/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ICU=ON ) vcpkg_install_cmake() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a034584f3..c39b453ad 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1704,7 +1704,6 @@ vlpp:arm64-windows=fail vlpp:arm-uwp=fail vlpp:x64-osx=fail vlpp:x64-uwp=fail -vtk:x64-linux=fail vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail