update packages

groverlynn · Jan 7, 2024 · c899145 · c899145
1 parent 41d9743
commit c899145
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "librime"]
 	path = librime
 	url = https://github.com/groverlynn/librime.git
-	branch = choose
+	branch = extension
 	ignore = dirty
 [submodule "plum"]
 	path = plum

diff --git a/INSTALL.md b/INSTALL.md
@@ -61,7 +61,7 @@ Choose one of the following options.
 ``` sh
 export BUILD_UNIVERSAL=1
 
-export BOOST_ROOT="$(pwd)/librime/deps/boost_1_83_0"
+export BOOST_ROOT="$(pwd)/librime/deps/boost-1.84.0"
 
 export CMAKE_GENERATOR=Ninja
 
@@ -134,7 +134,7 @@ make ARCHS='x86_64' MACOSX_DEPLOYMENT_TARGET='10.15'
 Just add `package` after `make`
 
 ```
-make package ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='10.14'
+make package ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='10.15'
 ```
 
 Define or echo `DEV_ID` to automatically handle code signing and [notarization](https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution) (Apple Developer ID needed)

diff --git a/Sparkle b/Sparkle
diff --git a/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj
@@ -622,7 +622,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.16.2u;
+				CURRENT_PROJECT_VERSION = 0.16.2e;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -672,7 +672,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.16.2u;
+				CURRENT_PROJECT_VERSION = 0.16.2e;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/action-install.sh b/action-install.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-rime_version=1.9.0-m
-rime_git_hash=275b399
+rime_version=1.9.0-e
+rime_git_hash=d50ff34
 
 rime_archive="rime-${rime_git_hash}-macOS.tar.bz2"
 rime_download_url="https://github.com/groverlynn/librime/releases/download/${rime_version}/${rime_archive}"

diff --git a/librime b/librime
+7 −4		.github/workflows/macos-build.yml
+6 −4		.github/workflows/windows-build.yml
+2 −1		.gitignore
+1 −1		CMakeLists.txt
+4 −5		README-mac.md
+1 −1		deps.mk
+1 −1		env.bat.template
+1 −1		env.vs2019.bat
+1 −1		env.vs2022.bat
+0 −249		include/msvc/stdint.h
+8 −6		install-boost.bat
+9 −8		install-boost.sh
+37 −8		src/rime/algo/encoder.cc
+3 −3		src/rime/algo/strings.cc
+1 −1		src/rime/algo/strings.h
+15 −1		src/rime/context.cc
+1 −0		src/rime/context.h
+0 −1		src/rime/deployer.cc
+25 −0		src/rime/dict/db_pool.h
+26 −0		src/rime/dict/db_pool_impl.h
+5 −8		src/rime/dict/reverse_lookup_dictionary.cc
+3 −5		src/rime/dict/reverse_lookup_dictionary.h
+1 −1		src/rime/dict/table.h
+9 −5		src/rime/engine.cc
+7 −6		src/rime/gear/ascii_composer.cc
+1 −3		src/rime/gear/editor.cc
+1 −1		src/rime/gear/key_binder.cc
+4 −3		src/rime/gear/key_binding_processor.h
+9 −2		src/rime/gear/key_binding_processor_impl.h
+6 −9		src/rime/gear/punctuator.cc
+1 −1		src/rime/gear/recognizer.cc
+1 −1		src/rime/gear/selector.cc
+3 −3		src/rime/gear/shape.cc
+19 −47		src/rime/gear/simplifier.cc
+1 −1		src/rime/gear/speller.cc
+14 −19		src/rime/gear/switch_translator.cc
+5 −8		src/rime/key_event.h
+1 −1		src/rime/setup.cc
+1 −1		src/rime/switcher.cc
+23 −0		src/rime_api.cc
+10 −0		src/rime_api.h
+5 −3		test/table_test.cc
+1 −1		tools/rime_api_console.cc