Apply upstream fix (static link protobuf22) and increase pkgrel.

2 files changed, 36 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 836e41306d03..e67df49a2a34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = fcitx-mozc-neologd-ut
 	pkgver = 2.23.2815.102.20200521
-	pkgrel = 1
+	pkgrel = 2
 	url = https://osdn.net/users/utuhiro/pf/utuhiro/files/
 	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = clang
 	makedepends = gyp
-	makedepends = protobuf
 	makedepends = ninja
 	makedepends = pkg-config
 	makedepends = python
@@ -20,23 +19,24 @@ pkgbase = fcitx-mozc-neologd-ut
 	makedepends = glib2
 	makedepends = bzip2
 	makedepends = unzip
-	depends = protobuf
-	source = mozc-2.23.2815.102+dfsg.tar.xz::http://ftp.jp.debian.org/debian/pool/main/m/mozc/mozc_2.23.2815.102+dfsg.orig.tar.xz
-	source = usage_dict.txt.patch::https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/usage_dict.txt.patch
-	source = fix-build-with-gcc8.patch::https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Fix-build-with-gcc8.patch
-	source = change-from-python2-code-to-python3.patch::https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Change-from-python2-code-to-python3.patch
-	source = add_support_new_japanese_era.patch::https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch
+	source = http://ftp.jp.debian.org/debian/pool/main/m/mozc/mozc_2.23.2815.102+dfsg.orig.tar.xz
+	source = protobuf-3.5.2.tar.gz::https://github.com/protocolbuffers/protobuf/archive/v3.5.2.tar.gz
+	source = https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/usage_dict.txt.patch
+	source = https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Fix-build-with-gcc8.patch
+	source = https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Change-from-python2-code-to-python3.patch
+	source = https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch
 	source = https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch
 	source = https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
-	source = https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F26%2F26416%2Fmozcdic-neologd-ut-20200521.1.tar.bz2
+	source = https://osdn.net/downloads/users/26/26416/mozcdic-neologd-ut-20200521.1.tar.bz2
 	sha1sums = 7e0a39ffd5ea68ecadb792fc521c16b5be1f25cb
+	sha1sums = d0c551031828ed9c07cc683762353a67b1a17627
 	sha1sums = c6f5aac79c7e98fbda96de251d8f0d0787344ca9
 	sha1sums = 4fe935b5c2d316119cf8957b6518b3b5e7bf6ecf
 	sha1sums = SKIP
 	sha1sums = 13f8fbbc768d5042fb55d877acf2a73fc8b5e3f0
 	sha1sums = 63a2b10e7d209c6216e2d912b2629efc44c637ea
 	sha1sums = 883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d
-	sha1sums = SKIP
+	sha1sums = c09d1da0445868474ed0dae2b580d17dbc2f5364
 
 pkgname = mozc-neologd-ut
 	pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)
@@ -50,7 +50,6 @@ pkgname = mozc-neologd-ut
 	conflicts = mozc-ut2
 	conflicts = fcitx-mozc-ut
 	conflicts = mozc-ut
-	conflicts = fcitx-mozc-neologd-ut+ut2
 
 pkgname = fcitx-mozc-neologd-ut
 	pkgdesc = Fcitx engine module for Mozc
diff --git a/PKGBUILD b/PKGBUILD
index acc8c8ed0ce4..d4467e37be02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Masaki Haruka <yek@reasonset.net>
+# Maintainer: Masaki Haruka <yek at reasonset dot net>
 # Contributor: UTUMI Hirosi <utuhiro78 att yahoo dott co dott jp>
 # Contributor: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
@@ -10,57 +10,64 @@ _mozcver=2.23.2815.102
 _fcitxver=2.23.2815.102.1
 _neologddate=20200521
 pkgver=${_mozcver}.${_neologddate}
-pkgrel=1
+pkgrel=2
 
 pkgname=mozc-neologd-ut
 true && pkgname=('mozc-neologd-ut' 'fcitx-mozc-neologd-ut')
 arch=('i686' 'x86_64')
 url="https://osdn.net/users/utuhiro/pf/utuhiro/files/"
 license=('custom')
