updpkg

2 files changed, 56 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f74143cb7af..762248d56a92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = mozc-ut-full
-	pkgver = 2.28.4800.102.20220723
+	pkgver = 2.28.4960.102.20221022
 	pkgrel = 1
 	url = https://github.com/fcitx/mozc
 	arch = x86_64
@@ -18,17 +18,17 @@ pkgbase = mozc-ut-full
 	makedepends = qt5-base
 	makedepends = ibus
 	makedepends = gyp
-	source = git+https://github.com/fcitx/mozc.git#commit=0ee47ed
+	source = git+https://github.com/fcitx/mozc.git#commit=d4a26a6
 	source = https://osdn.net/projects/ponsfoot-aur/storage/mozc/x-ken-all-202110.zip
 	source = https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-202110.zip
-	source = git+https://github.com/abseil/abseil-cpp.git#commit=2151058
-	source = git+https://chromium.googlesource.com/breakpad/breakpad#commit=216cea7
-	source = git+https://github.com/google/googletest.git#commit=703bd9c
-	source = git+https://chromium.googlesource.com/external/gyp#commit=9ecf45e
-	source = git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git#commit=e5b3425
-	source = git+https://github.com/open-source-parsers/jsoncpp.git#commit=11086dd
-	source = git+https://github.com/google/protobuf.git#commit=cc7b1b5
-	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozcdic-ut-20220723.tar.bz2
+	source = git+https://github.com/abseil/abseil-cpp.git
+	source = git+https://chromium.googlesource.com/breakpad/breakpad
+	source = git+https://github.com/google/googletest.git
+	source = git+https://chromium.googlesource.com/external/gyp
+	source = git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git
+	source = git+https://github.com/open-source-parsers/jsoncpp.git
+	source = git+https://github.com/google/protobuf.git
+	source = https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozcdic-ut-20221022.tar.bz2
 	validpgpkeys = 2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9
 	sha512sums = SKIP
 	sha512sums = dec6479b42ddc1355cd882d17824cd874d8f103ad7767bac3f490f04551059d65b2806fa9e3f39a50ced2ecfdd37b75c9ed4536d9ad3bcef9e8c5ae1ec10e302
@@ -40,7 +40,7 @@ pkgbase = mozc-ut-full
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 6fa5a6c9f97d97216d7fb4711299d3322667252a2dd74db08257edafaa3affc6db837cd9daa2c81cd4235d1c8418a10c10b22a3a6ef32aff33e69d7ec21daa5e
+	sha512sums = 08f8fe1757fd69c94d6d46a7f6cdd2398a6d946cb69531131697f5a35fdb970742fb26aa4285a2025ab14a6fe2992f4f1ec299d20b899db98cad1c53be9a0ca3
 
 pkgname = mozc-ut-full-common
 	pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)
diff --git a/PKGBUILD b/PKGBUILD
index cb69faccaecb..7fe519b061a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,23 +6,16 @@
 
 ## Mozc compile option
 _bldtype='Release'
-_mozc_commit=0ee47ed
-_abseil_cpp_commit=2151058
-_breakpad_commit=216cea7
-_gtest_commit=703bd9c
-_gyp_commit=9ecf45e
-_japanese_usage_dictionary_commit=e5b3425
-_jsoncpp_commit=11086dd
-_protobuf_commit=cc7b1b5
+_mozc_commit=d4a26a6
 _zipcode_rel=202110
 
 # Ut Dictionary
-_utdicdate=20220723
+_utdicdate=20221022
 
 _pkgbase=mozc-ut
 pkgbase=$_pkgbase-full
 pkgname=(${pkgbase}-common ibus-${pkgbase} fcitx5-${pkgbase} emacs-${pkgbase})
-pkgver=2.28.4800.102.20220723
+pkgver=2.28.4960.102.20221022
 pkgrel=1
 arch=('x86_64')
 url="https://github.com/fcitx/mozc"
