From cd8796a45c4b9cb007cd4ee64597a8bd4e0cb628 Mon Sep 17 00:00:00 2001 From: Dmytro Lytovchenko Date: Wed, 10 Sep 2025 15:03:07 +0200 Subject: [PATCH 1/2] Comment out downloading of wxWidgets source on MacOS and use local libraries only --- .github/scripts/build-macos-wxwidgets.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/scripts/build-macos-wxwidgets.sh b/.github/scripts/build-macos-wxwidgets.sh index 3f87cb738726..cfc144f87fbc 100755 --- a/.github/scripts/build-macos-wxwidgets.sh +++ b/.github/scripts/build-macos-wxwidgets.sh @@ -38,7 +38,8 @@ cd wxWidgets --disable-shared \ --prefix=$PWD/release \ --with-cocoa \ - --with-macosx-version-min=10.15 \ - --disable-sys-libs + --with-macosx-version-min=10.15 +# --disable-sys-libs + make make install From 3b4ad7e0a7262aaedec0a95a1af77e02fa2f5633 Mon Sep 17 00:00:00 2001 From: Dmytro Lytovchenko Date: Tue, 23 Sep 2025 14:09:14 +0200 Subject: [PATCH 2/2] Use 3.2.8.1 for it must have fp.h problem fixed --- .github/scripts/build-macos-wxwidgets.sh | 21 +++++++++++++-------- .github/workflows/main.yaml | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/scripts/build-macos-wxwidgets.sh b/.github/scripts/build-macos-wxwidgets.sh index cfc144f87fbc..775362d32378 100755 --- a/.github/scripts/build-macos-wxwidgets.sh +++ b/.github/scripts/build-macos-wxwidgets.sh @@ -22,23 +22,28 @@ set -e -export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) +MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN) +export MAKEFLAGS if [ -z "$WXWIDGETS_VERSION" ]; then - WXWIDGETS_VERSION=3.1.5 + # Value is set in .github/workflows/main.yaml for MacOS only, this here is the fallback value + WXWIDGETS_VERSION=3.2.8.1 fi -vsn=$WXWIDGETS_VERSION -curl --fail -LO https://github.com/wxWidgets/wxWidgets/releases/download/v$vsn/wxWidgets-$vsn.tar.bz2 -tar -xf wxWidgets-$vsn.tar.bz2 -mv wxWidgets-$vsn/ wxWidgets +WX_SELECTED_VERSION=${WXWIDGETS_VERSION} +WX_DOWNLOAD_URL=https://github.com/wxWidgets/wxWidgets/releases/download/v${WX_SELECTED_VERSION}/wxWidgets-${WX_SELECTED_VERSION}.tar.bz2 +echo "Downloading WxWidgets from ${WX_DOWNLOAD_URL}" +curl --fail -LO "${WX_DOWNLOAD_URL}" +tar -xf "wxWidgets-${WX_SELECTED_VERSION}.tar.bz2" +mv "wxWidgets-${WX_SELECTED_VERSION}/" wxWidgets cd wxWidgets ./configure \ --disable-shared \ - --prefix=$PWD/release \ + --prefix="${PWD}/release" \ --with-cocoa \ - --with-macosx-version-min=10.15 + --with-macosx-version-min=10.15 \ + --with-libtiff=builtin # --disable-sys-libs make diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 6f5259036167..1ac9504fbf40 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -194,7 +194,7 @@ jobs: needs: pack if: needs.pack.outputs.build-c-code == 'true' env: - WXWIDGETS_VERSION: 3.2.6 + WXWIDGETS_VERSION: 3.2.8.1 MACOS_VERSION: 15 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/checkout@v4.2.2