mozc: Upstream update

2 files changed, 16 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d524b00f739a..7c47f5f17eb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# 水 11月 23 10:31:37 UTC 2016
+# 火 12月 13 11:29:53 UTC 2016
 pkgbase = mozc-ut2
 	pkgdesc = Mozc the Japanese Input Method with Mozc UT2 Dictionary (additional dictionary) and uim-mozc (optional)
-	pkgver = 2.18.2612.102.20161121
+	pkgver = 2.20.2673.102.20161121
 	pkgrel = 1
 	url = http://www.geocities.jp/ep3797/mozc-ut2.html
 	arch = i686
@@ -16,25 +16,25 @@ pkgbase = mozc-ut2
 	makedepends = git
 	makedepends = ninja
 	makedepends = clang
-	makedepends = qt4
+	makedepends = qt5-base
 	makedepends = ibus>=1.4.1
 	makedepends = uim
-	depends = qt4
+	depends = qt5-base
 	depends = zinnia
-	source = mozc::git+https://github.com/google/mozc.git#commit=2315f957d1785130c2ed196e141a330b0857b065
+	source = mozc::git+https://github.com/google/mozc.git#commit=280e38fe3d9db4df52f0713acf2ca65898cd697a
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut2-20161121.tar.bz2
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/edict2-20161121.gz
 	source = EDICT_license.html
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/ken_all-201610.zip
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201610.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/ken_all-201611.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201611.zip
 	source = mod-generate-dictionary.sh
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/uim-mozc-321.3ea28b1.tar.xz
 	sha1sums = SKIP
 	sha1sums = b57e19535614ed7394b7bbafd91f6dac96107bba
 	sha1sums = 00102b080214d3cf1155c9add220f8de7a6eda10
 	sha1sums = e0ba18e67c1be8e3cfb8ecb30760597b215da255
-	sha1sums = 4dbc4d7068e6126b54ca2889ed6d30f50a47f862
-	sha1sums = 21e0587eb7c1df8ea2ee709e98a0b533ec48fecf
+	sha1sums = 1c2fe61b08552ce108f480e65d36b5fd5702afc9
+	sha1sums = 64e324e066d0e2a5ca17195454b5425dbee15ee9
 	sha1sums = 16574ba571784ff037022ecdab7f62c9d5bb4ce6
 	sha1sums = 22b7c2a5b0a7fef778ee72ebe5873a75e879d26b
 
@@ -44,7 +44,7 @@ pkgname = mozc-ut2
 	arch = i686
 	arch = x86_64
 	groups = mozc-im
-	depends = qt4
+	depends = qt5-base
 	depends = zinnia
 	optdepends = tegaki-models-zinnia-japanese: hand-writing recognition support
 	provides = mozc=
diff --git a/PKGBUILD b/PKGBUILD
index 85b3118dc5e6..e98cf15e8115 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -71,7 +71,7 @@ _ibus_mozc="yes"
 _bldtype=Release
 #_bldtype=Debug
 
-_mozcrev=2315f957d1785130c2ed196e141a330b0857b065
+_mozcrev=280e38fe3d9db4df52f0713acf2ca65898cd697a
 _utdicver=20161121
 _zipcoderel=201611
 _uimmozcrev=321.3ea28b1
@@ -79,12 +79,12 @@ _uimmozcrev=321.3ea28b1
 pkgbase=mozc-ut2
 pkgname=mozc-ut2
 true && pkgname=('mozc-ut2')
-pkgver=2.18.2612.102.20161121
+pkgver=2.20.2673.102.20161121
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.geocities.jp/ep3797/mozc-ut2.html"
 license=('BSD' 'GPL' 'CC-BY-SA' 'custom')
-makedepends=('python2' 'ruby' 'git' 'ninja' 'clang' 'qt4')
+makedepends=('python2' 'ruby' 'git' 'ninja' 'clang' 'qt5-base')
 source=(
   mozc::git+https://github.com/google/mozc.git#commit=${_mozcrev}
   http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut2-${_utdicver}.tar.bz2
@@ -175,13 +175,6 @@ build() {
   done
   msg2 '====================================================='
 
-  # Use Qt4
-  _rcc_loc=`pkg-config QtCore --variable=rcc_location`
-  _qt4dir=${_rcc_loc%%/bin/rcc}
-  _qt4i=`pkg-config --cflags-only-I QtGui`
-  CFLAGS+=" $_qt4i"
-  CXXFLAGS+=" $_qt4i"
-
   msg "Starting make..."
 
   cd "${srcdir}/${pkgbase}-${pkgver}/src"
@@ -193,7 +186,7 @@ build() {
 
   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
-  QTDIR=$_qt4dir GYP_DEFINES="document_dir=/usr/share/licenses/${pkgbase}" \
+  GYP_DEFINES="document_dir=/usr/share/licenses/${pkgbase}" \
     python2 build_mozc.py gyp
   python2 build_mozc.py build -c $_bldtype $_targets
 
@@ -208,7 +201,7 @@ package_mozc-ut2() {
   pkgdesc="Mozc the Japanese Input Method with Mozc UT2 Dictionary"
   arch=('i686' 'x86_64')
   groups=('mozc-im')
-  depends=('qt4' 'zinnia')
+  depends=('qt5-base' 'zinnia')
   install=mozc-ut.install
   provides=("mozc=${_mozcver}")
   replaces=('mozc-server-ut' 'mozc-utils-gui-ut' 'mozc-ut')
@@ -298,4 +291,4 @@ package_uim-mozc-ut2() {
 
 # Global pkgdesc and depends are here so that they will be picked up by AUR
 pkgdesc="Mozc the Japanese Input Method with Mozc UT2 Dictionary (additional dictionary) and uim-mozc (optional)"
-depends=('qt4' 'zinnia')
+depends=('qt5-base' 'zinnia')