@@ -31,13 +24,13 @@ makedepends=('pkg-config' 'python' 'curl' 'gtk2' 'mesa' 'ninja' 'git' 'clang' 'p
 source=(git+https://github.com/fcitx/mozc.git#commit=${_mozc_commit}
         https://osdn.net/projects/ponsfoot-aur/storage/mozc/x-ken-all-${_zipcode_rel}.zip
         https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${_zipcode_rel}.zip
-        git+https://github.com/abseil/abseil-cpp.git#commit=${_abseil_cpp_commit}
-        git+https://chromium.googlesource.com/breakpad/breakpad#commit=${_breakpad_commit}
-        git+https://github.com/google/googletest.git#commit=${_gtest_commit}
-        git+https://chromium.googlesource.com/external/gyp#commit=${_gyp_commit}
-        git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git#commit=${_japanese_usage_dictionary_commit}
-        git+https://github.com/open-source-parsers/jsoncpp.git#commit=${_jsoncpp_commit}
-        git+https://github.com/google/protobuf.git#commit=${_protobuf_commit}
+        git+https://github.com/abseil/abseil-cpp.git
+        git+https://chromium.googlesource.com/breakpad/breakpad
+        git+https://github.com/google/googletest.git
+        git+https://chromium.googlesource.com/external/gyp
+        git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git
+        git+https://github.com/open-source-parsers/jsoncpp.git
+        git+https://github.com/google/protobuf.git
         https://osdn.net/users/utuhiro/pf/utuhiro/dl/mozcdic-ut-${_utdicdate}.tar.bz2)
 sha512sums=('SKIP'
             'dec6479b42ddc1355cd882d17824cd874d8f103ad7767bac3f490f04551059d65b2806fa9e3f39a50ced2ecfdd37b75c9ed4536d9ad3bcef9e8c5ae1ec10e302'
@@ -49,7 +42,7 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '6fa5a6c9f97d97216d7fb4711299d3322667252a2dd74db08257edafaa3affc6db837cd9daa2c81cd4235d1c8418a10c10b22a3a6ef32aff33e69d7ec21daa5e')
+            '08f8fe1757fd69c94d6d46a7f6cdd2398a6d946cb69531131697f5a35fdb970742fb26aa4285a2025ab14a6fe2992f4f1ec299d20b899db98cad1c53be9a0ca3')
 validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9')  # Weng Xuetian
 
 pkgver() {
@@ -71,7 +64,7 @@ prepare() {
   git config submodule.src/third_party/japanese_usage_dictionary.url "$srcdir/japanese-usage-dictionary"
   git config submodule.src/third_party/jsoncpp.url "$srcdir/jsoncpp"
   git config submodule.src/third_party/protobuf.url "$srcdir/protobuf"
-  git submodule update
+  git -c protocol.file.allow=always submodule update --init --recursive
 
   cd src
   # Generate zip code seed
@@ -82,6 +75,12 @@ prepare() {
   # disable fcitx4 target
   rm unix/fcitx/fcitx.gyp
 
+  # 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
+
   # fix mozc icon for kimpanel
   sed -i 's|PREFIX|/usr|' unix/fcitx5/mozc.conf
 
@@ -99,15 +98,12 @@ build() {
 
   cd mozc/src
 
-  # TODO: use bazel
-
-  _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx5/fcitx5.gyp:fcitx5-mozc unix/emacs/emacs.gyp:mozc_emacs_helper unix/ibus/ibus.gyp:ibus_mozc renderer/renderer.gyp:mozc_renderer"
-
-  QTDIR=/usr GYP_DEFINES="document_dir=/usr/share/licenses/${pkgbase} use_libzinnia=1" \
-    python build_mozc.py gyp --gypdir=/usr/bin --target_platform=Linux
-  python build_mozc.py build -c $_bldtype $_targets --use_gyp_for_ibus_build
+  _targets="unix/fcitx5:fcitx5-mozc.so server:mozc_server gui/tool:mozc_tool renderer:mozc_renderer unix/ibus:ibus_mozc unix/emacs:mozc_emacs_helper"
+  _options="-c opt --copt=-fPIC --config oss_linux"
 
-  sed 's|/usr/libexec/|/usr/lib/ibus-mozc/|g' -i "out_linux/${_bldtype}/gen/unix/ibus/mozc.xml"
+  export JAVA_HOME='/usr/lib/jvm/java-11-openjdk/'
+  export QT_BASE_PATH=/usr/include/qt
+  bazel build $_targets $_options
 
   # Extract license part of mozc
   head -n 29 server/mozc_server.cc > LICENSE
@@ -123,7 +119,7 @@ package_mozc-ut-full-common() {
   install -d "${pkgdir}/usr/share/licenses/${pkgname}/"
   install -m 644 LICENSE data/installer/*.html "${pkgdir}/usr/share/licenses/${pkgname}/"
 
-  ../scripts/install_server
+  ../scripts/install_server_bazel
 }
 
 package_fcitx5-mozc-ut-full() {
@@ -137,7 +133,7 @@ package_fcitx5-mozc-ut-full() {
   export _bldtype
   cd mozc/src
 
-  ../scripts/install_fcitx5
+  ../scripts/install_fcitx5_bazel
 }
 
 package_ibus-mozc-ut-full() {
@@ -148,20 +144,24 @@ package_ibus-mozc-ut-full() {
 
   export _bldtype
   cd "${srcdir}/mozc/src"
-  install -D -m 755 out_linux/${_bldtype}/ibus_mozc       "${pkgdir}/usr/lib/ibus-mozc/ibus-engine-mozc"
-  install -D -m 644 out_linux/${_bldtype}/gen/unix/ibus/mozc.xml "${pkgdir}/usr/share/ibus/component/mozc.xml"
-  install -D -m 644 data/images/unix/ime_product_icon_opensource-32.png "${pkgdir}/usr/share/ibus-mozc/product_icon.png"
-  install    -m 644 data/images/unix/ui-tool.png          "${pkgdir}/usr/share/ibus-mozc/tool.png"
-  install    -m 644 data/images/unix/ui-properties.png    "${pkgdir}/usr/share/ibus-mozc/properties.png"
-  install    -m 644 data/images/unix/ui-dictionary.png    "${pkgdir}/usr/share/ibus-mozc/dictionary.png"
-  install    -m 644 data/images/unix/ui-direct.png        "${pkgdir}/usr/share/ibus-mozc/direct.png"
-  install    -m 644 data/images/unix/ui-hiragana.png      "${pkgdir}/usr/share/ibus-mozc/hiragana.png"
-  install    -m 644 data/images/unix/ui-katakana_half.png "${pkgdir}/usr/share/ibus-mozc/katakana_half.png"
-  install    -m 644 data/images/unix/ui-katakana_full.png "${pkgdir}/usr/share/ibus-mozc/katakana_full.png"
-  install    -m 644 data/images/unix/ui-alpha_half.png    "${pkgdir}/usr/share/ibus-mozc/alpha_half.png"
-  install    -m 644 data/images/unix/ui-alpha_full.png    "${pkgdir}/usr/share/ibus-mozc/alpha_full.png"
-
-  install -D -m 755 out_linux/${_bldtype}/mozc_renderer "${pkgdir}/usr/lib/mozc/mozc_renderer"
+  install -D -m 755 bazel-bin/unix/ibus/ibus_mozc         "$pkgdir/usr/lib/ibus-mozc/ibus-engine-mozc"
+  install -D -m 644 bazel-bin/unix/ibus/mozc.xml          "$pkgdir/usr/share/ibus/component/mozc.xml"
+  install -D -m 755 bazel-bin/renderer/mozc_renderer      "${pkgdir}/usr/lib/mozc/mozc_renderer"
+
+
+  cd bazel-bin/unix
+  unzip -o icons.zip
+
+  install -Dm644 mozc.png                                  "${pkgdir}/usr/share/ibus-mozc/product_icon.png"
+  install -Dm644 alpha_full.svg                            "${pkgdir}/usr/share/ibus-mozc/alpha_full.svg"
+  install -Dm644 alpha_half.svg                            "${pkgdir}/usr/share/ibus-mozc/alpha_half.svg"
+  install -Dm644 direct.svg                                "${pkgdir}/usr/share/ibus-mozc/direct.svg"
+  install -Dm644 hiragana.svg                              "${pkgdir}/usr/share/ibus-mozc/hiragana.svg"
+  install -Dm644 katakana_full.svg                         "${pkgdir}/usr/share/ibus-mozc/katakana_full.svg"
+  install -Dm644 katakana_half.svg                         "${pkgdir}/usr/share/ibus-mozc/katakana_half.svg"
+  install -Dm644 outlined/dictionary.svg                   "${pkgdir}/usr/share/ibus-mozc/dictionary.svg"
+  install -Dm644 outlined/properties.svg                   "${pkgdir}/usr/share/ibus-mozc/properties.svg"
+  install -Dm644 outlined/tool.svg                         "${pkgdir}/usr/share/ibus-mozc/tool.svg"
 }
 
 
@@ -173,7 +173,6 @@ package_emacs-mozc-ut-full() {
 
   export _bldtype
   cd "${srcdir}/mozc/src"
-  install -D -m 755 out_linux/${_bldtype}/mozc_emacs_helper "${pkgdir}/usr/bin/mozc_emacs_helper"
-  install -d "${pkgdir}/usr/share/emacs/site-lisp/emacs-mozc/"
-  install -m 644 unix/emacs/mozc.el "${pkgdir}/usr/share/emacs/site-lisp/emacs-mozc"
+  install -Dm755 bazel-bin/unix/emacs/mozc_emacs_helper "$pkgdir/usr/bin/mozc_emacs_helper"
+  install -Dm644 unix/emacs/mozc.el                     "$pkgdir/usr/share/emacs/site-lisp/emacs-mozc/mozc.el"
 }