[arch-commits] Commit in fcitx5-mozc/trunk (PKGBUILD)

2020-12-14 Thread Jiachen Yang via arch-commits 
Date: Tuesday, December 15, 2020 @ 03:14:10
  Author: farseerfc
Revision: 775830

upgpkg: fcitx5-mozc 2.26.4220.102.g1882e33-1: fcitx5-mozc 2.26.4220

Modified:
  fcitx5-mozc/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-15 02:53:34 UTC (rev 775829)
+++ PKGBUILD2020-12-15 03:14:10 UTC (rev 775830)
@@ -5,8 +5,9 @@
 
 ## Mozc compile option
 _bldtype=Release
-_mozc_commit=e7a97d0
+_mozc_commit=1882e33
 
+## follow the submodule commits in 
https://github.com/fcitx/mozc/tree/fcitx/src/third_party
 _abseil_cpp_commit=0f3bb46
 _breakpad_commit=216cea7
 _gtest_commit=703bd9c
@@ -15,12 +16,13 @@
 _jsoncpp_commit=11086dd
 _protobuf_commit=fde7cf7
 
+## the latest release from https://osdn.net/projects/ponsfoot-aur/storage/mozc/
 _zipcode_rel=202011
 
 _pkgbase=mozc
 pkgname=fcitx5-mozc
 pkgdesc="Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, 
Mac and Linux (the Open Source Edition of Google Japanese Input)"
-pkgver=2.26.4206.102.e7a97d0
+pkgver=2.26.4220.102.g1882e33
 pkgrel=1
 arch=('x86_64')
 url="https://github.com/google/mozc;
@@ -57,7 +59,7 @@
   # change pkgver is OK because we fixed commit
   # parse major.minor.buildid from version template, revision is fixed to 102 
for Linux
   _bzr_ver=$(sed 's/ //g;$ a echo $MAJOR.$MINOR.$BUILD.102' 
src/data/version/mozc_version_template.bzl | source /dev/stdin)
-  printf "%s.%s" "${_bzr_ver}" "${_mozc_commit}"
+  printf "%s.g%s" "${_bzr_ver}" "${_mozc_commit}"
 }
 
 prepare() {
@@ -72,9 +74,6 @@
   git config submodule.src/third_party/abseil-cpp.url "$srcdir/abseil-cpp"
   git submodule update
 
-  ## fix icon install
-  sed 
's|32x32/apps/fcitx-mozc-alpha-full.png|48x48/apps/fcitx-mozc-alpha-full.png|' 
-i scripts/install_fcitx5_icons
-
   cd src
   # Generate zip code seed
   echo "Generating zip code seed..."
@@ -84,9 +83,6 @@
   # disable fcitx4 target
   rm unix/fcitx/fcitx.gyp
   
-  # fix mozc icon for kimpanel
-  sed -i "s|PREFIX|/usr|" unix/fcitx5/mozc.conf
-
   ## use libstdc++ instead of libc++
   sed "/stdlib=libc++/d;/-lc++/d" -i gyp/common.gypi
 }

[arch-commits] Commit in fcitx5-mozc/trunk (PKGBUILD)

2020-12-13 Thread Jiachen Yang via arch-commits 
Date: Monday, December 14, 2020 @ 07:04:23
  Author: farseerfc
Revision: 774838

upgpkg: fcitx5-mozc 2.26.4206.102.e7a97d0-1: fcitx5-mozc 2.26.4206

Modified:
  fcitx5-mozc/trunk/PKGBUILD

--+
 PKGBUILD |   63 ++---
 1 file changed, 27 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-14 05:11:20 UTC (rev 774837)
+++ PKGBUILD2020-12-14 07:04:23 UTC (rev 774838)
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Jiachen Yang 
 # Contributor: Felix Yan 
 # Contributor: ponsfoot 
@@ -5,25 +4,23 @@
 # Contributor: UTUMI Hirosi 
 
 ## Mozc compile option
-_bldtype=Debug
-_mozc_commit=a79768d
-_japanese_usage_dictionary_commit=a4a6677
-_breakpad_commit=78180df
-_gtest_commit=fbef071
+_bldtype=Release
+_mozc_commit=e7a97d0
+
+_abseil_cpp_commit=0f3bb46
+_breakpad_commit=216cea7
+_gtest_commit=703bd9c
 _gyp_commit=caa6002
-_jsoncpp_commit=8954092
-_protobuf_commit=87f1d9e
-_zinnia_commit=581faa8
-_abseil_cpp_commit=a479881
+_japanese_usage_dictionary_commit=e5b3425
+_jsoncpp_commit=11086dd
+_protobuf_commit=fde7cf7
 
+_zipcode_rel=202011
 
-
-_zipcode_rel=201810
-
 _pkgbase=mozc
 pkgname=fcitx5-mozc
 pkgdesc="Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, 
