add librime-predict; upgrade librime

fcitx5-android · Feb 27, 2024 · f9bfd4b · f9bfd4b
1 parent 5106ba7
commit f9bfd4b
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -57,3 +57,6 @@
 [submodule "libime-jyutping"]
 	path = libime-jyutping
 	url = https://github.com/fcitx/libime-jyutping
+[submodule "librime-predict"]
+	path = librime-predict
+	url = https://github.com/rime/librime-predict
diff --git a/glog b/glog
diff --git a/librime b/librime
diff --git a/librime-lua b/librime-lua
diff --git a/librime-octagram b/librime-octagram
diff --git a/librime-predict b/librime-predict
diff --git a/patches/librime-predict.patch b/patches/librime-predict.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07703bf..5ab6d3b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.10)
+ aux_source_directory(src predict_src)
+
+ add_library(rime-predict-objs OBJECT ${predict_src})
++target_compile_options(rime-predict-objs PRIVATE "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
+ if(BUILD_SHARED_LIBS)
+   set_target_properties(rime-predict-objs
+     PROPERTIES
+@@ -15,4 +16,4 @@ set(plugin_objs $<TARGET_OBJECTS:rime-predict-objs> PARENT_SCOPE)
+ set(plugin_deps ${rime_library} PARENT_SCOPE)
+ set(plugin_modules "predict" PARENT_SCOPE)
+
+-add_subdirectory(tools)
++# add_subdirectory(tools)
diff --git a/src/Rules/GLog.hs b/src/Rules/GLog.hs
@@ -21,6 +21,6 @@ glogRule = do
       (cmakeBuilder "glog")
         { cmakeFlags = const ["-DBUILD_SHARED_LIBS=OFF", "-DWITH_GFLAGS=OFF", "-DWITH_UNWIND=OFF", "-DBUILD_TESTING=OFF"],
           -- remove absolute path by __FILE__ macro
-          preBuild = BuildAction $ \_ src -> cmd_ (Cwd src) Shell "sed -i '618s|\\(^add_library (glog.*\\)|target_compile_options\\(glogbase PRIVATE \"-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.\"\\)\\n\\1|' CMakeLists.txt"
+          preBuild = BuildAction $ \_ src -> cmd_ (Cwd src) Shell "sed -i '405s|\\(^add_library (glog.*\\)|target_compile_options\\(glog_internal PRIVATE \"-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.\"\\)\\n\\1|' CMakeLists.txt"
         }
   "glog" ~> buildWithAndroidEnv buildGlog GLog
diff --git a/src/Rules/LibRime.hs b/src/Rules/LibRime.hs
@@ -25,17 +25,23 @@ librimeRule = do
             -- canocialize for symlink
             librimeLuaSrc <- liftIO $ canonicalizePath "librime-lua"
             librimeOctagramSrc <- liftIO $ canonicalizePath "librime-octagram"
+            librimePredictSrc <- liftIO $ canonicalizePath "librime-predict"
             liftIO $ do
               removePathForcibly (src </> "plugins" </> "lua")
               createDirectoryLink librimeLuaSrc (src </> "plugins" </> "lua")
               removePathForcibly (src </> "plugins" </> "octagram")
               createDirectoryLink librimeOctagramSrc (src </> "plugins" </> "octagram")
+              removePathForcibly (src </> "plugins" </> "predict")
+              createDirectoryLink librimePredictSrc (src </> "plugins" </> "predict")
             -- find lua with find_package; remove absolute path by __FILE__ macro
             cmd_ (Cwd librimeLuaSrc) "git checkout ."
             cmd_ (Cwd librimeLuaSrc) "git apply ../patches/librime-lua.patch"
             -- disable tools; remove absolute path by __FILE__ macro
             cmd_ (Cwd librimeOctagramSrc) "git checkout ."
             cmd_ (Cwd librimeOctagramSrc) "git apply ../patches/librime-octagram.patch"
+            -- disable tools; remove absolute path by __FILE__ macro
+            cmd_ (Cwd librimePredictSrc) "git checkout ."
+            cmd_ (Cwd librimePredictSrc) "git apply ../patches/librime-predict.patch"
             -- remove absolute path by __FILE__ macro
             cmd_ (Cwd src) "git checkout ."
             cmd_ (Cwd src) "git apply ../patches/librime.patch",
+6 −2		.bazelci/presubmit.yml
+3 −3		.clang-format
+1 −1		.clang-tidy
+10 −0		.github/dependabot.yml
+31 −13		.github/workflows/android.yml
+26 −0		.github/workflows/cifuzz.yml
+57 −0		.github/workflows/emscripten.yml
+22 −30		.github/workflows/linux.yml
+22 −29		.github/workflows/macos.yml
+47 −36		.github/workflows/windows.yml
+1 −0		AUTHORS
+485 −512		CMakeLists.txt
+2 −0		CONTRIBUTORS
+1 −38		COPYING
+5 −0		ChangeLog
+6 −0		MODULE.bazel
+319 −187		README.rst
+7 −0		WORKSPACE
+125 −117		bazel/glog.bzl
+1 −1		cmake/GetCacheVariables.cmake
+12 −8		cmake/RunCleanerTest1.cmake
+12 −8		cmake/RunCleanerTest2.cmake
+12 −8		cmake/RunCleanerTest3.cmake
+4 −14		cmake/TestPackageConfig.cmake
+11 −0		codecov.yml
+8 −0		gcovr.cfg
+2 −0		glog-config.cmake.in
+55 −53		src/base/commandlineflags.h
+10 −12		src/base/googleinit.h
+0 −333		src/base/mutex.h
+14 −14		src/cleanup_immediately_unittest.cc
+14 −14		src/cleanup_with_absolute_prefix_unittest.cc
+14 −14		src/cleanup_with_relative_prefix_unittest.cc
+39 −128		src/config.h.cmake.in
+7 −0		src/dcheck_unittest/CMakeLists.txt
+53 −0		src/dcheck_unittest/glog_dcheck.cc
+342 −343		src/demangle.cc
+17 −8		src/demangle.h
+26 −28		src/demangle_unittest.cc
+7 −0		src/demangle_unittest.txt
+158 −0		src/flags.cc
+32 −0		src/fuzz_demangle.cc
+191 −0		src/glog/flags.h
+42 −14		src/glog/log_severity.h
+1,744 −0		src/glog/logging.h
+0 −2,002		src/glog/logging.h.in
+15 −11		src/glog/platform.h
+75 −78		src/glog/raw_logging.h
+44 −96		src/glog/stl_logging.h
+81 −0		src/glog/types.h
+38 −20		src/glog/vlog_is_on.h
+220 −274		src/googletest.h
+16 −0		src/includes_unittest/CMakeLists.txt
+39 −0		src/includes_unittest/glog_includes_logging.cc
+39 −0		src/includes_unittest/glog_includes_raw_logging.cc
+4 −5		src/includes_unittest/glog_includes_stl_logging.cc
+4 −5		src/includes_unittest/glog_includes_vlog_is_on.cc
+10 −0		src/log_severity_unittest/CMakeLists.txt
+40 −0		src/log_severity_unittest/glog_log_severity_constants.cc
+42 −0		src/log_severity_unittest/glog_log_severity_conversion.cc
+1,132 −988		src/logging.cc
+0 −1,384		src/logging_custom_prefix_unittest.cc
+0 −308		src/logging_custom_prefix_unittest.err
+11 −10		src/logging_striplog_test.sh
+477 −366		src/logging_unittest.cc
+17 −19		src/mock-log.h
+11 −16		src/mock-log_unittest.cc
+2 −5		src/package_config_unittest/working_config/glog_package_config.cc
+85 −53		src/raw_logging.cc
+106 −113		src/signalhandler.cc
+33 −37		src/signalhandler_unittest.cc
+38 −0		src/stacktrace.cc
+45 −9		src/stacktrace.h
+8 −4		src/stacktrace_generic-inl.h
+9 −7		src/stacktrace_libunwind-inl.h
+28 −22		src/stacktrace_powerpc-inl.h
+73 −61		src/stacktrace_unittest.cc
+20 −20		src/stacktrace_unwind-inl.h
+9 −6		src/stacktrace_windows-inl.h
+44 −31		src/stacktrace_x86-inl.h
+8 −101		src/stl_logging_unittest.cc
+23 −9		src/striplog_unittest.cc
+283 −270		src/symbolize.cc
+102 −55		src/symbolize.h
+159 −121		src/symbolize_unittest.cc
+138 −211		src/utilities.cc
+175 −109		src/utilities.h
+6 −12		src/utilities_unittest.cc
+46 −61		src/vlog_is_on.cc
+625 −744		src/windows/dirent.h
+17 −26		src/windows/port.cc
+63 −102		src/windows/port.h
+81 −0		sample/lua/script_translator.lua
+84 −0		sample/lua/table_translator.lua
+6 −0		sample/luna_pinyin.custom.yaml
+4 −0		src/lib/lua.cc
+2 −0		src/lib/lua.h
+4 −0		src/lua_gears.cc
+2 −0		src/lua_gears.h
+31 −2		src/modules.cc
+118 −42		src/opencc.cc
+178 −0		src/script_translator.cc
+223 −0		src/table_translator.cc
+69 −0		src/translator.h
+134 −48		src/types.cc
+29 −7		src/types_ext.cc
+5 −5		src/gram_db.cc
+2 −2		src/gram_db.h
+1 −1		src/octagram.cc
+4 −4		tools/build_grammar.cc