Update libraries (fcitx5-android#34)

rocka · berberman · mokapsing · commit 017b2f6d48c1 · 2025-04-15T01:17:56.000Z
ndk 28.0.13004108
cmake 3.31.6

fcitx5 &amp; libime to master
boost 1.87.0
fmt 11.1.4
libiconv 1.18
libuv 1.50.0
librime 1.13.1
zstd 1.5.7
ndk 28.0.13004108
cmake 3.31.6

build fcitx5 for host libime

---------

Co-authored-by: Potato Hatsue &lt;1793913507@qq.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,16 +11,23 @@ jobs:
     container: archlinux:base-devel
     env:
       ABI: "armeabi-v7a,arm64-v8a,x86,x86_64"
-      NDK_VERSION: "25.2.9519653"
-      CMAKE_VERSION: "3.22.1"
+      NDK_VERSION: "28.0.13004108"
+      CMAKE_VERSION: "3.31.6"
       ANDROID_PLATFORM: "23"
 
     steps:
       - name: Install build dependencies
+        # android-actions/setup-android needs unzip
+        # sdkmanager needs jre
         run: |
           pacman -Syu --needed --noconfirm \
-            git unzip ghc cabal-install haskell-shake haskell-aeson-pretty \
-            cmake extra-cmake-modules ninja fmt fcitx5 boost python opencc jre-openjdk gperf
+            git unzip jre-openjdk \
+            ghc cabal-install haskell-shake haskell-aeson-pretty \
+            cmake extra-cmake-modules ninja \
+            boost \
+            python opencc \
+            gperf
+
       - name: Fetch source code
         uses: actions/checkout@v4
         with:
diff --git a/.gitmodules b/.gitmodules
@@ -53,7 +53,6 @@
 [submodule "libime"]
 	path = libime
 	url = https://github.com/fcitx/libime
-	fetchRecurseSubmodules = true
 [submodule "libime-jyutping"]
 	path = libime-jyutping
 	url = https://github.com/fcitx/libime-jyutping
@@ -65,4 +64,7 @@
 	url = https://github.com/tlwg/libthai
 [submodule "libiconv"]
 	path = libiconv
-	url = https://git.savannah.gnu.org/git/libiconv
+	url = https://github.com/fcitx5-android/libiconv
+[submodule "fcitx5"]
+	path = fcitx5
+	url = https://github.com/fcitx/fcitx5
diff --git a/Lua b/Lua
@@ -1 +1 @@
-Subproject commit 52674cd192943015b99f51225f8cf8a116aa7293
+Subproject commit 3ed55a56eaa05c9221f40b3c07d0e908eb1067b0
diff --git a/README.md b/README.md
@@ -6,13 +6,22 @@ Build static libraries for [fcitx5-android](https://github.com/fcitx5-android/fc
 
 Cabal is required to build this project.
 
-* NDK Vesion: `25.2.9519653`
-* CMake Version: `3.22.1`
+### Android related
+
 * Android Platform (API Level): `23`
-* `bash tar unzip curl git python ghc haskell-shake haskell-aeson-pretty cabal-install`
-* `fcitx5` (`fcitx5-modules` on Debian): for `comp-spell-dict`
-* `libime` (`libime-bin` on Debian) >= 1.0.5 : for various `libime_*` tools
+* Android NDK: `28.0.13004108`
+* CMake Version: `3.31.6`
+
+both can be installed with `sdkmanager` command line tool.
+
+### System dependencies
+
+* `tar curl git`
+* `ghc haskell-shake haskell-aeson-pretty cabal-install`: haskell stuff
+* `cmake extra-cmake-modules ninja`: cmake stuff
+* `python`: build dep of `opencc`
 * `opencc`: for `opencc_dict`
+* `gperf`: build dep of `libiconv`
 
 ## Libraries
 
diff --git a/build.cfg b/build.cfg
@@ -7,28 +7,29 @@ lm_sc = lm_sc.arpa-20241001.tar.zst
 lm_sc_sha256 = 54934e73966eb38ea4fe8eae9c61dfe486af37da1cb5316a06b19c7d289e3063
 
 # pinyin dict
-pinyin_dict = dict-20241001.tar.zst
-pinyin_dict_sha256 = d3313b88a68620a23bc8d5f9564cf1b678848dc7af541c4f5f02198e5a3686bf
+pinyin_dict = dict-20250327.tar.zst
+pinyin_dict_sha256 = 7ca6be4754c0d4c27ba7702c0dce651659bd2ca1faa5cbf2848d81a0053c8c13
 
 # table dict
 table = table-20240108.tar.gz
 table_sha256 = 729c596d86907de727c74d0fc3fd241c406c5debd2b4cb74eefe022387ee9dae
 
 # extra pinyin dict
-chinese_addon_repo = https://raw.githubusercontent.com/fcitx/fcitx5-chinese-addons/5.1.2/im/pinyin/
+chinese_addon_repo = https://raw.githubusercontent.com/fcitx/fcitx5-chinese-addons/5.0.0/im/pinyin/
 chaizi_sha256 = cd659605360120f7390fda1a278eea12c4df6d763a95c8099068ab09cfafd058
 
 # py stroke
-py_stroke = py_stroke-20121124.tar.gz
-py_stroke_sha256 = 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248
+py_stroke = py_stroke-20250329.tar.gz
+py_stroke_sha256 = c1a7ca7225d3614ab83353fc827503006a980447762018f53760425d7b5303a6
 
 # py table
 py_table = py_table-20121124.tar.gz
 py_table_sha256 = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
 
+## https://github.com/boostorg/boost/releases   boost-<boost_version>-cmake.tar.xz
 # boost
-boost_version = 1.86.0
-boost_sha256 = 2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57
+boost_version = 1.87.0
+boost_sha256 = 7da75f171837577a52bbf217e17f8ea576c7c246e4594d617bfde7fafd408be5
 
 # jyutping dict
 jyutping_dict = jyutping-dict-20180104.tar.xz
diff --git a/fcitx5 b/fcitx5
@@ -0,0 +1 @@
+Subproject commit 8af72c581e9315271006d254fda4f3eb83d1f9be
diff --git a/fmt b/fmt
@@ -1 +1 @@
-Subproject commit 0c9fce2ffefecfdce794e1859584e25877b7b592
+Subproject commit 123913715afeb8a437e6388b4473fcc4753e1c9a
diff --git a/libiconv b/libiconv
@@ -1 +1 @@
-Subproject commit 4b9c27bec873392533dd3ef309cd62962a644e18
+Subproject commit ed5a57cfedda75a6abbe4d0fb89a6f7b832f073e
diff --git a/libime-jyutping b/libime-jyutping
@@ -1 +1 @@
-Subproject commit 25231d82c658753209f7b675273f2918d6be4f82
+Subproject commit eeb43c90fa6ef38f4983b12344a6606cfcf7380d
diff --git a/libuv b/libuv
@@ -1 +1 @@
-Subproject commit e1095c7a4373ce00cd8874d8e820de5afb25776e
+Subproject commit 8fb9cb919489a48880680a56efecff6a7dfb4504
diff --git a/patches/libiconv/CMakeLists.txt b/patches/libiconv/CMakeLists.txt
@@ -1,15 +1,24 @@
 cmake_minimum_required(VERSION 3.22.1)
 project(libiconv)
 
+set(DLL_VARIABLE "")
+set(EILSEQ "")
+set(ICONV_CONST "")
+set(USE_MBSTATE_T "1")
+set(BROKEN_WCHAR_H "0")
+set(HAVE_WCHAR_T "1")
+configure_file("include/iconv.h.in" "iconv.h" @ONLY)
+configure_file("libcharset/include/localcharset.h.in" "localcharset.h" @ONLY)
+
 set(LIBICONV_HEADER
-    "include/iconv.h"
+    "${CMAKE_CURRENT_BINARY_DIR}/iconv.h"
 )
 set(LIBICONV_SOURCE
     lib/iconv.c
     libcharset/lib/localcharset.c
 )
 
 add_library(iconv STATIC ${LIBICONV_SOURCE})
-target_include_directories(iconv PRIVATE include libcharset/include)
+target_include_directories(iconv PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
 install(TARGETS iconv)
-install(FILES ${LIBICONV_HEADER} DESTINATION include)
+install(FILES ${LIBICONV_HEADER} DESTINATION "include")
diff --git a/patches/libiconv/libiconv.patch b/patches/libiconv/libiconv.patch
diff --git a/patches/librime-lua.patch b/patches/librime-lua.patch
@@ -11,11 +11,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 42f2ebb..4f068d0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -40,6 +40,7 @@ aux_source_directory(src RIME_LUA_SRC)
+@@ -40,6 +40,8 @@ aux_source_directory(src RIME_LUA_SRC)
  aux_source_directory(src/lib RIME_LUA_LIB_SRC)
  
  add_library(rime-lua-objs OBJECT ${RIME_LUA_SRC} ${RIME_LUA_LIB_SRC} ${LUA_SRC})
 +target_compile_options(rime-lua-objs PRIVATE "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
++target_compile_definitions(rime-lua-objs PRIVATE BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS)
  if(BUILD_SHARED_LIBS)
    set_target_properties(rime-lua-objs PROPERTIES POSITION_INDEPENDENT_CODE ON)
  endif()
diff --git a/patches/librime-octagram.patch b/patches/librime-octagram.patch
@@ -2,11 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 4115fa7..162ffb5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.10)
+@@ -4,6 +4,8 @@ cmake_minimum_required(VERSION 3.10)
  aux_source_directory(src octagram_src)
  
  add_library(rime-octagram-objs OBJECT ${octagram_src})
 +target_compile_options(rime-octagram-objs PRIVATE "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
++target_compile_definitions(rime-octagram-objs PRIVATE BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS)
  if(BUILD_SHARED_LIBS)
    set_target_properties(rime-octagram-objs
      PROPERTIES
diff --git a/patches/librime-predict.patch b/patches/librime-predict.patch
@@ -2,11 +2,12 @@ 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)
+@@ -4,6 +4,8 @@ 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}=.")
++target_compile_definitions(rime-predict-objs PRIVATE BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS)
  if(BUILD_SHARED_LIBS)
    set_target_properties(rime-predict-objs
      PROPERTIES
diff --git a/patches/librime.patch b/patches/librime.patch
@@ -16,7 +16,7 @@ index 16082869..c4a5b5ca 100644
    add_library(rime-static STATIC ${rime_src})
    target_link_libraries(rime-static ${rime_deps})
 +  target_compile_options(rime-static PRIVATE "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
-+  target_compile_definitions(rime-static PRIVATE BOOST_DISABLE_CURRENT_LOCATION)
++  target_compile_definitions(rime-static PRIVATE BOOST_DISABLE_CURRENT_LOCATION BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS)
    set_target_properties(rime-static PROPERTIES
      OUTPUT_NAME "rime" PREFIX "lib"
      ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
diff --git a/patches/libuv.patch b/patches/libuv.patch
@@ -18,10 +18,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 28c6df256..3ec932e54 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -277,6 +277,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+@@ -277,6 +277,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
         src/unix/random-getentropy.c
         src/unix/random-getrandom.c
         src/unix/random-sysctl-linux.c)
++  list(APPEND uv_defines LLONG_MAX=0x7fffffffffffffffLL)
 +  if(ANDROID_PLATFORM_LEVEL LESS 24)
 +    list(APPEND uv_sources
 +        src/unix/android-ifaddrs.c)
diff --git a/patches/lua.patch b/patches/lua.patch
@@ -0,0 +1,14 @@
+diff --git a/lua-5.4.7/src/liolib.c b/lua-5.4.7/src/liolib.c
+index c5075f3..1946943 100644
+--- a/lua-5.4.7/src/liolib.c
++++ b/lua-5.4.7/src/liolib.c
+@@ -115,7 +115,8 @@ static int l_checkmode (const char *mode) {
+ 
+ #if !defined(l_fseek)		/* { */
+ 
+-#if defined(LUA_USE_POSIX)	/* { */
++#if defined(LUA_USE_POSIX) && \
++   (!defined(ANDROID) || (defined(__LP64__) || ANDROID_PLATFORM >= 24))	/* { */
+ 
+ #include <sys/types.h>
+ 
diff --git a/prebuilder.cabal b/prebuilder.cabal
@@ -24,7 +24,7 @@ executable prebuilder
     CMakeBuilder
     Rules.AnthyData
     Rules.Boost
-    Rules.Fcitx5Data
+    Rules.Fcitx5
     Rules.Fmt
     Rules.GLog
     Rules.LevelDB
diff --git a/src/Base.hs b/src/Base.hs
@@ -173,8 +173,8 @@ execute :: String -> (CmdArguments args) => args :-> Action ()
 execute tool =
   cmdArguments
     ( CmdArgument
-        [ Right (outputDir </> "bin" </> tool),
-          Left (AddEnv "LD_LIBRARY_PATH" (outputDir </> "lib"))
+        [ Right (outputDir </> "host" </> "bin" </> tool),
+          Left (AddEnv "LD_LIBRARY_PATH" (outputDir </> "host"  </> "lib"))
         ]
     )
 
diff --git a/src/CMakeBuilder.hs b/src/CMakeBuilder.hs
@@ -69,7 +69,9 @@ data CmakeBuilder q = CmakeBuilder
     doInstall :: Bool,
     -- | path the cmake file
     -- if not specified, run cmake in source dir
-    cmakeFile :: Maybe FilePath
+    cmakeFile :: Maybe FilePath,
+    -- | Additional cmake environment variables
+    cmakeEnv :: BuildEnv -> [(String, String)]
   }
 
 cmakeBuilder :: String -> CmakeBuilder b
@@ -83,7 +85,8 @@ cmakeBuilder name =
       source = const $ pure name,
       name = name,
       doInstall = True,
-      cmakeFile = Nothing
+      cmakeFile = Nothing,
+      cmakeEnv = const mempty
     }
 
 useCMake ::
@@ -107,9 +110,11 @@ useCMake CmakeBuilder {..} = addOracle $ \(WithAndroidEnv q env) -> do
     forM_ abiList $ \a -> do
       let bEnv@BuildEnv {..} = buildEnv a
       unBuildActionABI preBuildEachABI q bEnv
+      let cmakeEnvOptions = [AddEnv k v | (k, v) <- cmakeEnv bEnv]
       cmd_
         (Cwd src)
-        (AddPath [] [ ninja ])
+        (AddPath [] [ninja])
+        cmakeEnvOptions
         cmake
         "-B"
         buildEnvBuildDir
@@ -124,7 +129,7 @@ useCMake CmakeBuilder {..} = addOracle $ \(WithAndroidEnv q env) -> do
             <> cmakeFlags bEnv
         )
         (maybeToList cmakeFile)
-      cmd_ (Cwd src) cmake "--build" buildEnvBuildDir
+      cmd_ (Cwd src) cmakeEnvOptions cmake "--build" buildEnvBuildDir
       when doInstall $
         cmd_ (Cwd src) cmake "--install" buildEnvBuildDir
       unBuildActionABI postBuildEachABI q bEnv
diff --git a/src/Main.hs b/src/Main.hs
@@ -15,7 +15,7 @@ import Data.Text.Lazy.Builder qualified as TLB
 import Development.Shake.Config
 import Rules.AnthyData
 import Rules.Boost
-import Rules.Fcitx5Data
+import Rules.Fcitx5
 import Rules.Fmt
 import Rules.GLog
 import Rules.LevelDB
@@ -49,6 +49,7 @@ main = do
       want files
       usingConfigFile "build.cfg"
       downloadFileRule
+      hostFcitx5Rule
       spellDictRule
       libIMERule
       chineseAddonsRule
diff --git a/src/Rules/Boost.hs b/src/Rules/Boost.hs
@@ -36,8 +36,10 @@ boostRule = do
                   <> intercalate
                     ";"
                     [ "atomic",
+                      "asio",
                       "charconv",
                       "chrono",
+                      "cobalt",
                       "context",
                       "contract",
                       "coroutine",
diff --git a/src/Rules/Fcitx5.hs b/src/Rules/Fcitx5.hs
diff --git a/src/Rules/Fcitx5Data.hs b/src/Rules/Fcitx5Data.hs
diff --git a/src/Rules/LibIME.hs b/src/Rules/LibIME.hs
diff --git a/src/Rules/LibIMEJyutping.hs b/src/Rules/LibIMEJyutping.hs
diff --git a/src/Rules/LibIconv.hs b/src/Rules/LibIconv.hs
diff --git a/src/Rules/Lua.hs b/src/Rules/Lua.hs
diff --git a/src/Rules/ZSTD.hs b/src/Rules/ZSTD.hs
diff --git a/zstd b/zstd
