From e2f1d9f45aff3a008b5d299c92a0c769769cd7cb Mon Sep 17 00:00:00 2001 From: Marco Calautti Date: Sat, 31 Aug 2024 11:11:51 +0200 Subject: [PATCH 1/2] disable builtin zlib support from wxWidgets, as we do not use it --- libs/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index e285907..1bed313 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -11,15 +11,18 @@ set(wxUSE_HTML OFF CACHE BOOL "" FORCE) set(wxUSE_STC OFF CACHE BOOL "" FORCE) set(wxUSE_WXHTML_HELP OFF CACHE BOOL "" FORCE) set(wxUSE_XRC OFF CACHE BOOL "" FORCE) +set(wxUSE_ZIPSTREAM OFF CACHE BOOL "" FORCE) set(wxUSE_REGEX OFF CACHE BOOL "" FORCE) -set(wxUSE_ZLIB builtin CACHE STRING "" FORCE) +set(wxUSE_ZLIB OFF CACHE STRING "" FORCE) set(wxUSE_EXPAT OFF CACHE BOOL "" FORCE) set(wxUSE_LIBJPEG OFF CACHE BOOL "" FORCE) -set(wxUSE_LIBPNG builtin CACHE STRING "" FORCE) +set(wxUSE_LIBPNG OFF CACHE STRING "" FORCE) set(wxUSE_LIBTIFF OFF CACHE BOOL "" FORCE) set(wxUSE_NANOSVG OFF CACHE BOOL "" FORCE) set(wxUSE_XML OFF CACHE BOOL "" FORCE) +set(wxUSE_SVG OFF CACHE BOOL "" FORCE) +set(wxUSE_ARTPROVIDER_TANGO OFF CACHE BOOL "" FORCE) set(wxBUILD_STRIPPED_RELEASE ON CACHE BOOL "" FORCE) add_subdirectory(wxWidgets) From 78a57c82db794689ac2d5a12fc2155e24fc2e12d Mon Sep 17 00:00:00 2001 From: Marco Calautti Date: Sat, 31 Aug 2024 11:26:49 +0200 Subject: [PATCH 2/2] updated macos runner as macos-11 is deprecated --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8385673..4994245 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,8 +54,8 @@ jobs: include: - os: ubuntu-20.04 release_package: linuxGTK3_bin_x86_64 - - os: macos-11 - release_package: macos11+_bin_universal + - os: macos-12 + release_package: macos12+_bin_universal - os: windows-2022 release_package_64: windows_bin_x86_64 release_package_32: windows_bin_x86