[arch-commits] Commit in fcitx5-mozc/trunk (PKGBUILD)
Jiachen Yang
farseerfc at gemini.archlinux.org
Thu Feb 3 01:32:36 UTC 2022
Date: Thursday, February 3, 2022 @ 01:32:36
Author: farseerfc
Revision: 1123831
upgpkg: fcitx5-mozc 2.26.4632.102.g4d2e3bd-1: fcitx5-mozc update to bazel build
Modified:
fcitx5-mozc/trunk/PKGBUILD
----------+
PKGBUILD | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-03 01:31:52 UTC (rev 1123830)
+++ PKGBUILD 2022-02-03 01:32:36 UTC (rev 1123831)
@@ -5,30 +5,30 @@
## Mozc compile option
_bldtype=Release
-_mozc_commit=ca82d39
+_mozc_commit=4d2e3bd
## follow the submodule commits in https://github.com/fcitx/mozc/tree/fcitx/src/third_party
-_abseil_cpp_commit=0f3bb46
+_abseil_cpp_commit=2151058
_breakpad_commit=216cea7
_gtest_commit=703bd9c
_gyp_commit=caa6002
_japanese_usage_dictionary_commit=e5b3425
_jsoncpp_commit=11086dd
-_protobuf_commit=fde7cf7
+_protobuf_commit=cc7b1b5
## the latest release from https://osdn.net/projects/ponsfoot-aur/storage/mozc/
-_zipcode_rel=202104
+_zipcode_rel=202110
_pkgbase=mozc
pkgname=fcitx5-mozc
pkgdesc="Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
-pkgver=2.26.4360.102.gca82d39
+pkgver=2.26.4632.102.g4d2e3bd
pkgrel=1
arch=('x86_64')
url="https://github.com/google/mozc"
license=('custom')
depends=('qt5-base' 'fcitx5')
-makedepends=('pkg-config' 'python' 'curl' 'gtk2' 'mesa' 'subversion' 'ninja' 'git' 'clang' 'python-six')
+makedepends=('pkg-config' 'python' 'curl' 'gtk2' 'mesa' 'subversion' 'bazel' 'git' 'clang' 'python-six')
replaces=('mozc-fcitx')
conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx' 'fcitx-mozc')
source=(git+https://github.com/fcitx/mozc.git#commit=${_mozc_commit}
@@ -43,8 +43,8 @@
git+https://github.com/abseil/abseil-cpp.git#commit=${_abseil_cpp_commit}
)
sha512sums=('SKIP'
- 'cadb43138597371d13d21a2766ba38f0940a73bd961a1142f3713f700d1b8e75bdb6ccc0600ea57518ad5bf1931eed329cd11faeb87b191aa460e379ed1fed93'
- 'b473bda282e12c448ec10522306035b10b566d7ebfb051602e287a7890405db9189ce60189ed47cc130d15a196cd8c7440c6cbb2aaacc7e8cd62b90e50bcb1d9'
+ '606f45d48a9dad0e80a566cab0001910de3c6b2f634ec52c6ef6f44745b55ae8e181b3e3cdf90525a08be1f180eb35900672c90c6ab4f43679a178e863378bbc'
+ 'dec6479b42ddc1355cd882d17824cd874d8f103ad7767bac3f490f04551059d65b2806fa9e3f39a50ced2ecfdd37b75c9ed4536d9ad3bcef9e8c5ae1ec10e302'
'SKIP'
'SKIP'
'SKIP'
@@ -58,7 +58,7 @@
cd mozc
# change pkgver is OK because we fixed commit
# parse major.minor.buildid from version template, revision is fixed to 102 for Linux
- _bzr_ver=$(sed 's/ //g;$ a echo $MAJOR.$MINOR.$BUILD.102' src/data/version/mozc_version_template.bzl | source /dev/stdin)
+ _bzr_ver=$(sed 's/ //g;$ a echo $MAJOR.$MINOR.$BUILD_OSS.102' src/data/version/mozc_version_template.bzl | source /dev/stdin)
printf "%s.g%s" "${_bzr_ver}" "${_mozc_commit}"
}
@@ -83,8 +83,11 @@
# disable fcitx4 target
rm unix/fcitx/fcitx.gyp
- ## use libstdc++ instead of libc++
- sed "/stdlib=libc++/d;/-lc++/d" -i gyp/common.gypi
+ # disable android-ndk requirement, even if we don't need it bazel will complain
+ sed "/android_ndk_repository/d" -i WORKSPACE.bazel
+
+ # adjust QT_BASE_PATH
+ sed 's|path = QT_BASE_PATH|path = "/usr/include/qt"|' -i WORKSPACE.bazel
}
build() {
@@ -94,11 +97,8 @@
cd mozc/src
- _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx5/fcitx5.gyp:fcitx5-mozc"
+ QT_BASE_PATH=/usr/include/qt ../scripts/build_fcitx5_bazel
- QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname use_libzinnia=1" python build_mozc.py gyp
- python build_mozc.py build -c $_bldtype $_targets
-
# Extract license part of mozc
head -n 29 server/mozc_server.cc > LICENSE
}
@@ -107,7 +107,7 @@
cd mozc/src
export PREFIX="${pkgdir}/usr"
export _bldtype
- ../scripts/install_server
+ ../scripts/install_server_bazel
install -d "${pkgdir}/usr/share/licenses/$pkgname/"
install -m 644 LICENSE data/installer/*.html "${pkgdir}/usr/share/licenses/${pkgname}/"
@@ -115,5 +115,5 @@
install -d "${PREFIX}/share/fcitx5/addon"
install -d "${PREFIX}/share/fcitx5/inputmethod"
install -d "${PREFIX}/lib/fcitx5"
- ../scripts/install_fcitx5
+ ../scripts/install_fcitx5_bazel
}
More information about the arch-commits
mailing list