v=2.26.4596.102,r=1

3 files changed, 47 insertions, 240 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f2f985958d0..e84c4095aa00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,61 +1,24 @@
-# Generated by mksrcinfo v8
-# 金 11月 30 11:34:16 UTC 2018
 pkgbase = mozc
-	pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)
-	pkgver = 2.23.2815.102
-	pkgrel = 3
-	url = http://code.google.com/p/mozc/
-	arch = i686
+	pkgdesc = The Open Source edition of Google Japanese Input
+	pkgver = 2.26.4596.102
+	pkgrel = 1
+	url = https://github.com/google/mozc
 	arch = x86_64
+	license = Apache
 	license = BSD
+	license = LGPL
 	license = custom
-	makedepends = python2
+	makedepends = bazel
 	makedepends = git
-	makedepends = ninja
-	makedepends = clang
-	makedepends = qt5-base
-	makedepends = emacs
+	makedepends = pkgconf
+	makedepends = python-six
 	depends = qt5-base
-	depends = ibus>=1.4.1
-	depends = zinnia
-	source = mozc::git+https://github.com/google/mozc.git#commit=afb03ddfe72dde4cf2409863a3bfea160f7a66d8
-	source = https://osdn.net/projects/ponsfoot-aur/storage/mozc/x-ken-all-201811.zip
-	source = https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-201811.zip
-	source = https://gist.githubusercontent.com/MightyPork/6b93f56b404e526268ac133f1a783afd/raw/40b3b9569d4b0741d78c511b247b26d2b1e7a2ae/mozc.patch
-	sha1sums = SKIP
-	sha1sums = c274abcc6d259dae8dae121408c25fff19052585
-	sha1sums = 6187d52063d5ddf8cb7ed060cfff03cf91ed45cf
-	sha1sums = a366077418ae6f235aecf374256354a40dc5b37a
+	conflicts = mozc-ut-common
+	conflicts = mozc-ut
+	conflicts = mozc-ut2
+	conflicts = mozc-ut-united
+	conflicts = mozc-neologd-ut+ut2
+	source = mozc-git::git+https://github.com/google/mozc.git#commit=3735608
+	sha256sums = SKIP
 
 pkgname = mozc
