Date: Monday, December 14, 2020 @ 07:11:26 Author: farseerfc Revision: 774840
upgpkg: fcitx-mozc 2.26.4206.102.e7a97d0-1: fcitx-mozc 2.26.4206 Modified: fcitx-mozc/trunk/PKGBUILD ----------+ PKGBUILD | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-14 07:04:56 UTC (rev 774839) +++ PKGBUILD 2020-12-14 07:11:26 UTC (rev 774840) @@ -1,4 +1,3 @@ -# $Id$ # Maintainer: Jiachen Yang <[email protected]> # Contributor: Felix Yan <[email protected]> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> @@ -6,25 +5,23 @@ ## Mozc compile option _bldtype=Debug -_mozc_commit=a79768d -_japanese_usage_dictionary_commit=a4a6677 -_breakpad_commit=78180df -_gtest_commit=fbef071 +_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=fcitx-mozc pkgdesc="Fcitx 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 -pkgrel=2 +pkgver=2.26.4206.102.e7a97d0 +pkgrel=1 arch=('x86_64') url="https://github.com/google/mozc"; license=('custom') @@ -33,9 +30,9 @@ replaces=('mozc-fcitx') conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx' 'fcitx5-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 + https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz 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,12 +39,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' + '0ef2d0abd9744900f9a50f941cf1f9b47640f3643c14a1be1761bcf0bd1053cb93560203c25280f58fccbd8ec98b9ca2e21c5d5a59844bbbffc9c988dfcf7bed' + '8a35672b4a525d8e4f3303bd83c6bf6075cd4f10e703bf656a4c9328f18a8783c3049b749092e6e8be57eaddce4f889e9dacae9b3b72ba7bb9240a0f5a93fd34' '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a' 'SKIP' 'SKIP' @@ -55,10 +51,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,7 +71,6 @@ 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 @@ -81,9 +83,6 @@ # disable fcitx5 target rm unix/fcitx5/fcitx5.gyp - # fix mozc icon for kimpanel - sed -i "s|PREFIX|/usr|" unix/fcitx/mozc.conf - ## use libstdc++ instead of libc++ sed "/stdlib=libc++/d;/-lc++/d" -i gyp/common.gypi } @@ -92,6 +91,7 @@ # Fix compatibility with google-glog 0.3.3 (symbol conflict) CFLAGS="${CFLAGS} -fvisibility=hidden" CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" + export _bldtype cd mozc/src @@ -107,6 +107,7 @@ package() { cd mozc/src export PREFIX="${pkgdir}/usr" + export _bldtype ../scripts/install_server install -d "${pkgdir}/usr/share/licenses/$pkgname/" @@ -116,14 +117,14 @@ install -d "${PREFIX}/share/fcitx/inputmethod" install -d "${PREFIX}/lib/fcitx" - for mofile in out_linux/Debug/gen/unix/fcitx/po/*.mo + for mofile in out_linux/${_bldtype}/gen/unix/fcitx/po/*.mo do filename=`basename $mofile` lang=${filename/.mo/} install -D -m 644 "$mofile" "${PREFIX}/share/locale/$lang/LC_MESSAGES/fcitx-mozc.mo" done - - install -m 755 out_linux/Debug/fcitx-mozc.so ${PREFIX}/lib/fcitx/ + + install -m 755 out_linux/${_bldtype}/fcitx-mozc.so ${PREFIX}/lib/fcitx/ install -m 644 unix/fcitx/fcitx-mozc.conf ${PREFIX}/share/fcitx/addon/ install -m 644 unix/fcitx/mozc.conf ${PREFIX}/share/fcitx/inputmethod/ @@ -138,5 +139,4 @@ install -m 644 "$srcdir/fcitx-mozc-icons/mozc-dictionary.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png" install -m 644 "$srcdir/fcitx-mozc-icons/mozc-properties.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png" install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" - }
