summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorponsfoot2016-12-13 20:21:00 +0900
committerponsfoot2016-12-13 20:21:00 +0900
commit492d332e4e4bea2d30fc5530eb2177440cf1cdf7 (patch)
treed273bfc5b2bf8af140ea8df93d555f4bd4caa06c
parentfaa6b329d2b5d4ffc1f9bce86c77aca35e2fdef5 (diff)
downloadaur-492d332e4e4bea2d30fc5530eb2177440cf1cdf7.tar.gz
Upstream update
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD19
2 files changed, 18 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 86d16268aaa..24c924be197 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# 木 10月 27 12:19:06 UTC 2016
+# 火 12月 13 11:21:00 UTC 2016
pkgbase = mozc
pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)
- pkgver = 2.18.2612.102
+ pkgver = 2.20.2673.102
pkgrel = 1
url = http://code.google.com/p/mozc/
arch = i686
@@ -13,24 +13,24 @@ pkgbase = mozc
makedepends = git
makedepends = ninja
makedepends = clang
- makedepends = qt4
+ makedepends = qt5-base
makedepends = emacs
- depends = qt4
+ depends = qt5-base
depends = ibus>=1.4.1
depends = zinnia
- source = mozc::git+https://github.com/google/mozc.git#commit=2315f957d1785130c2ed196e141a330b0857b065
- source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/x-ken-all-201609.zip
- source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201609.zip
+ source = mozc::git+https://github.com/google/mozc.git#commit=280e38fe3d9db4df52f0713acf2ca65898cd697a
+ source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/x-ken-all-201611.zip
+ source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201611.zip
sha1sums = SKIP
- sha1sums = 7fc1c5e2487e47db84e2791a88085c1d6c8782cc
- sha1sums = 3d012569963b9359d2d267216f78c1a07a395065
+ sha1sums = c11fb2ffa8aa8746915a5f2a5fa4a20109a1c2bb
+ sha1sums = 64e324e066d0e2a5ca17195454b5425dbee15ee9
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 = qt4
+ depends = qt5-base
depends = zinnia
optdepends = tegaki-models-zinnia-japanese: hand-writing recognition support
conflicts = mozc-server
@@ -44,7 +44,7 @@ pkgname = emacs-mozc
arch = i686
arch = x86_64
groups = mozc-im
- depends = mozc=2.18.2612.102
+ depends = mozc=2.20.2673.102
depends = emacs
conflicts = emacs-mozc-bin
replaces = emacs-mozc-bin
@@ -54,6 +54,6 @@ pkgname = ibus-mozc
arch = i686
arch = x86_64
groups = mozc-im
- depends = mozc=2.18.2612.102
+ depends = mozc=2.20.2673.102
depends = ibus>=1.4.1
diff --git a/PKGBUILD b/PKGBUILD
index a5a080c94f6..f07bcee8dd3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,17 +28,17 @@ _bldtype=Release
#*************************************************************
_zipcoderel=201611
-_mozcrev=2315f957d1785130c2ed196e141a330b0857b065
+_mozcrev=280e38fe3d9db4df52f0713acf2ca65898cd697a
pkgbase=mozc
pkgname=mozc
true && pkgname=('mozc')
-pkgver=2.18.2612.102
+pkgver=2.20.2673.102
pkgrel=1
arch=('i686' 'x86_64')
url="http://code.google.com/p/mozc/"
license=('BSD' 'custom')
-makedepends=('python2' 'git' 'ninja' 'clang' 'qt4')
+makedepends=('python2' 'git' 'ninja' 'clang' 'qt5-base')
#source=("${_svndir}/${_svnmod}::svn+${_svntrunk}"
source=(
mozc::git+https://github.com/google/mozc.git#commit=${_mozcrev}
@@ -105,13 +105,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"
-
cd "${srcdir}/${pkgbase}/src"
msg "Starting make..."
@@ -122,7 +115,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 --target_platform=Linux
python2 build_mozc.py build -c $_bldtype $_targets
@@ -137,7 +130,7 @@ 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=('qt4' 'zinnia')
+ 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')
@@ -190,4 +183,4 @@ package_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=('qt4' 'ibus>=1.4.1' 'zinnia')
+depends=('qt5-base' 'ibus>=1.4.1' 'zinnia')