[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/, app-i18n/mozc/files/
commit: 7ef7e506b561a041e9ae1a66cb0a0a4ba6e009cd
Author: Sam James gentoo org>
AuthorDate: Mon Aug 21 20:14:53 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 21 20:15:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef7e506
app-i18n/mozc: fix build w/ new abseil
Closes: https://bugs.gentoo.org/912776
Signed-off-by: Sam James gentoo.org>
app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch | 15 +++
app-i18n/mozc/mozc-2.28.5029.102.ebuild | 1 +
2 files changed, 16 insertions(+)
diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch
b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch
new file mode 100644
index ..08421910d098
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/912776
+Adapted from
https://src.fedoraproject.org/rpms/mozc/raw/aa3cba136c9a28e176d246f450465d3a8a4e8533/f/mozc-build-new-abseil.patch
+--- a/src/base/init_mozc.cc
b/src/base/init_mozc.cc
+@@ -87,7 +87,10 @@ std::string GetLogFilePathFromProgramName(const std::string
&program_name) {
+ void ParseCommandLineFlags(int argc, char **argv) {
+ absl::flags_internal::ParseCommandLineImpl(
+ argc, argv,
++ #if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION <
20230802
++ // Abseil 20230802.0 does not use ArgvListAction
+ absl::flags_internal::ArgvListAction::kRemoveParsedArgs,
++ #endif
+ // Suppress help messages invoked by --help and others.
+ // Use UsageFlagsAction::kHandleUsage to enable it.
+ absl::flags_internal::UsageFlagsAction::kIgnoreUsage,
diff --git a/app-i18n/mozc/mozc-2.28.5029.102.ebuild
b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
index ee6de0134b29..a6790b3d1213 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
@@ -118,6 +118,7 @@ SITEFILE="50${PN}-gentoo.el"
PATCHES=(
"${WORKDIR}"/mozc-2.28.5029.102-patches
+ "${FILESDIR}"/mozc-2.28.5029.102-abseil.patch
)
python_check_deps() {
[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/, app-i18n/mozc/files/
commit: 0bc62bb09a1a8ef9db031b3c5de6ea11935cc3ad
Author: Joonas Niilola gentoo org>
AuthorDate: Sun Nov 15 15:26:51 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Nov 15 15:31:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc62bb0
app-i18n/mozc: fix SizeViolation issue
Closes: https://bugs.gentoo.org/748150
Signed-off-by: Joonas Niilola gentoo.org>
app-i18n/mozc/Manifest |1 +
...protobuf_generated_classes_no_inheritance.patch | 1039
app-i18n/mozc/mozc-2.23.2815.102.ebuild|3 +-
app-i18n/mozc/mozc-.ebuild |3 +-
4 files changed, 5 insertions(+), 1041 deletions(-)
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 2bd43342203..72d8dc73f38 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,3 +1,4 @@
DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B
709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3
SHA512
e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B
08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1
SHA512
b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
+DIST mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296
BLAKE2B
982f43fa68031eb0f779ec4d034fef838a4fce7834291db889c9edffba3df4acd5bfdf187dd4a52ee8fd0714de943f9d5112070cd69502e1449dab4dbf8543b2
SHA512
6e05b2f22663ddbfb24a8344928ec24c0b4cf523728c1623367970b8f263142af95c056c82d0827414833d5b9f26c3a024a04a688851021601a5cbcc1474e754
DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B
045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6
SHA512
a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
diff --git
a/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
b/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
deleted file mode 100644
index 2cd75728154..000
---
a/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
+++ /dev/null
@@ -1,1039 +0,0 @@
-https://github.com/google/mozc/issues/460
-
/src/dictionary/user_dictionary.cc
-+++ /src/dictionary/user_dictionary.cc
-@@ -289,7 +289,7 @@
- }
-
- auto_register_mode_ = false;
--dic_->Load(*(storage.get()));
-+dic_->Load(storage.get()->user_dictionary_storage_base);
- }
-
- private:
/src/dictionary/user_dictionary_session.cc
-+++ /src/dictionary/user_dictionary_session.cc
-@@ -69,11 +69,11 @@
- }
-
- virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
--if (storage->dictionaries_size() == 0) {
-+if (storage->user_dictionary_storage_base.dictionaries_size() == 0) {
- return false;
- }
-
--storage->mutable_dictionaries()->RemoveLast();
-+
storage->user_dictionary_storage_base.mutable_dictionaries()->RemoveLast();
- return true;
- }
-
-@@ -94,7 +94,7 @@
- }
-
- RepeatedPtrField *dictionaries =
--storage->mutable_dictionaries();
-+storage->user_dictionary_storage_base.mutable_dictionaries();
- dictionaries->AddAllocated(dictionary_.release());
-
- // Adjust the position of the reverted dictionary.
-@@ -120,10 +120,10 @@
- }
-
- virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
--if (storage->dictionaries_size() != 1) {
-+if (storage->user_dictionary_storage_base.dictionaries_size() != 1) {
- return false;
- }
--dictionary_->Swap(storage->mutable_dictionaries(0));
-+
dictionary_->Swap(storage->user_dictionary_storage_base.mutable_dictionaries(0));
- return true;
- }
-
-@@ -144,7 +144,7 @@
- virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
- UserDictionary *dictionary =
- UserDictionaryUtil::GetMutableUserDictionaryById(
--storage, dictionary_id_);
-+&storage->user_dictionary_storage_base, dictionary_id_);
- if (dictionary == NULL) {
- return false;
- }
-@@ -169,7 +169,7 @@
- virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
- UserDictionary *dictionary =
- UserDictionaryUtil::GetMutableUserDictionaryById(
--storage, dictionary_id_);
-+&storage->user_dictionary_storage_base, dictionary_id_);
- if (dictionary == NULL || dictionary->entries_size() == 0) {
- return false;
- }
-@@ -195,7 +195,7 @@
- virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-
[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/, app-i18n/mozc/files/
commit: a1ff8a4ff637d2a7a8ed60297ab90fe8bdc7fb46
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Fri Jan 17 17:39:29 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Jan 17 19:08:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ff8a4f
app-i18n/mozc: Use Python 3.
Closes: https://bugs.gentoo.org/695006
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Mike Gilbert gentoo.org>
.../mozc/files/mozc-2.23.2815.102-python-3_1.patch | 621 +
.../mozc/files/mozc-2.23.2815.102-python-3_2.patch | 600
.../mozc/files/mozc-2.23.2815.102-python-3_3.patch | 583 +++
.../mozc/files/mozc-2.23.2815.102-python-3_4.patch | 537 ++
app-i18n/mozc/mozc-2.23.2815.102.ebuild| 8 +-
app-i18n/mozc/mozc-.ebuild | 8 +-
6 files changed, 2353 insertions(+), 4 deletions(-)
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_1.patch
b/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_1.patch
new file mode 100644
index 000..2b9bbd720cd
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_1.patch
@@ -0,0 +1,621 @@
+https://github.com/google/mozc/issues/462
+
+--- /src/base/gen_character_set.py
/src/base/gen_character_set.py
+@@ -33,7 +33,6 @@
+ import itertools
+ import optparse
+ import re
+-import string
+ import sys
+
+
+@@ -89,7 +88,8 @@
+ @staticmethod
+ def _LoadTable(filename, column_index, pattern, validater):
+ result = set()
+-for line in open(filename):
++fh = open(filename)
++for line in fh:
+ if line.startswith('#'):
+ # Skip a comment line.
+ continue
+@@ -100,6 +100,7 @@
+ ucs = int(match.group(1), 16)
+ if validater(ucs):
+ result.add(ucs)
++fh.close()
+
+ return result
+
+@@ -250,7 +251,7 @@
+ # (at most) four code points.
+ bit_list = []
+ for _, group in itertools.groupby(enumerate(category_list),
+-lambda (codepoint, _): codepoint / 4):
++lambda x: x[0] // 4):
+ # Fill bits from LSB to MSB for each group.
+ bits = 0
+ for index, (_, category) in enumerate(group):
+@@ -263,7 +264,7 @@
+
+ # Output the content. Each line would have (at most) 16 bytes.
+ for _, group in itertools.groupby(enumerate(bit_list),
+-lambda (index, _): index / 16):
++lambda x: x[0] // 16):
+ line = ['\"']
+ for _, bits in group:
+ line.append('\\x%02X' % bits)
+@@ -386,7 +387,7 @@
+ # Bitmap lookup.
+ # TODO(hidehiko): the bitmap has two huge 0-bits ranges. Reduce them.
+ category_map = [
+- (bits, category) for category, bits in CATEGORY_BITMAP.iteritems()]
++ (bits, category) for category, bits in CATEGORY_BITMAP.items()]
+ category_map.sort()
+
+ lines.extend([
+@@ -451,7 +452,7 @@
+ options.jisx0213file)
+ category_list = [
+ categorizer.GetCategory(codepoint)
+- for codepoint in xrange(categorizer.MaxCodePoint() + 1)]
++ for codepoint in range(categorizer.MaxCodePoint() + 1)]
+ generated_character_set_header = GenerateCharacterSetHeader(category_list)
+
+ # Write the result.
+--- /src/base/gen_config_file_stream_data.py
/src/base/gen_config_file_stream_data.py
+@@ -58,7 +58,7 @@
+ result = []
+ result.append(' { "%s", "' % os.path.basename(path))
+ with open(path, 'rb') as stream:
+-result.extend(r'\x%02X' % ord(byte) for byte in stream.read())
++result.extend(r'\x%02X' % byte for byte in stream.read())
+ result.append('", %d }' % os.path.getsize(path))
+
+ return ''.join(result)
+@@ -93,8 +93,8 @@
+ def main():
+ (options, args) = ParseOptions()
+ if not options.output:
+-print >>sys.stderr, (
+-'usage: gen_config_file_stream_data.py --output=filepath input ...')
++print('usage: gen_config_file_stream_data.py --output=filepath input ...',
++ file=sys.stderr)
+ sys.exit(2)
+
+ with open(options.output, 'w') as output:
+--- /src/build_mozc.py
/src/build_mozc.py
+@@ -943,7 +943,7 @@
+ logging.info('running %s...', binary)
+ try:
+ test_function(binary, gtest_report_dir, options)
+- except RunOrDieError, e:
++ except RunOrDieError as e:
+ logging.error(e)
+ failed_tests.append(binary)
+ else:
+@@ -1082,7 +1082,7 @@
+ # and '-c' and 'Release' are build options.
+ targets = []
+ build_options = []
+- for i in xrange(len(args)):
++ for i in range(len(args)):
+ if args[i].startswith('-'):
+ # starting with build options
+ build_options = args[i:]
+@@ -1190,14 +1190,14 @@
+
+ def ShowHelpAndExit():
+ """Shows the help message."""
+- print 'Usage: build_mozc.py COMMAND [ARGS]'
+- print 'Commands: '
+- print '
[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/, app-i18n/mozc/files/
commit: c4eebe84bd56d0a695538ecdc0f4d319bfd26942
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Thu Aug 15 18:32:47 2019 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Aug 16 17:02:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4eebe84
app-i18n/mozc: Add some support for 令和 (Reiwa).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Mike Gilbert gentoo.org>
app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch | 35 ++
app-i18n/mozc/mozc-2.23.2815.102.ebuild| 1 +
app-i18n/mozc/mozc-.ebuild | 1 +
3 files changed, 37 insertions(+)
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch
b/app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch
new file mode 100644
index 000..561a989a41d
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch
@@ -0,0 +1,35 @@
+https://github.com/google/mozc/issues/461
+
+--- /src/data/symbol/categorized.tsv
/src/data/symbol/categorized.tsv
+@@ -405,6 +405,7 @@
+ ㍽ MATHたいしょう ねんごう
+ ㍼ MATHしょうわ ねんごう
+ ㍻ MATHへいせい ねんごう
++㋿ MATHれいわ ねんごう
+
+ ㌣ MATHせんと たんい
+ ㌦ MATHどる たんい
+--- /src/data/symbol/symbol.tsv
/src/data/symbol/symbol.tsv
+@@ -528,6 +528,7 @@
+ 記号㊦ した げ丸下
+ 記号㊧ ひだり 丸左
+ 記号㊨ みぎ 丸右
++記号㋿ れいわ ねんごう年号 OTHER
+ 記号㍻ へいせい ねんごう 年号 OTHER
+ 記号㍼ しょうわ ねんごう 年号 OTHER
+ 記号㍽ たいしょう ねんごう 年号 OTHER
+--- /src/rewriter/date_rewriter.cc
/src/rewriter/date_rewriter.cc
+@@ -1239,6 +1239,10 @@
+ 1989,
+ "平成",
+ "へいせい",
++ }, {
++2019,
++"令和",
++"れいわ",
+ }
+ };
+
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 3aed7d8c7b6..f198c294cea 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -108,6 +108,7 @@ src_prepare() {
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
eapply -p2
"${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+ eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
diff --git a/app-i18n/mozc/mozc-.ebuild b/app-i18n/mozc/mozc-.ebuild
index 85d5fbb98be..037a8d2d256 100644
--- a/app-i18n/mozc/mozc-.ebuild
+++ b/app-i18n/mozc/mozc-.ebuild
@@ -108,6 +108,7 @@ src_prepare() {
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
eapply -p2
"${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+ eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/, app-i18n/mozc/files/
commit: 98bf7ee366d684da3a54769b7be702a4355b123c
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Wed Jun 13 08:17:32 2018 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Jun 13 14:36:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98bf7ee3
app-i18n/mozc: Delete old version (2.20.2673.102).
app-i18n/mozc/Manifest | 2 -
app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch | 11 -
.../mozc-2.20.2673.102-system_libraries.patch | 291 ---
app-i18n/mozc/mozc-2.20.2673.102.ebuild| 321 -
4 files changed, 625 deletions(-)
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index a85a1186efc..2bd43342203 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,5 +1,3 @@
-DIST fcitx-mozc-2.18.2612.102.1.patch 140722 BLAKE2B
a412b8dd94bcf44f7fd946bcc1072f3dde7d8d8da55d3ad04ef5d8ef851a63f4d4d8e7e6249172a9d1e75e1f1672e32e6a673e6016d94b034f80d23b660a80e2
SHA512
725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb
DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B
709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3
SHA512
e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B
08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1
SHA512
b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
-DIST mozc-2.20.2673.102.tar.gz 48624369 BLAKE2B
0d80065f989c1f61e5f2852e7f471dd83777323b21499c118dc87f4fd6596329ab096dd64db3419895090ab61d6aef9a07e61c7fddeaf4f3a40ce3f3acbad949
SHA512
ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae
DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B
045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6
SHA512
a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
b/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
deleted file mode 100644
index b8b2bf1808e..000
--- a/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
/src/prediction/user_history_predictor.cc
-+++ /src/prediction/user_history_predictor.cc
-@@ -841,7 +841,7 @@
- // swap.
- if (i + 1 < prefix.size()) {
- string swapped_prefix = prefix;
--swap(swapped_prefix[i], swapped_prefix[i + 1]);
-+std::swap(swapped_prefix[i], swapped_prefix[i + 1]);
- if (Util::StartsWith(str, swapped_prefix)) {
- return true;
- }
diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-system_libraries.patch
b/app-i18n/mozc/files/mozc-2.20.2673.102-system_libraries.patch
deleted file mode 100644
index 2b2828b7999..000
--- a/app-i18n/mozc/files/mozc-2.20.2673.102-system_libraries.patch
+++ /dev/null
@@ -1,291 +0,0 @@
/src/gyp/defines.gypi
-+++ /src/gyp/defines.gypi
-@@ -71,6 +71,12 @@
- # use_libibus represents if ibus library is used or not.
- # This option is only for Linux.
- 'use_libibus%': '0',
-+
-+# use_libgtest represents if gtest library is used or not.
-+'use_libgtest%': '0',
-+
-+# use_libjsoncpp represents if jsoncpp library is used or not.
-+'use_libjsoncpp%': '0',
- },
- 'target_defaults': {
- 'defines': [
/src/net/jsoncpp.gyp
-+++ /src/net/jsoncpp.gyp
-@@ -31,32 +31,57 @@
- 'targets': [
- {
- 'target_name': 'jsoncpp',
-- 'type': 'static_library',
-- 'variables': {
--'jsoncpp_root': '<(third_party_dir)/jsoncpp',
--'jsoncpp_srcs': [
-- '<(jsoncpp_root)/src/lib_json/json_reader.cpp',
-- '<(jsoncpp_root)/src/lib_json/json_value.cpp',
-- '<(jsoncpp_root)/src/lib_json/json_writer.cpp',
--],
--'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'],
--'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
-- },
-- 'defines': [
--'<@(jsoncpp_additional_macros)',
-+ 'conditions': [
-+['use_libjsoncpp==1', {
-+ 'type': 'none',
-+ 'variables': {
-+'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
-+ },
-+ 'all_dependent_settings': {
-+'defines': [
-+ '<@(jsoncpp_additional_macros)',
-+],
-+'cflags': [
-+ '
- #define MOZC_JSONCPP_JSON_H_INCLUDED
- #endif // !
[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/, app-i18n/mozc/files/
commit: a917a8214bb56d2486898553788d9764a2b26cdc
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Fri Jun 1 03:02:06 2018 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Jun 13 14:36:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a917a821
app-i18n/mozc: Fix building with GCC 8.
Closes: https://bugs.gentoo.org/655570
app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch | 22 ++
app-i18n/mozc/mozc-2.23.2815.102.ebuild| 1 +
app-i18n/mozc/mozc-.ebuild | 1 +
3 files changed, 24 insertions(+)
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch
b/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch
new file mode 100644
index 000..07514048e7a
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch
@@ -0,0 +1,22 @@
+https://github.com/google/mozc/issues/441
+
+--- /src/prediction/zero_query_dict.h
/src/prediction/zero_query_dict.h
+@@ -147,6 +147,17 @@
+ return iter;
+ }
+
++iterator &operator--() {
++ ptr_ -= kTokenByteSize;
++ return *this;
++}
++
++iterator operator--(int) {
++ const iterator tmp(ptr_, string_array_);
++ ptr_ -= kTokenByteSize;
++ return tmp;
++}
++
+ iterator &operator-=(ptrdiff_t n) {
+ ptr_ -= n * kTokenByteSize;
+ return *this;
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index de335e87e8d..7bc5284670a 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -99,6 +99,7 @@ src_unpack() {
src_prepare() {
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
+ eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
diff --git a/app-i18n/mozc/mozc-.ebuild b/app-i18n/mozc/mozc-.ebuild
index e2a00716e05..d8763dd2dfe 100644
--- a/app-i18n/mozc/mozc-.ebuild
+++ b/app-i18n/mozc/mozc-.ebuild
@@ -99,6 +99,7 @@ src_unpack() {
src_prepare() {
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
+ eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/, app-i18n/mozc/files/
commit: ab7a7c7c7ca7b03d914d8106a5462f726e8d0a0b
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Thu Sep 28 15:52:59 2017 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Sep 28 17:11:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7a7c7c
app-i18n/mozc: Version bump (2.20.2673.102).
Upstream migrated from Qt 4 to Qt 5.
"qt4" / "qt5" USE flag renamed to "gui".
"fcitx" USE flag renamed to "fcitx4".
("fcitx5" USE flag will be used to control support for Fcitx 5.)
"handwriting-tegaki" and "handwriting-tomoe" USE flags introduced to select
usage
of handwriting recognition model from app-i18n/tegaki-zinnia-japanese or
app-i18n/zinnia-tomoe. "handwriting-tegaki" is enabled by default in accordance
with upstream default for Mozc.
Test suite unrestricted and fixed to build.
app-i18n/mozc/Manifest | 3 +
.../mozc-2.20.2673.102-system_libraries.patch | 133 +
.../files/mozc-2.20.2673.102-tests_build.patch | 27 ++
.../files/mozc-2.20.2673.102-tests_skipping.patch | 70 +
app-i18n/mozc/metadata.xml | 6 +-
app-i18n/mozc/mozc-2.20.2673.102.ebuild| 309 +
6 files changed, 547 insertions(+), 1 deletion(-)
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index c88789227fd..ee7002187dc 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,10 +1,13 @@
DIST fcitx-mozc-2.16.2037.102.2.patch 140421 SHA256
ff175f3e0301c33f750780765ea264887827d00bc7a59fc8b55ae514ba449a1e SHA512
22b885859588bb8e0efd354d153da461a654203729c723156a419bf33fae473e3f7165964aa3cb3b5c969f97c2727f9d87b0d587330e4eeab67f07d4458542a3
WHIRLPOOL
cd9534c8904a7c9f866a8ddd41ab4c57b3ad8b5650fda4cf9ccc1e544c8e0da25c749870606687ee66e4252f224babdbe10415e035038ced654812bad8d299dc
+DIST fcitx-mozc-2.18.2612.102.1.patch 140722 SHA256
0ec5dc2e9798ce7a6dbcbe847cf016b0b49be1851008143d167c1a15ed27 SHA512
725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb
WHIRLPOOL
25d0efd313175f6648504b989302c73ab6d82a0cf4eecf332b68347331e1feff2df6251edd49c3d4e9251a2c7e01df56eb8de54ebbbc31582f7c2b89d1da53c1
DIST gmock-1.6.0.zip 2053682 SHA256
341ad07c31c619ba32c88c2265bc23693da1df062f47f146a7ed340f646d82b7 SHA512
7adff00bb6ff81a6ffb704be71d0747636d69e24b4a8b709e1fb8c177a9a47f6dea8d14fde73034ebfb1529c291c7212a944ad92a34f88abdfe23c2d0b11b6f7
WHIRLPOOL
1a03ff8f2d96287f5deb24f970688f20f3480e77a4a71089ef1399a87f28f616bf0feaedc217e7ac1ca8ca1246e53f5d882f350704be111ae547961949939530
DIST gtest-1.6.0.zip 1121697 SHA256
5ec97df8e75b4ee796604e74716d1b50582beba22c5502edd055a7e67a3965d8 SHA512
f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115
WHIRLPOOL
745a49020d4353ed2fa38adfc80bbd777358c831719bbe3b7c90d243f84256615222ba5f04d48d98b9e1a803bb40766799b3aedd575024c19d853d9239a12f8a
DIST gyp-20140602.tar.bz2 432422 SHA256
f67be748f4dc36aa1619f43d4624c746728cf268af7f4ebf78dab3fa6d43d973 SHA512
e3a59daac57ddafc5804384c01cf51d4b90cd119d263afd83ec6eef9239c38bc7715736f70e20e44fae04fd8be1b86aa5323908a92d574372aa298f3355ce15f
WHIRLPOOL
17e4630dcd7592e8ee197b4130d6147d9fd63404938f62e08ad10a204bd4bddcfc7d394abf3572a337e3dea46d4a7361dbc002e07ab99ed8f90e80830451
DIST japanese-usage-dictionary-10.tar.bz2 56142 SHA256
8c22284c97fdfad854790517f9200c439453c033db8f6a9d25aa5d95266b2384 SHA512
f299cf9183b9ec219d80c1fa745f351765d246d601f3c4091d1705e3c8b5ef66a32288d4c162e7bbc456b6d49ee90f1e5bf33721e1229165f3ee069daddd3198
WHIRLPOOL
d2f690335cf271b0780c969f56616ece9d28f3dbe990548053a252c855db18a4a31d21e6bd8c34160c0893c21fab4543e5ff3cecb48c7f6ecfd5c84465d314a6
+DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 SHA256
0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1 SHA512
b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
WHIRLPOOL
1c4324a6408cfc0b2e1df33a32583384ccf10374bc1a8f49f574e681a72174f7bee7e8500c93d714ee6459c087f7cd408e57cb52b8506ec50292249e50045cd2
DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256
d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 SHA512
5d44e766aa2d7657bc68cf16173130febaa6744d5fca0c6df5465617a3f306023a17cbeb07a62ad1a34c2d183d916401b4be48f37c2416c895db4ad5d9481b3d
WHIRLPOOL
bfa7e70e14f3ed0911c5127da0d2099ca8b9159a900a5bc5147d1e50b5a9f9d5be69a8d46a761d277ca1edabaab8d0d3b9f81417572e4664ed8239fd83c953e6
DIST mozc-1.10.1390.102.tar.bz2 57879881 SHA256
72a8ed6657daa1c03b1efe50c262a69be2ab66d45747a47df6e54996b6d5ee39 SHA512
4482e822f8a14bffd02cb1eaa5d14ba0a213266b2f0dd6402c42b9b357bf0d8c4dd572cef79f1d400bd68b7bd6cb4367933574f8f5967f68738249a300e3cfb9
WHIRLPOOL
90518e621ef784b438fcf677e211fdb6753719f3d78d14ce866ccea22d6d87f8d64e334bc568eebe93cb2850d3d545eb0b73d6f6de820ea
