From 250c2183de3ba713016d333d41705f9b512a306d Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Fri, 6 Jun 2025 21:31:03 +0800 Subject: [PATCH 1/3] wxWidgets bump to 3.3.2 --- subprojects/wxWidgets.wrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/wxWidgets.wrap b/subprojects/wxWidgets.wrap index 14a8df17d6..0f42731084 100644 --- a/subprojects/wxWidgets.wrap +++ b/subprojects/wxWidgets.wrap @@ -1,5 +1,5 @@ [wrap-git] directory = wxWidgets url = https://github.com/wxWidgets/wxWidgets.git -revision = 3.2 +revision = v3.3.2 clone-recursive = true From 23668cf6c26f9b854da064bf9f6a1a1e75d0a13c Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Fri, 6 Mar 2026 00:19:47 +0800 Subject: [PATCH 2/3] osx-bundle: skip all subprojects during install --- tools/osx-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/osx-bundle.sh b/tools/osx-bundle.sh index cea6cf9248..bf3f0f88fb 100755 --- a/tools/osx-bundle.sh +++ b/tools/osx-bundle.sh @@ -53,7 +53,7 @@ echo echo "---- Installing files ----" CURRENT_DIR=`pwd` cd ${BUILD_DIR} -meson install --skip-subprojects luajit +meson install --skip-subprojects cd ${CURRENT_DIR} echo From fe3082055e90154ffca07e237e1032dd3089f7aa Mon Sep 17 00:00:00 2001 From: 0tkl <118708188+0tkl@users.noreply.github.com> Date: Sat, 7 Jun 2025 00:25:40 +0800 Subject: [PATCH 3/3] Update ci.yml --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc43950c65..24b246d251 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,7 @@ jobs: -Dfribidi:tests=false -Dfribidi:docs=false -Dlibass:fontconfig=disabled + -Dwx_version='3.3.2' #- { # name: Windows MinGW, # os: windows-latest, @@ -56,25 +57,25 @@ jobs: name: macOS x86_64 Debug, os: macos-15-intel, buildtype: debugoptimized, - args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 + args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 -Dwx_version='3.3.2' } - { name: macOS x86_64 Release, os: macos-15-intel, buildtype: release, - args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 + args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 -Dwx_version='3.3.2' } - { name: macOS arm64 Debug, os: macos-15, buildtype: debugoptimized, - args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 + args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 -Dwx_version='3.3.2' } - { name: macOS arm64 Release, os: macos-15, buildtype: release, - args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 + args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 -Dwx_version='3.3.2' } steps: