prepare f5m 0.2.8 !windows (#43)

Author: eagleoflqj

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 env:
-  MOZC_SHA: 88b1dcae03a0a16192586dca3da157dad64f0e2f
+  MOZC_SHA: ce1fb7fe48efb1d85f8e54eff1b05e9e692bf0d4
 
 jobs:
   lint:

.gitmodules

@@ -87,7 +87,7 @@
 	url = https://github.com/fcitx-contrib/m17n-cmake
 [submodule "marisa"]
 	path = marisa
-	url = https://github.com/rime/marisa-trie
+	url = https://github.com/s-yata/marisa-trie
 [submodule "opencc"]
 	path = opencc
 	url = https://github.com/BYVoid/OpenCC

glib

@@ -1,10 +1,10 @@
 diff --git a/meson.build b/meson.build
-index 6105f1523..cb8ac8dee 100644
+index acaf44759..b91c8c3d0 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -2303,47 +2303,10 @@ endif
  # proxy-libintl subproject.
- # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
+ # FIXME: glib-gettext.m4 has much more checks to detect broken/incompatible
  # implementations. This could be extended if issues are found in some platforms.
 -libintl_deps = []
 -libintl_prefix = '#include <libintl.h>'

libmozc

@@ -1,11 +1,11 @@
 diff --git a/src/base/thread.h b/src/base/thread.h
-index 576192e..c2fb739 100644
+index db12511..2b35406 100644
 --- a/src/base/thread.h
 +++ b/src/base/thread.h
 @@ -59,7 +59,14 @@ class Thread {
 
    template <class Function, class... Args>
-   explicit Thread(Function &&f, Args &&...args)
+   explicit Thread(Function&& f, Args&&... args)
 -      : thread_(std::forward<Function>(f), std::forward<Args>(args)...) {}
 +#ifndef __EMSCRIPTEN__
 +      : thread_(std::forward<Function>(f), std::forward<Args>(args)...)