From 11282ce02b6d96f32dbc1b3cb43d34c0e2d7d508 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Thu, 20 Jul 2023 21:04:39 -0400 Subject: [PATCH] disable thread for leveldb --- checksum | 2 +- leveldb_patch | 12 ++++++++++++ package.json | 2 +- schemas.json | 8 ++++---- scripts/build_lib.sh | 5 +++++ 5 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 leveldb_patch diff --git a/checksum b/checksum index 2c6e641..84bbe32 100644 --- a/checksum +++ b/checksum @@ -1,3 +1,3 @@ 1af97e7578a6b23af1aff33269acf462 public/rime.data c5623abdffe84cb43c4cfb105df1208b public/rime.js -3f6111f120b2f5207f2f33c83d2dade7 public/rime.wasm +3e81ab6c5bca5747ef648fc1e37be41b public/rime.wasm diff --git a/leveldb_patch b/leveldb_patch new file mode 100644 index 0000000..8084e5e --- /dev/null +++ b/leveldb_patch @@ -0,0 +1,12 @@ +diff --git a/util/env_posix.cc b/util/env_posix.cc +index d84cd1e..773c8cd 100644 +--- a/util/env_posix.cc ++++ b/util/env_posix.cc +@@ -781,6 +781,7 @@ PosixEnv::PosixEnv() + void PosixEnv::Schedule( + void (*background_work_function)(void* background_work_arg), + void* background_work_arg) { ++ return background_work_function(background_work_arg); + background_work_mutex_.Lock(); + + // Start the background thread, if we haven't done so already. diff --git a/package.json b/package.json index 5b11f5c..b6cd857 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@libreservice/micro-plum": "^0.1.5", "@libreservice/my-widget": "^0.1.4", "@libreservice/my-worker": "^0.4.2", - "@libreservice/wasm-code": "^0.1.1", + "@libreservice/wasm-code": "^0.1.2", "@playwright/test": "^1.36.1", "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.1.0", diff --git a/schemas.json b/schemas.json index c09fd8b..9e98070 100644 --- a/schemas.json +++ b/schemas.json @@ -128,14 +128,14 @@ { "id": "ipa_xsampa", "name": "X-SAMPA", - "group": "其他", + "group": "音标", "target": "ipa", "license": "LGPL-3.0-only" }, { "id": "ipa_yunlong", "name": "云龙国际音标", - "group": "其他", + "group": "音标", "target": "ipa", "license": "LGPL-3.0-only" }, @@ -170,7 +170,7 @@ { "id": "combo_pinyin", "name": "宫保拼音·七指禅", - "group": "音码", + "group": "并击", "target": "combo-pinyin", "dependencies": ["luna_pinyin"], "family": [ @@ -192,7 +192,7 @@ { "id": "zyenpheng", "name": "中古全拼", - "group": "方言", + "group": "古音", "target": "middle-chinese", "dependencies": ["luna_pinyin"], "family": [ diff --git a/scripts/build_lib.sh b/scripts/build_lib.sh index 6bbd5dd..fdd4954 100644 --- a/scripts/build_lib.sh +++ b/scripts/build_lib.sh @@ -49,6 +49,11 @@ emcmake cmake librime/deps/yaml-cpp -B $yaml_cpp_blddir -G Ninja \ cmake --build $yaml_cpp_blddir DESTDIR=$root/build/sysroot cmake --install $yaml_cpp_blddir +pushd librime/deps/leveldb +if [[ -z `git status --porcelain` ]]; then + git apply $root/leveldb_patch +fi +popd leveldb_blddir=build/leveldb rm -rf $leveldb_blddir emcmake cmake librime/deps/leveldb -B build/leveldb -G Ninja \