diff --git a/metadata/org.fcitx.fcitx5.android.plugin.anthy.yml b/metadata/org.fcitx.fcitx5.android.plugin.anthy.yml index 62de2cbfd2..9e2113339a 100644 --- a/metadata/org.fcitx.fcitx5.android.plugin.anthy.yml +++ b/metadata/org.fcitx.fcitx5.android.plugin.anthy.yml @@ -500,7 +500,6 @@ Builds: - pushd $$fcitx5-android-prebuilder$$ - cabal configure --disable-library-vanilla --enable-shared --enable-executable-dynamic --ghc-options=-dynamic - - popd - ABI=x86 ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23 ./build-cabal -j fmt libevent libintl-lite anthy-dict - popd diff --git a/metadata/org.fcitx.fcitx5.android.plugin.chewing.yml b/metadata/org.fcitx.fcitx5.android.plugin.chewing.yml index 7d9893e3e5..439ac7fe3d 100644 --- a/metadata/org.fcitx.fcitx5.android.plugin.chewing.yml +++ b/metadata/org.fcitx.fcitx5.android.plugin.chewing.yml @@ -21,7 +21,7 @@ Builds: sudo: - apt-get update - apt-get install -y g++ make cmake xz-utils extra-cmake-modules gettext pkg-config - cabal-install ghc libghc-shake-dev libghc-js-flot-data haskell-js-dgtable-utils + texinfo cabal-install ghc libghc-shake-dev libghc-js-flot-data haskell-js-dgtable-utils automake libghc-aeson-pretty-dev libtool openjdk-17-jdk-headless - update-java-alternatives -a gradle: @@ -66,7 +66,7 @@ Builds: sudo: - apt-get update - apt-get install -y g++ make cmake xz-utils extra-cmake-modules gettext pkg-config - cabal-install ghc libghc-shake-dev libghc-js-flot-data haskell-js-dgtable-utils + texinfo cabal-install ghc libghc-shake-dev libghc-js-flot-data haskell-js-dgtable-utils automake libghc-aeson-pretty-dev libtool openjdk-17-jdk-headless - update-java-alternatives -a gradle: @@ -111,7 +111,7 @@ Builds: sudo: - apt-get update - apt-get install -y g++ make cmake xz-utils extra-cmake-modules gettext pkg-config - cabal-install ghc libghc-shake-dev libghc-js-flot-data haskell-js-dgtable-utils + texinfo cabal-install ghc libghc-shake-dev libghc-js-flot-data haskell-js-dgtable-utils automake libghc-aeson-pretty-dev libtool openjdk-17-jdk-headless - update-java-alternatives -a gradle: @@ -140,7 +140,6 @@ Builds: - pushd $$fcitx5-android-prebuilder$$ - cabal configure --disable-library-vanilla --enable-shared --enable-executable-dynamic --ghc-options=-dynamic - - popd - ABI=x86 ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23 ./build-cabal -j fmt libevent libintl-lite libchewing - popd @@ -157,7 +156,7 @@ Builds: sudo: - apt-get update - apt-get install -y g++ make cmake xz-utils extra-cmake-modules gettext pkg-config - cabal-install ghc libghc-shake-dev libghc-js-flot-data haskell-js-dgtable-utils + texinfo cabal-install ghc libghc-shake-dev libghc-js-flot-data haskell-js-dgtable-utils automake libghc-aeson-pretty-dev libtool openjdk-17-jdk-headless - update-java-alternatives -a gradle: diff --git a/metadata/org.fcitx.fcitx5.android.plugin.hangul.yml b/metadata/org.fcitx.fcitx5.android.plugin.hangul.yml index 81e1d02401..e390d8d9fb 100644 --- a/metadata/org.fcitx.fcitx5.android.plugin.hangul.yml +++ b/metadata/org.fcitx.fcitx5.android.plugin.hangul.yml @@ -140,7 +140,6 @@ Builds: - pushd $$fcitx5-android-prebuilder$$ - cabal configure --disable-library-vanilla --enable-shared --enable-executable-dynamic --ghc-options=-dynamic - - popd - ABI=x86 ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23 ./build-cabal -j fmt libevent libintl-lite libhangul - popd diff --git a/metadata/org.fcitx.fcitx5.android.plugin.jyutping.yml b/metadata/org.fcitx.fcitx5.android.plugin.jyutping.yml index 8c6353e81c..a0f3da1319 100644 --- a/metadata/org.fcitx.fcitx5.android.plugin.jyutping.yml +++ b/metadata/org.fcitx.fcitx5.android.plugin.jyutping.yml @@ -148,9 +148,9 @@ Builds: - pushd $$fcitx5-android-prebuilder$$ - cabal configure --disable-library-vanilla --enable-shared --enable-executable-dynamic --ghc-options=-dynamic - - popd ./build-cabal -j fmt libevent libintl-lite boost marisa opencc libime - lua chinese-addons-data zstd libime-jyutping ./build-cabal -j fmt libevent - libintl-lite libjyutping + - ABI=x86 ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23 + ./build-cabal -j fmt libevent libintl-lite boost marisa opencc libime lua + chinese-addons-data zstd libime-jyutping - popd - mv $$fcitx5-android-prebuilder$$/build ../../lib/fcitx5/src/main/cpp/prebuilt ndk: 25.2.9519653 diff --git a/metadata/org.fcitx.fcitx5.android.plugin.rime.yml b/metadata/org.fcitx.fcitx5.android.plugin.rime.yml index b937aa4231..0fffc26548 100644 --- a/metadata/org.fcitx.fcitx5.android.plugin.rime.yml +++ b/metadata/org.fcitx.fcitx5.android.plugin.rime.yml @@ -149,7 +149,6 @@ Builds: - pushd /__w/prebuilder/prebuilder/ - cabal configure --disable-library-vanilla --enable-shared --enable-executable-dynamic --ghc-options=-dynamic - - popd - ABI=x86 ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23 ./build-cabal -j fmt libevent libintl-lite librime - popd diff --git a/metadata/org.fcitx.fcitx5.android.plugin.sayura.yml b/metadata/org.fcitx.fcitx5.android.plugin.sayura.yml index 5d7ed734af..6831c7335a 100644 --- a/metadata/org.fcitx.fcitx5.android.plugin.sayura.yml +++ b/metadata/org.fcitx.fcitx5.android.plugin.sayura.yml @@ -140,7 +140,6 @@ Builds: - pushd $$fcitx5-android-prebuilder$$ - cabal configure --disable-library-vanilla --enable-shared --enable-executable-dynamic --ghc-options=-dynamic - - popd - ABI=x86 ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23 ./build-cabal -j fmt libevent libintl-lite - popd diff --git a/metadata/org.fcitx.fcitx5.android.plugin.unikey.yml b/metadata/org.fcitx.fcitx5.android.plugin.unikey.yml index cc69fc1466..6b697eb709 100644 --- a/metadata/org.fcitx.fcitx5.android.plugin.unikey.yml +++ b/metadata/org.fcitx.fcitx5.android.plugin.unikey.yml @@ -140,7 +140,6 @@ Builds: - pushd $$fcitx5-android-prebuilder$$ - cabal configure --disable-library-vanilla --enable-shared --enable-executable-dynamic --ghc-options=-dynamic - - popd - ABI=x86 ANDROID_NDK_ROOT=$$NDK$$ CMAKE_VERSION=3.22.1 ANDROID_PLATFORM=23 ./build-cabal -j fmt libevent libintl-lite - popd