From 3ef5b58901a868008f2a75325347368c9371b69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 10 Aug 2022 18:12:50 +0700 Subject: [PATCH] mozc: update to 2.28.4800.102. --- srcpkgs/mozc/patches/absl-20211102.patch | 11 ---------- srcpkgs/mozc/patches/common.patch | 2 +- srcpkgs/mozc/patches/conflict-macro.patch | 13 ------------ srcpkgs/mozc/patches/gyp-py310.patch | 20 ----------------- srcpkgs/mozc/template | 26 +++++++++++++---------- 5 files changed, 16 insertions(+), 56 deletions(-) delete mode 100644 srcpkgs/mozc/patches/absl-20211102.patch delete mode 100644 srcpkgs/mozc/patches/conflict-macro.patch delete mode 100644 srcpkgs/mozc/patches/gyp-py310.patch diff --git a/srcpkgs/mozc/patches/absl-20211102.patch b/srcpkgs/mozc/patches/absl-20211102.patch deleted file mode 100644 index 9cdaf56273d..00000000000 --- a/srcpkgs/mozc/patches/absl-20211102.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/mozc/src/unix/fcitx/fcitx_mozc.cc -+++ b/mozc/src/unix/fcitx/fcitx_mozc.cc -@@ -413,7 +413,7 @@ void FcitxMozc::InitializeBar() - ); - - if ( mozc::FileUtil::FileExists ( mozc::FileUtil::JoinPath ( -- mozc::SystemUtil::GetServerDirectory(), mozc::kMozcTool ) ) ) -+ mozc::SystemUtil::GetServerDirectory(), mozc::kMozcTool ) ).ok() ) - { - FcitxUIRegisterComplexStatus(instance, this, - "mozc-tool", diff --git a/srcpkgs/mozc/patches/common.patch b/srcpkgs/mozc/patches/common.patch index dfe16cd30ae..1b7bb395948 100644 --- a/srcpkgs/mozc/patches/common.patch +++ b/srcpkgs/mozc/patches/common.patch @@ -5,7 +5,7 @@ IBUS_MOZC_INSTALL_DIR = "/usr/share/ibus-mozc" IBUS_MOZC_ICON_PATH = IBUS_MOZC_INSTALL_DIR + "/product_icon.png" -IBUS_MOZC_PATH = "/usr/lib/ibus-mozc/ibus-engine-mozc" -+IBUS_MOZC_PATH = "/usr/lib/ibus/ibus-engine-mozc" ++IBUS_MOZC_PATH = "/usr/libexec/ibus-engine-mozc" MACOS_BUNDLE_ID_PREFIX = "org.mozc.inputmethod.Japanese" MACOS_MIN_OS_VER = "10.12" diff --git a/srcpkgs/mozc/patches/conflict-macro.patch b/srcpkgs/mozc/patches/conflict-macro.patch deleted file mode 100644 index 3046feacd03..00000000000 --- a/srcpkgs/mozc/patches/conflict-macro.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/mozc/src/unix/fcitx/surrounding_text_util.cc -+++ b/mozc/src/unix/fcitx/surrounding_text_util.cc -@@ -34,6 +34,10 @@ - #include - #include - -+#ifdef InvokeFunction -+#undef InvokeFunction -+#endif -+ - #include "base/port.h" - #include "base/logging.h" - #include "base/util.h" diff --git a/srcpkgs/mozc/patches/gyp-py310.patch b/srcpkgs/mozc/patches/gyp-py310.patch deleted file mode 100644 index 56600b8514e..00000000000 --- a/srcpkgs/mozc/patches/gyp-py310.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/gyp/pylib/gyp/common.py -+++ b/gyp/pylib/gyp/common.py -@@ -4,7 +4,7 @@ - - from __future__ import with_statement - --import collections -+import collections.abc - import errno - import filecmp - import os.path -@@ -494,7 +494,7 @@ - - - # Based on http://code.activestate.com/recipes/576694/. --class OrderedSet(collections.MutableSet): -+class OrderedSet(collections.abc.MutableSet): - def __init__(self, iterable=None): - self.end = end = [] - end += [None, end, end] # sentinel node for doubly linked list diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index bb7a958dffb..3fdb986b321 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -2,10 +2,12 @@ pkgname=mozc # src/data/version/mozc_version_template.bzl # revision is always 102, template always says 100 ;) -version=2.26.4632.102 -revision=4 -_commit=06024d8567dd96eea7a1745e82a5d699a56f4ba5 +version=2.28.4800.102 +revision=1 +_commit=056163a5fddbb261b258beb8444998e4882f0cc5 _abseil=20211102.0 +_gyp=0.1+20220404git9ecf45e +_jpn_dict=e5b3425575734c323e1d947009dd74709437b684 create_wrksrc=yes build_wrksrc=mozc/src hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel @@ -20,12 +22,12 @@ homepage="https://github.com/google/mozc" distfiles=" https://github.com/fcitx/mozc/archive/$_commit.tar.gz https://github.com/abseil/abseil-cpp/archive/refs/tags/$_abseil.tar.gz - ${DEBIAN_SITE}/main/g/gyp/gyp_0.1+20200513gitcaa6002.orig.tar.gz - https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz + ${DEBIAN_SITE}/main/g/gyp/gyp_$_gyp.orig.tar.xz + https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/$_jpn_dict.tar.gz " -checksum="9a143d83fcd26921c20b00759b0b3d4994b78a0b7570cf818742acb5c45c1527 +checksum="259d87bfd7535ad03bd554185677d7345a90166353a6db0b6a3606183ad2923d dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4 - 8d531bc7d3302461d76a32367453cec60ed08b455f27a53d8f313d81761713a8 + 0325006f012db66dfa27bf7bb048f3fe38f96e512ebe065930cbc70bcdc06bc9 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1" CXXFLAGS="-D_GNU_SOURCE" @@ -58,7 +60,7 @@ post_extract() { do_configure() { GYP_DEFINES=" document_dir=/usr/share/licenses/${pkgname} - ibus_mozc_path=/usr/lib/ibus/ibus-engine-mozc + ibus_mozc_path=/usr/libexec/ibus-engine-mozc use_libprotobuf=1 use_libzinnia=1 ${XBPS_TARGET_NO_ATOMIC8:+use_libatomic=1} @@ -69,7 +71,9 @@ do_build() { local _file _lang local _modir=out_linux/Release/gen/unix/fcitx5/po - python3 build_mozc.py build -c Release \ + python3 build_mozc.py build \ + --use_gyp_for_ibus_build \ + -c Release \ server/server.gyp:mozc_server \ gui/gui.gyp:mozc_tool \ unix/emacs/emacs.gyp:mozc_emacs_helper \ @@ -104,7 +108,7 @@ do_install() { # Qt5 tools vinstall out_linux/Release/mozc_tool 755 usr/lib/mozc # ibus - vinstall out_linux/Release/ibus_mozc 755 usr/lib/ibus ibus-engine-mozc + vinstall out_linux/Release/ibus_mozc 755 usr/libexec ibus-engine-mozc vinstall out_linux/Release/gen/unix/ibus/mozc.xml 644 \ usr/share/ibus/component vinstall data/images/product_icon_32bpp-128.png 644 \ @@ -168,7 +172,7 @@ ibus-mozc_package() { depends="mozc-base-${version}_${revision} ibus>=1.5.14" lib32disabled=yes pkg_install() { - vmove usr/lib/ibus + vmove usr/libexec vmove usr/lib/mozc/mozc_renderer vmove "usr/share/ibus*" }