Mac and Linux (the Open Source Edition of Google Japanese Input)"
-pkgver=2.25.4150.102+0.0.0.20201110
+pkgver=2.26.4206.102.e7a97d0
 pkgrel=1
 arch=('x86_64')
 url="https://github.com/google/mozc;
@@ -33,9 +30,8 @@
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx' 'fcitx-mozc')
 source=(git+https://github.com/fcitx/mozc.git#commit=${_mozc_commit}
-
https://downloads.sourceforge.net/pnsft-aur/x-ken-all-${_zipcode_rel}.zip
-
https://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcode_rel}.zip
-https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
+
https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${_zipcode_rel}.zip
+
https://osdn.net/projects/ponsfoot-aur/storage/mozc/x-ken-all-${_zipcode_rel}.zip
 
git+https://chromium.googlesource.com/breakpad/breakpad#commit=${_breakpad_commit}
 git+https://github.com/google/googletest.git#commit=${_gtest_commit}
 
git+https://chromium.googlesource.com/external/gyp#commit=${_gyp_commit}
@@ -42,13 +38,11 @@
 
git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git#commit=${_japanese_usage_dictionary_commit}
 
git+https://github.com/open-source-parsers/jsoncpp.git#commit=${_jsoncpp_commit}
 git+https://github.com/google/protobuf.git#commit=${_protobuf_commit}
-git+https://github.com/taku910/zinnia.git#commit=${_zinnia_commit}
 
git+https://github.com/abseil/abseil-cpp.git#commit=${_abseil_cpp_commit}
)
 sha512sums=('SKIP'
-
'59d0a5e62c698ebc64008f1fb2ed68ebbbd7798d9d95f2e4852261fb09d53e9f8c102f385ed8f2001e3da6c2a0a50d64f1f20e70671948b492f972c487655efe'
-
'daf41f63bd1afc0937beb12aa007ead8a239fabc3af2237e4adf75238b0e0e520f6051f5a98d413a541f901e17a1488eb3fad6d0bba1f1561987365236d64146'
-
'5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a'
+
'0ef2d0abd9744900f9a50f941cf1f9b47640f3643c14a1be1761bcf0bd1053cb93560203c25280f58fccbd8ec98b9ca2e21c5d5a59844bbbffc9c988dfcf7bed'
+
'8a35672b4a525d8e4f3303bd83c6bf6075cd4f10e703bf656a4c9328f18a8783c3049b749092e6e8be57eaddce4f889e9dacae9b3b72ba7bb9240a0f5a93fd34'
 'SKIP'
 'SKIP'
 'SKIP'
@@ -55,10 +49,17 @@
 'SKIP'
 'SKIP'
 'SKIP'
-'SKIP'
 'SKIP')
 validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9')  # Weng Xuetian
 
+pkgver(){
+  cd mozc
+  # change pkgver is OK because we fixed commit
+  # parse major.minor.buildid from version template, revision is fixed to 102 
for Linux
+  _bzr_ver=$(sed 's/ //g;$ a echo $MAJOR.$MINOR.$BUILD.102' 
src/data/version/mozc_version_template.bzl | source /dev/stdin)
+  printf "%s.%s" "${_bzr_ver}" "${_mozc_commit}"
+}
+
 prepare() {
   cd "$srcdir/mozc"
   git submodule init
@@ -68,10 +69,12 @@
   git config submodule.src/third_party/japanese_usage_dictionary.url 
"$srcdir/japanese-usage-dictionary"
   git config submodule.src/third_party/jsoncpp.url "$srcdir/jsoncpp"
   git config submodule.src/third_party/protobuf.url "$srcdir/protobuf"
-  git config submodule.src/third_party/zinnia.url "$srcdir/zinnia"
   git config submodule.src/third_party/abseil-cpp.url "$srcdir/abseil-cpp"
   git submodule update
 
+  ## fix icon install
+  sed 
's|32x32/apps/fcitx-mozc-alpha-full.png|48x48/apps/fcitx-mozc-alpha-full.png|' 
-i scripts/install_fcitx5_icons
+
   cd src
   # Generate zip code seed
   echo "Generating zip code seed..."
@@ -107,6 +110,7 @@
 package() {
   cd mozc/src

[arch-commits] Commit in fcitx5-mozc/trunk (PKGBUILD)

2020-11-09 Thread Jiachen Yang via arch-commits 
Date: Tuesday, November 10, 2020 @ 04:12:57
  Author: farseerfc
Revision: 748560

upgpkg: fcitx5-mozc 2.25.4150.102+0.0.0.20201110-1: fcitx5-mozc add back from 
AUR

Modified:
  fcitx5-mozc/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-10 04:12:46 UTC (rev 748559)
+++ PKGBUILD2020-11-10 04:12:57 UTC (rev 748560)
@@ -5,7 +5,7 @@
 # Contributor: UTUMI Hirosi 
 
 ## Mozc compile option
-_bldtype=Release
+_bldtype=Debug
 _mozc_commit=a79768d
 _japanese_usage_dictionary_commit=a4a6677
 _breakpad_commit=78180df