From 1307f7fce59966c2445188122b5318e8ff37f248 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 4 Mar 2022 16:31:33 +0100 Subject: [PATCH] git subrepo pull mozc-ut-united subrepo: subdir: "mozc-ut-united" merged: "de9a94b" upstream: origin: "https://aur.archlinux.org/mozc-ut-united.git" branch: "master" commit: "de9a94b" git-subrepo: version: "0.4.3" origin: "???" commit: "???" --- mozc-ut-united/.SRCINFO | 7 ++++--- mozc-ut-united/.gitrepo | 4 ++-- mozc-ut-united/PKGBUILD | 11 +++++------ mozc-ut-united/android-fix.patch | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mozc-ut-united/.SRCINFO b/mozc-ut-united/.SRCINFO index 5a6b9e8..5a46db3 100644 --- a/mozc-ut-united/.SRCINFO +++ b/mozc-ut-united/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mozc-ut-united pkgdesc = A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input) - pkgver = 2.26.4610.102_20220112_2018.02.26.r231.g7329757e + pkgver = 2.26.4646.102_20220216_2018.02.26.r273.g182fa232 pkgrel = 2 url = https://osdn.net/users/utuhiro/pf/utuhiro/files/ arch = i686 @@ -14,10 +14,11 @@ pkgbase = mozc-ut-united makedepends = clang makedepends = zinnia makedepends = bazel + makedepends = python-six depends = qt5-base depends = zinnia source = mozc::git+https://github.com/google/mozc.git - source = https://osdn.net/downloads/users/37/37585/mozcdic-ut-20220112.tar.bz2 + source = https://osdn.net/downloads/users/37/37720/mozcdic-ut-20220216.tar.bz2 source = config-arch-new.patch source = git+https://chromium.googlesource.com/breakpad/breakpad source = git+https://github.com/google/googletest.git @@ -46,7 +47,7 @@ pkgname = mozc-ut-united depends = qt5-base depends = zinnia optdepends = tegaki-models-zinnia-japanese: hand-writing recognition support - provides = mozc=2.26.4610.102 + provides = mozc=2.26.4646.102 conflicts = mozc conflicts = mozc-ut-unified conflicts = mozc-neologd-ut diff --git a/mozc-ut-united/.gitrepo b/mozc-ut-united/.gitrepo index ae1b8b3..d1379ce 100644 --- a/mozc-ut-united/.gitrepo +++ b/mozc-ut-united/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://aur.archlinux.org/mozc-ut-united.git branch = master - commit = cc55e98aed4469e7eb547317200ccf82320e267e - parent = ece221b27b2f25638073185294fb59d621217014 + commit = de9a94b0b3820d3697e8e0cde985a6637897607d + parent = 04d2a2eb5492064b302e359268884fa2897a5f24 method = merge cmdver = 0.4.3 diff --git a/mozc-ut-united/PKGBUILD b/mozc-ut-united/PKGBUILD index 1864cda..6affa5e 100644 --- a/mozc-ut-united/PKGBUILD +++ b/mozc-ut-united/PKGBUILD @@ -23,22 +23,21 @@ _bldtype=Release # https://osdn.net/users/utuhiro/pf/utuhiro/files/ #************************************************************* -#_mozcrev=c914d1dfe8b4193731b22da7ee3f53612a94269d -_mozcver=2.26.4610.102 -_utdicdate=20220112 +_mozcver=2.26.4646.102 +_utdicdate=20220216 _utdicver=1 pkgbase=mozc-ut-united pkgname=mozc-ut-united true && pkgname=('mozc-ut-united') -pkgver=2.26.4610.102_20220112_2018.02.26.r231.g7329757e +pkgver=2.26.4646.102_20220216_2018.02.26.r273.g182fa232 pkgrel=2 arch=('i686' 'x86_64') url="https://code.google.com/p/mozc/" url="https://osdn.net/users/utuhiro/pf/utuhiro/files/" license=('BSD' 'GPL' 'custom') -makedepends=('ruby' 'git' 'ninja' 'clang' 'zinnia' 'bazel') -source=("mozc::git+https://github.com/google/mozc.git" "https://osdn.net/downloads/users/37/37585/mozcdic-ut-${_utdicdate}.tar.bz2" "config-arch-new.patch" "git+https://chromium.googlesource.com/breakpad/breakpad" "git+https://github.com/google/googletest.git" "git+https://chromium.googlesource.com/external/gyp" "git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git" "git+https://github.com/open-source-parsers/jsoncpp.git" "git+https://github.com/google/protobuf.git" "git+https://github.com/abseil/abseil-cpp.git" "android-fix.patch") +makedepends=('ruby' 'git' 'ninja' 'clang' 'zinnia' 'bazel' 'python-six') +source=("mozc::git+https://github.com/google/mozc.git" "https://osdn.net/downloads/users/37/37720/mozcdic-ut-${_utdicdate}.tar.bz2" "config-arch-new.patch" "git+https://chromium.googlesource.com/breakpad/breakpad" "git+https://github.com/google/googletest.git" "git+https://chromium.googlesource.com/external/gyp" "git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git" "git+https://github.com/open-source-parsers/jsoncpp.git" "git+https://github.com/google/protobuf.git" "git+https://github.com/abseil/abseil-cpp.git" "android-fix.patch") sha1sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') diff --git a/mozc-ut-united/android-fix.patch b/mozc-ut-united/android-fix.patch index 76e4717..87ec806 100644 --- a/mozc-ut-united/android-fix.patch +++ b/mozc-ut-united/android-fix.patch @@ -1,16 +1,16 @@ ---- WORKSPACE.bazel 2022-01-31 15:44:11.510958782 -0500 -+++ WORKSPACE-new.bazel 2022-01-31 15:48:42.861958776 -0500 +--- WORKSPACE.bazel 2022-01-31 15:44:11.510958782 -0500 ++++ WORKSPACE-new.bazel 2022-01-31 15:48:42.861958776 -0500 @@ -5,11 +5,11 @@ load("//:config.bzl", "QT_BASE_PATH") - - # This rule reffers $ANDROID_SDK_HOME + + # This rule refers to $ANDROID_SDK_HOME. -android_sdk_repository(name = "androidsdk") +#android_sdk_repository(name = "androidsdk") - + # Android NDK version should be r11c+ for Abseil. - # This rule reffers $ANDROID_NDK_HOME + # This rule refers to $ANDROID_NDK_HOME. -android_ndk_repository(name = "androidndk") +#android_ndk_repository(name = "androidndk") - + local_repository( name = "com_google_absl",