-	pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)
-	arch = i686
-	arch = x86_64
-	groups = mozc-im
-	depends = qt5-base
-	depends = zinnia
-	optdepends = tegaki-models-zinnia-japanese: hand-writing recognition support
-	conflicts = mozc-server
-	conflicts = mozc-utils-gui
-	replaces = mozc-server
-	replaces = mozc-utils-gui
-
-pkgname = emacs-mozc
-	pkgdesc = Mozc for Emacs
-	install = emacs-mozc.install
-	arch = i686
-	arch = x86_64
-	groups = mozc-im
-	depends = mozc=2.23.2815.102
-	depends = emacs
-	conflicts = emacs-mozc-bin
-	replaces = emacs-mozc-bin
-
-pkgname = ibus-mozc
-	pkgdesc = IBus engine module for Mozc
-	arch = i686
-	arch = x86_64
-	groups = mozc-im
-	depends = mozc=2.23.2815.102
-	depends = ibus>=1.4.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 8543b019c582..6883b8df35ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,187 +1,45 @@
-# Maintainer: ponsfoot <cabezon dot hashimoto at gmail dot com>
-
-## If you will be using mozc.el on Emacs, uncomment below.
-#_emacs_mozc="yes"
-
-## If you will not be using ibus (only use uim), comment out below.
-_ibus_mozc="yes"
-
-## If you do not want to add Japanese zip code into dictionary,
-## comment out below.
-_zipcode="yes"
-
-## Mozc compile option
-_bldtype=Release
-#_bldtype=Debug
-
-#*************************************************************
-# Upstreams:
-#
-# mozc
-# http://code.google.com/p/mozc/
-#
-# Japanese zip code data by Japan Post (Public Domain)
-# http://www.post.japanpost.jp/zipcode/download.html
-#
-# Modified Japanese zip code data by Ibs (Public Domain)
-# http://zipcloud.ibsnet.co.jp/
-#*************************************************************
-
-_zipcoderel=201811
-_mozcrev=afb03ddfe72dde4cf2409863a3bfea160f7a66d8
-
-pkgbase=mozc
-pkgname=mozc
-true && pkgname=('mozc')
-pkgver=2.23.2815.102
-pkgrel=3
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/mozc/"
-license=('BSD' 'custom')
-makedepends=('python2' 'git' 'ninja' 'clang' 'qt5-base')
-#source=("${_svndir}/${_svnmod}::svn+${_svntrunk}"
-source=(
-  mozc::git+https://github.com/google/mozc.git#commit=${_mozcrev}
-  https://osdn.net/projects/ponsfoot-aur/storage/mozc/x-ken-all-${_zipcoderel}.zip
-  https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${_zipcoderel}.zip
-  https://gist.githubusercontent.com/MightyPork/6b93f56b404e526268ac133f1a783afd/raw/40b3b9569d4b0741d78c511b247b26d2b1e7a2ae/mozc.patch
-)
-sha1sums=('SKIP'
-          'c274abcc6d259dae8dae121408c25fff19052585'
-          '6187d52063d5ddf8cb7ed060cfff03cf91ed45cf'
-          'a366077418ae6f235aecf374256354a40dc5b37a')
-
-
-if [[ "$_emacs_mozc" == "yes" ]]; then
-  true && pkgname+=('emacs-mozc')
-  makedepends+=('emacs')
-fi
-
-if [[ "$_ibus_mozc" == "yes" ]]; then
-  true && pkgname+=('ibus-mozc')
-fi
-
-
-pkgver() {
-  . "${srcdir}/${pkgbase}/src/data/version/mozc_version_template.bzl"
-  printf "%s.%s.%s.%s" $MAJOR $MINOR $BUILD $REVISION
-}
-
+# Maintainer: Nocifer <apmichalopoulos at gmail dot com>
+# Contributor: UTUMI Hirosi <utuhiro78 at yahoo dot co dot jp>
+# Contributor: Felix Yan <felixonmars@gmail.com>
+# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
+
+
+pkgname='mozc'
+pkgver=2.26.4596.102
+pkgrel=1
+pkgdesc='The Open Source edition of Google Japanese Input'
+arch=('x86_64')
+url='https://github.com/google/mozc'
+license=('Apache' 'BSD' 'LGPL' 'custom')
+depends=('qt5-base')
+makedepends=('bazel' 'git' 'pkgconf' 'python-six')
+conflicts=('mozc-ut-common' 'mozc-ut' 'mozc-ut2' 'mozc-ut-united' 'mozc-neologd-ut+ut2')
+source=("${pkgname}-git::git+https://github.com/google/mozc.git#commit=3735608")
+sha256sums=('SKIP')
 
 prepare() {
-  ln -sf `which python2` "${srcdir}/python"
-
-  cd "${srcdir}/${pkgbase}/"
-
-  git submodule update --init --recursive
+    cd ${pkgname}-git
 
-  cd "${srcdir}/${pkgbase}/src/"
+    git submodule update --init --recursive
 
-  # Generate zip code dictionary seed
-  if [[ "$_zipcode" == "yes" ]]; then
-    msg "Generating zip code dict seed..."
-    cd "$srcdir"
-    PYTHONPATH="${PYTHONPATH}:${srcdir}/${pkgbase}/src/" \
-              python2 mozc/src/dictionary/gen_zip_code_seed.py \
-              --zip_code=x-ken-all.csv \
-              --jigyosyo=JIGYOSYO.CSV \
-              >> "${srcdir}/${pkgbase}/src/data/dictionary_oss/dictionary09.txt"
-    msg "Done."
-  fi
-
-  patch -Np0 -i "${srcdir}/mozc.patch"
+    cd src
 
+    # Fix the Qt5 include path
+    sed -i -e 's/x86_64-linux-gnu\/qt5/qt/' config.bzl
 }
 