-depends=('protobuf')
-makedepends=('clang' 'gyp' 'protobuf' 'ninja' 'pkg-config' 'python' 'curl' 'gtk2' 'qt5-base' 'zinnia' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip')
+makedepends=('clang' 'gyp' 'ninja' 'pkg-config' 'python' 'curl' 'gtk2' 'qt5-base' 'zinnia' 'fcitx' 'libxcb' 'glib2' 'bzip2' 'unzip')
 
 source=(
-  mozc-${_mozcver}+dfsg.tar.xz::http://ftp.jp.debian.org/debian/pool/main/m/mozc/mozc_${_mozcver}+dfsg.orig.tar.xz
-  usage_dict.txt.patch::https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/usage_dict.txt.patch
-  fix-build-with-gcc8.patch::https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Fix-build-with-gcc8.patch
-  change-from-python2-code-to-python3.patch::https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Change-from-python2-code-to-python3.patch
-  add_support_new_japanese_era.patch::https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch
+  http://ftp.jp.debian.org/debian/pool/main/m/mozc/mozc_${_mozcver}+dfsg.orig.tar.xz
+  protobuf-3.5.2.tar.gz::https://github.com/protocolbuffers/protobuf/archive/v3.5.2.tar.gz
+  https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/usage_dict.txt.patch
+  https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Fix-build-with-gcc8.patch
+  https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/Change-from-python2-code-to-python3.patch
+  https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch
   https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_fcitxver}.patch
   https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
-  "https://osdn.net/frs/chamber_redir.php?m=ymu&f=%2Fusers%2F26%2F26416%2Fmozcdic-neologd-ut-20200521.1.tar.bz2"
+  #https://osdn.net/downloads/users/26/26416/mozcdic-neologd-ut-${_neologddate}.${pkgrel}.tar.bz2
+  https://osdn.net/downloads/users/26/26416/mozcdic-neologd-ut-${_neologddate}.1.tar.bz2
 )
 
 sha1sums=(
   '7e0a39ffd5ea68ecadb792fc521c16b5be1f25cb'
+  'd0c551031828ed9c07cc683762353a67b1a17627'
   'c6f5aac79c7e98fbda96de251d8f0d0787344ca9'
   '4fe935b5c2d316119cf8957b6518b3b5e7bf6ecf'
   'SKIP'
   '13f8fbbc768d5042fb55d877acf2a73fc8b5e3f0'
   '63a2b10e7d209c6216e2d912b2629efc44c637ea'
   '883f4fc489a9ed1c07d2d2ec37ca72509f04ea5d'
-  'SKIP'
+  'c09d1da0445868474ed0dae2b580d17dbc2f5364'
 )
 
 prepare() {
   cd mozc-${_mozcver}+dfsg
+  mkdir -p src/third_party
+  mv ${srcdir}/protobuf-3.5.2 src/third_party/protobuf
   patch -Np1 -i ${srcdir}/usage_dict.txt.patch
-  patch -Np1 -i ${srcdir}/fix-build-with-gcc8.patch
-  patch -Np1 -i ${srcdir}/change-from-python2-code-to-python3.patch
+  patch -Np1 -i ${srcdir}/Fix-build-with-gcc8.patch
+  patch -Np1 -i ${srcdir}/Change-from-python2-code-to-python3.patch
   patch -Np1 -i ${srcdir}/add_support_new_japanese_era.patch
   patch -Np1 -i ${srcdir}/fcitx-mozc-${_fcitxver}.patch
-  cat ${srcdir}/mozcdic-neologd-ut-${_neologddate}.${pkgrel}/mozcdic-*-ut-*.txt >> src/data/dictionary_oss/dictionary00.txt
+
+  # Avoid fcitx5 build errors
+  rm -rf src/unix/fcitx5/
+
+  # Add a neologd dictionary
+  #cat ${srcdir}/mozcdic-neologd-ut-${_neologddate}.${pkgrel}/mozcdic-*-ut-*.txt >> src/data/dictionary_oss/dictionary00.txt
+  cat ${srcdir}/mozcdic-neologd-ut-${_neologddate}.1/mozcdic-*-ut-*.txt >> src/data/dictionary_oss/dictionary00.txt
 }
 
 build() {
   cd mozc-${_mozcver}+dfsg/src
 
-  # Avoid fcitx5 build errors
-  rm -rf unix/fcitx5/
-
   _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool renderer/renderer.gyp:mozc_renderer unix/fcitx/fcitx.gyp:fcitx-mozc unix/fcitx/fcitx.gyp:gen_fcitx_mozc_i18n"
 
-  GYP_DEFINES="use_libprotobuf=1 use_libzinnia=1 document_dir=/usr/share/licenses/mozc" python build_mozc.py gyp --gypdir=/usr/bin --target_platform=Linux
+  GYP_DEFINES="use_libzinnia=1 document_dir=/usr/share/licenses/mozc" python build_mozc.py gyp --gypdir=/usr/bin --target_platform=Linux
   python build_mozc.py build -c $_bldtype $_targets
 }
 
@@ -68,7 +75,7 @@ package_mozc-neologd-ut() {
   pkgdesc="A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
   arch=('i686' 'x86_64')
   depends=('qt5-base' 'zinnia')
-  conflicts=('fcitx-mozc' 'mozc' 'fcitx-mozc-ut2' 'mozc-ut2' 'fcitx-mozc-ut' 'mozc-ut' 'fcitx-mozc-neologd-ut+ut2')
+  conflicts=('fcitx-mozc' 'mozc' 'fcitx-mozc-ut2' 'mozc-ut2' 'fcitx-mozc-ut' 'mozc-ut')
   cd mozc-${_mozcver}+dfsg/src
   install -D -m 755 out_linux/${_bldtype}/mozc_server "${pkgdir}/usr/lib/mozc/mozc_server"
   install    -m 755 out_linux/${_bldtype}/mozc_tool   "${pkgdir}/usr/lib/mozc/mozc_tool"