summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD22
-rw-r--r--adapt_mozc2.17.2240.102.patch28
3 files changed, 53 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 431aca48127a..fde3d86500cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mozc-ut
pkgdesc = Mozc the Japanese Input Method with Mozc UT Dictionary (additional dictionary) and uim-mozc (optional)
- pkgver = 2.17.2123.102.20151002
+ pkgver = 2.17.2240.102.20151130
pkgrel = 1
url = http://www.geocities.jp/ep3797/mozc_01.html
arch = i686
@@ -17,20 +17,22 @@ pkgbase = mozc-ut
makedepends = ibus>=1.4.1
depends = qt4
depends = zinnia
- source = mozc::git+https://github.com/google/mozc.git#commit=e398317a086a78c0cf0004505eb8f56586e925b2
- source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut-20151002.tar.bz2
- source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/edict-20151002.gz
+ source = mozc::git+https://github.com/google/mozc.git#commit=95de40fa884d693172605e7283ec82233a908b29
+ source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut-20151130.tar.bz2
+ source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/edict-20151130.gz
source = EDICT_license.html
- source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/x-ken-all-201509.zip
- source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201509.zip
+ source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/x-ken-all-201511.zip
+ source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201511.zip
source = mod-generate-mozc-ut.sh
+ source = adapt_mozc2.17.2240.102.patch
sha1sums = SKIP
- sha1sums = ec38640b36ab662cb1c5097d22557a85a1ea0f8e
- sha1sums = cc1b87e31cde48de716851d0125018226368f908
+ sha1sums = d37a86d338b1bd16b42e117c81dc8923625b00b4
+ sha1sums = 1673bfa2e29c4f2687b860da7f9c403c94bf3e00
sha1sums = e0ba18e67c1be8e3cfb8ecb30760597b215da255
- sha1sums = 134bd80b14d87386eec38710e999dc56fc34efc3
- sha1sums = c3cd5e91ac4878e60c875076d7b3b37f087964d1
+ sha1sums = 04e3f03d4933b20d865c887f7fa1d9dcc8a2bf1d
+ sha1sums = 584df54e2a1419bec85ca5c70f2e0e585ee314b0
sha1sums = 6ac2f10ad9160b25d2d6e41a3f9fd112126ab1f7
+ sha1sums = 031654d8fb40225a6c193d89246b294256ae33f4
pkgname = mozc-ut
pkgdesc = Mozc the Japanese Input Method with Mozc UT Dictionary
diff --git a/PKGBUILD b/PKGBUILD
index 87ce0460a92d..b964aefad05c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -69,15 +69,15 @@ _kill_kill_line="yes"
_bldtype=Release
#_bldtype=Debug
-_mozcrev=e398317a086a78c0cf0004505eb8f56586e925b2
-_utdicver=20151002
-_zipcoderel=201510
+_mozcrev=95de40fa884d693172605e7283ec82233a908b29
+_utdicver=20151130
+_zipcoderel=201511
_uimmozcrev=318.0562676
pkgbase=mozc-ut
pkgname=mozc-ut
true && pkgname=('mozc-ut')
-pkgver=2.17.2123.102.20151002
+pkgver=2.17.2240.102.20151130
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.geocities.jp/ep3797/mozc_01.html"
@@ -91,14 +91,16 @@ source=(
http://downloads.sourceforge.net/project/pnsft-aur/mozc/x-ken-all-${_zipcoderel}.zip
http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-${_zipcoderel}.zip
mod-generate-mozc-ut.sh
+ adapt_mozc2.17.2240.102.patch
)
sha1sums=('SKIP'
- 'ec38640b36ab662cb1c5097d22557a85a1ea0f8e'
- 'cc1b87e31cde48de716851d0125018226368f908'
+ 'd37a86d338b1bd16b42e117c81dc8923625b00b4'
+ '1673bfa2e29c4f2687b860da7f9c403c94bf3e00'
'e0ba18e67c1be8e3cfb8ecb30760597b215da255'
- '2c769c7e0aa8a8123abd23353371daa8dc20b753'
- 'f24f31bc8dac216c209b8ba6f79a128bf670c062'
- '6ac2f10ad9160b25d2d6e41a3f9fd112126ab1f7')
+ '04e3f03d4933b20d865c887f7fa1d9dcc8a2bf1d'
+ '584df54e2a1419bec85ca5c70f2e0e585ee314b0'
+ '6ac2f10ad9160b25d2d6e41a3f9fd112126ab1f7'
+ '031654d8fb40225a6c193d89246b294256ae33f4')
if [[ "$_ibus_mozc" == "yes" ]]; then
@@ -159,6 +161,8 @@ prepare() {
# Extract license part of uim-mozc
head -n 32 unix/uim/mozc.cc > unix/uim/LICENSE
+ patch -p2 -i "${srcdir}/adapt_mozc2.17.2240.102.patch"
+
fi
# Generate zip code seed
diff --git a/adapt_mozc2.17.2240.102.patch b/adapt_mozc2.17.2240.102.patch
new file mode 100644
index 000000000000..a2aca48a6ac4
--- /dev/null
+++ b/adapt_mozc2.17.2240.102.patch
@@ -0,0 +1,28 @@
+diff -uNr mozc.orig/src/unix/uim/mozc.cc mozc/src/unix/uim/mozc.cc
+--- mozc.orig/src/unix/uim/mozc.cc 2015-12-02 20:12:47.386430000 +0900
++++ mozc/src/unix/uim/mozc.cc 2015-12-02 20:14:46.780606804 +0900
+@@ -33,6 +33,7 @@
+
+ //#include <config.h>
+
++#include <cstddef>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -50,6 +51,7 @@
+
+ #include "base/port.h"
+ #include "base/util.h"
++#include "base/init_mozc.h"
+ #include "protocol/config.pb.h"
+ #include "protocol/commands.pb.h"
+ #include "client/client.h"
+@@ -1196,7 +1198,7 @@
+ argv[0] = (char *)name;
+ argv[1] = NULL;
+
+- InitGoogle((const char *)argv[0], &argc, (char ***)&argv, true);
++ mozc::InitMozc((const char *)argv[0], &argc, (char ***)&argv, true);
+ mozc::uim::install_keymap();
+ }
+