Skip to content

Commit f2da023

Browse files
authored
use C++20 (#39)
1 parent 362c9a5 commit f2da023

File tree

8 files changed

+12
-14
lines changed

8 files changed

+12
-14
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ jobs:
2020

2121
build:
2222
needs: lint
23-
runs-on: ${{ matrix.os }}
23+
runs-on: macos-15
2424
env:
2525
MOZC_SHA: ad0e97b8b8dcfd4c841a02c5d6a043fb5e741405
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
os: [macos-15, macos-13]
3029
include:
31-
- { os: macos-15, simulator: "iPhone 16" }
32-
- { os: macos-13, simulator: "iPhone 15" }
30+
- { simulator: "iPhone 16" }
3331

3432
steps:
3533
- uses: actions/checkout@v4

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/cmake/ios.cmake")
88
project(fcitx5-ios VERSION 0.1.0 LANGUAGES CXX Swift)
99
set(CMAKE_OSX_DEPLOYMENT_TARGET 17) # I really need onChange for focus out.
1010
set(CMAKE_Swift_LANGUAGE_VERSION 5.9)
11-
set(CMAKE_CXX_STANDARD 17)
11+
set(CMAKE_CXX_STANDARD 20)
1212

1313
set(BUNDLE_IDENTIFIER "org.fcitx.Fcitx5")
1414
set(BUNDLE_NAME "Fcitx5")

fcitx5

Submodule fcitx5 updated 254 files

patches/fcitx5.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/lib/fcitx/addonmanager.cpp b/src/lib/fcitx/addonmanager.cpp
2-
index 55269f33..5e7b8d27 100644
2+
index f9334009..6f34f265 100644
33
--- a/src/lib/fcitx/addonmanager.cpp
44
+++ b/src/lib/fcitx/addonmanager.cpp
55
@@ -250,7 +250,6 @@ void AddonManager::unregisterLoader(const std::string &name) {

scripts/install-deps.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ fi
2929
for dep in "${deps[@]}"; do
3030
file=$dep$POSTFIX.tar.bz2
3131
[[ -f cache/$file ]] || wget -P cache https://github.com/fcitx-contrib/fcitx5-prebuilder/releases/download/ios/$file
32-
tar xjvf cache/$file -C $EXTRACT_DIR
32+
tar xf cache/$file -C $EXTRACT_DIR
3333
done
3434

3535
file=Fcitx5-arm64.tar.bz2
3636
[[ -f cache/$file ]] || wget -P cache https://github.com/fcitx-contrib/fcitx5-macos/releases/download/latest/$file
37-
tar xjvf cache/$file -C $SPELL_DICT_DIR --strip-components=5 Fcitx5.app/Contents/share/fcitx5/spell/en_dict.fscd
37+
tar xf cache/$file -C $SPELL_DICT_DIR --strip-components=5 Fcitx5.app/Contents/share/fcitx5/spell/en_dict.fscd
3838

3939
plugins=(
4040
chinese-addons
@@ -43,6 +43,6 @@ plugins=(
4343

4444
for plugin in "${plugins[@]}"; do
4545
file=$plugin-any.tar.bz2
46-
[[ -f cache/$file ]] || wget -P cache https://github.com/fcitx-contrib/fcitx5-plugins/releases/download/macos/$file
47-
tar xjvf cache/$file -C $EXTRACT_DIR
46+
[[ -f cache/$file ]] || wget -P cache https://github.com/fcitx-contrib/fcitx5-plugins/releases/download/macos-latest/$file
47+
tar xf cache/$file -C $EXTRACT_DIR
4848
done

0 commit comments

Comments
 (0)