-
 build() {
-  msg2 '====================================================='
-  msg2 '               *** Build Info ***'
-  msg2 ' The following package files will be generated:'
-  for _p in ${pkgname[@]}
-  do
-    msg2 "  * ${_p}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}"
-  done
-  msg2 '====================================================='
-
-  PATH="${srcdir}:${PATH}"
-
-  cd "${srcdir}/${pkgbase}/src"
-
-  msg "Starting make..."
-
-  _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool "
-  [[ "$_emacs_mozc" == "yes" ]] && _targets+="unix/emacs/emacs.gyp:mozc_emacs_helper "
-  [[ "$_ibus_mozc" == "yes" ]] && _targets+="unix/ibus/ibus.gyp:ibus_mozc renderer/renderer.gyp:mozc_renderer "
-
-  unset CC CC_host CC_target CXX CXX_host CXX_target LINK AR AR_host AR_target \
-        NM NM_host NM_target READELF READELF_host READELF_target
-  GYP_DEFINES="document_dir=/usr/share/licenses/${pkgbase}" \
-    python2 build_mozc.py gyp --target_platform=Linux
-  python2 build_mozc.py build -c $_bldtype $_targets
-
-  if [[ "$_ibus_mozc" == "yes" ]]; then
-      sed -i 's|/usr/libexec/|/usr/lib/ibus-mozc/|g' \
-          out_linux/${_bldtype}/gen/unix/ibus/mozc.xml
-  fi
+    cd ${pkgname}-git/src
 
+    env PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH" bazel build server:mozc_server gui/tool:mozc_tool --config oss_linux --compilation_mode opt
 }
 
-package_mozc() {
-  pkgdesc="A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
-  arch=('i686' 'x86_64')
-  groups=('mozc-im')
-  depends=('qt5-base' 'zinnia')
-  replaces=('mozc-server' 'mozc-utils-gui')
-  conflicts=('mozc-server' 'mozc-utils-gui')
-  optdepends=('tegaki-models-zinnia-japanese: hand-writing recognition support')
+package() {
+    cd ${pkgname}-git/src
 
-  cd "${srcdir}/${pkgbase}/"
-  install -D -m 755 src/out_linux/${_bldtype}/mozc_server "${pkgdir}/usr/lib/mozc/mozc_server"
-  install    -m 755 src/out_linux/${_bldtype}/mozc_tool   "${pkgdir}/usr/lib/mozc/mozc_tool"
+    install -Dm644 ../LICENSE                                   ${pkgdir}/usr/share/licenses/mozc/mozc
+    install -Dm644 data/installer/credits_en.html               ${pkgdir}/usr/share/licenses/mozc/mozc-submodules
 
-  install -d "${pkgdir}/usr/share/licenses/mozc/"
-  install -m 644 LICENSE src/data/installer/*.html "${pkgdir}/usr/share/licenses/mozc/"
+    install -Dm755 bazel-bin/server/mozc_server                 ${pkgdir}/usr/lib/mozc/mozc_server
+    install -Dm755 bazel-bin/gui/tool/mozc_tool                 ${pkgdir}/usr/lib/mozc/mozc_tool
 }
-
-package_ibus-mozc() {
-  pkgdesc="IBus engine module for Mozc"
-  arch=('i686' 'x86_64')
-  groups=('mozc-im')
-  depends=("mozc=${pkgver}" 'ibus>=1.4.1')
-
-  cd "${srcdir}/${pkgbase}/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"
-}
-
-package_emacs-mozc() {
-  pkgdesc="Mozc for Emacs"
-  arch=('i686' 'x86_64')
-  groups=('mozc-im')
-  depends=("mozc=${pkgver}" 'emacs')
-  replaces=('emacs-mozc-bin')
-  conflicts=('emacs-mozc-bin')
-  install=emacs-mozc.install
-
-  cd "${srcdir}/${pkgbase}/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"
-}
-
-# Global pkgdesc and depends are here so that they will be picked up by AUR
-pkgdesc="A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
-depends=('qt5-base' 'ibus>=1.4.1' 'zinnia')
diff --git a/emacs-mozc.install b/emacs-mozc.install
deleted file mode 100644
index e8fd36581333..000000000000
--- a/emacs-mozc.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cat << EOF
-==> Add the followings into your \$HOME/.emacs.d/init.el file to enable mozc-mode.
-
-   (set-language-environment "Japanese")
-   (require 'mozc)  ; or (load-file "/path/to/mozc.el")
-   (setq default-input-method "japanese-mozc")
-
-==> Having the above settings, just type C-\\ which is bound to
-==> \`toggle-input-method' by default.
-
-EOF
-}
-