update packages

Author: groverlynn

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "librime"]
 	path = librime
-	url = https://github.com/rime/librime.git
+	url = https://github.com/groverlynn/librime.git
+	branch = choose
 	ignore = dirty
 [submodule "plum"]
 	path = plum

INSTALL.md

@@ -61,9 +61,11 @@ Choose one of the following options.
 ``` sh
 export BUILD_UNIVERSAL=1
 
-make -C librime xcode/deps/boost
+export BOOST_ROOT="$(pwd)/librime/deps/boost_1_83_0"
 
-export BOOST_ROOT="$(pwd)/librime/deps/boost_1_78_0"
+export CMAKE_GENERATOR=Ninja
+
+bash librime/install-boost.sh
 ```
 
 Let's set `BUILD_UNIVERSAL` to tell `make` that we are building Boost as
@@ -96,8 +98,14 @@ port install boost -no_static
 
 * Make sure you have updated all the dependencies. If you cloned squirrel with the command in this guide, you've already done it. But if not, this command will update submodules.
 
-```
+``` sh
 git submodule update --init --recursive
+
+export BUILD_UNIVERSAL=1
+export CMAKE_GENERATOR=Ninja
+
+make -C librime
+make deps
 ```
 
 * With all dependencies ready, build `Squirrel.app`:
@@ -109,11 +117,14 @@ make
 To build only for the native architecture, and/or specify the lowest supported macOS version, pass variable `ARCHS`/`MACOSX_DEPLOYMENT_TARGET` to `make`:
 
 ``` sh
-# for Universal macOS App, targetting Ventura
-make ARCHS='arm64 x86_64' MACOSX_DEPLOYMENT_TARGET='13.0'
+# for Universal macOS App
+make ARCHS='arm64 x86_64' MACOSX_DEPLOYMENT_TARGET='10.15'
+
+# for Mac computers with Apple Silicon
+make ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='10.15'
 
-# for ARM macOS App, targetting Ventura
-make ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0'
+# for Intel-based Mac
+make ARCHS='x86_64' MACOSX_DEPLOYMENT_TARGET='10.15'
 ```
 
 ## Install it on your Mac
@@ -123,7 +134,7 @@ make ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0'
 Just add `package` after `make`
 
 ```
-make package ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0'
+make package ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='10.14'
 ```
 
 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)

Makefile

@@ -3,8 +3,8 @@
 all: release
 install: install-release
 
-# Change to `xcode/dist-with-icu` if boost is linked to icu libraries.
-RIME_DIST_TARGET = xcode/dist
+# Change to `dist-with-icu` if boost is linked to icu libraries.
+RIME_DIST_TARGET = install
 
 RIME_BIN_DIR = librime/dist/bin
 RIME_LIB_DIR = librime/dist/lib
@@ -39,7 +39,7 @@ $(RIME_LIBRARY):
 	$(MAKE) librime
 
 $(RIME_DEPS):
-	$(MAKE) -C librime xcode/deps
+	$(MAKE) -C librime deps
 
 librime: $(RIME_DEPS)
 	$(MAKE) -C librime $(RIME_DIST_TARGET)
@@ -67,7 +67,7 @@ plum-data:
 	$(MAKE) copy-plum-data
 
 opencc-data:
-	$(MAKE) -C librime xcode/deps/opencc
+	$(MAKE) -C librime deps/opencc
 	$(MAKE) copy-opencc-data
 
 copy-plum-data:
@@ -88,9 +88,9 @@ _=$() $()
 export CMAKE_OSX_ARCHITECTURES = $(subst $(_),;,$(ARCHS))
 endif
 
-ifdef MACOSX_DEPLOYMENT_TARGET
+# https://cmake.org/cmake/help/latest/envvar/MACOSX_DEPLOYMENT_TARGET.html
+MACOSX_DEPLOYMENT_TARGET ?= 10.15
 BUILD_SETTINGS += MACOSX_DEPLOYMENT_TARGET="$(MACOSX_DEPLOYMENT_TARGET)"
-endif
 
 release: $(DEPS_CHECK)
 	bash package/add_data_files
@@ -170,5 +170,5 @@ clean:
 
 clean-deps:
 	$(MAKE) -C plum clean
-	$(MAKE) -C librime xcode/clean
+	$(MAKE) -C librime clean
 	$(MAKE) clean-sparkle

README.md

@@ -28,7 +28,7 @@
 安裝輸入法
 ---
 
-本品適用於 macOS 12.0+
+本品適用於 macOS 10.15+
 
 初次安裝，如果在部份應用程序中打不出字，請註銷並重新登錄。
 

Sparkle

@@ -2,14 +2,14 @@
 
 set -e
 
-rime_version=1.8.5
-rime_git_hash=08dd95f
+rime_version=1.9.0-m
+rime_git_hash=960dd0e
 
 rime_archive="rime-${rime_git_hash}-macOS.tar.bz2"
-rime_download_url="https://github.com/rime/librime/releases/download/${rime_version}/${rime_archive}"
+rime_download_url="https://github.com/groverlynn/librime/releases/download/${rime_version}/${rime_archive}"
 
 rime_deps_archive="rime-deps-${rime_git_hash}-macOS.tar.bz2"
-rime_deps_download_url="https://github.com/rime/librime/releases/download/${rime_version}/${rime_deps_archive}"
+rime_deps_download_url="https://github.com/groverlynn/librime/releases/download/${rime_version}/${rime_deps_archive}"
 
 mkdir -p download && (
     cd download