[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2024-01-13 Thread Yixun Lan 
commit: 7e91c004045f6c37ed9c6a6348153b96ee99736d
Author: Yongxiang Liang  gmail  com>
AuthorDate: Tue Jan  9 18:12:39 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Jan 14 00:36:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e91c004

app-i18n/mozc: add fcitx5 support

Closes: https://github.com/gentoo/gentoo/pull/34478
Signed-off-by: Yongxiang Liang  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 ...zc-2.28.5029.102-abseil-20230802.0-fcitx5.patch |  19 +
 app-i18n/mozc/metadata.xml |   1 +
 app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild | 466 +
 3 files changed, 486 insertions(+)

diff --git 
a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch 
b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch
new file mode 100644
index ..3ad06cf0e3a5
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch
@@ -0,0 +1,19 @@
+Adapted fcitx5 path from 
https://github.com/fcitx/mozc/commit/748ddfb45b7615283f1d40e03c23940750031ac1
+
+--- a/src/unix/fcitx5/surrounding_text_util.cc
 b/src/unix/fcitx5/surrounding_text_util.cc
+@@ -211,11 +211,11 @@
+   const size_t selection_start = std::min(cursor_pos, anchor_pos);
+   const size_t selection_length = std::abs(info->relative_selected_length);
+   info->preceding_text =
+-  Util::Utf8SubString(surrounding_text, 0, selection_start);
++  std::string(Util::Utf8SubString(surrounding_text, 0, selection_start));
+   info->selection_text =
+-  Util::Utf8SubString(surrounding_text, selection_start, 
selection_length);
++  std::string(Util::Utf8SubString(surrounding_text, selection_start, 
selection_length));
+   info->following_text =
+-  Util::Utf8SubString(surrounding_text, selection_start + 
selection_length);
++  std::string(Util::Utf8SubString(surrounding_text, selection_start + 
selection_length));
+   return true;
+ }
+ 

diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 7fd885c8d62f..7c3e52638ca1 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -11,6 +11,7 @@


Enable support for 
app-i18n/fcitx 4
+   Enable support for 
app-i18n/fcitx 5
Install graphical user interface tool 
(mozc_tool)
Enable support for 
app-i18n/ibus
Enable native candidate window

diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild 
b/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild
new file mode 100644
index ..303b63160760
--- /dev/null
+++ b/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild
@@ -0,0 +1,466 @@
+# Copyright 2010-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig 
toolchain-funcs xdg
+
+if [[ "${PV}" == "" ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/google/mozc;
+   EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
+else
+   MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837"
+   MOZC_DATE="${PV#*_p}"
+   MOZC_DATE="${MOZC_DATE%%_p*}"
+
+   FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001"
+   FCITX_MOZC_DATE="${PV#*_p}"
+   FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}"
+   FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}"
+
+   
JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925"
+   JAPANESE_USAGE_DICTIONARY_DATE="20180701040110"
+fi
+
+DESCRIPTION="Mozc - Japanese input method editor"
+HOMEPAGE="https://github.com/google/mozc;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   SRC_URI="
+   
https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> 
${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
+   
https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz
 -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+   
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz
+   fcitx4? ( 
https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> 
fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
+   fcitx5? ( 
https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> 
fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
+   "
+fi
+
+# Mozc: BSD
+# src/data/dictionary_oss: ipadic, public-domain
+# src/data/unicode: unicode
+# japanese-usage-dictionary: BSD-2
+LICENSE="BSD BSD-2 ipadic public-domain unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug emacs fcitx4 fcitx5 +gui ibus renderer test"
+REQUIRED_USE="|| ( emacs fcitx4 fcitx5 ibus )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   $(python_gen_any_dep

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2023-09-26 Thread Nick Sarnie 
commit: 494dc91fdb70986d73ece89c1ee94c8a70b8dd85
Author: Nick Sarnie  gentoo  org>
AuthorDate: Tue Sep 26 22:45:03 2023 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Tue Sep 26 22:45:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494dc91f

app-i18n/mozc: Fix build with -fcitx4

Closes: https://bugs.gentoo.org/914770

Signed-off-by: Nick Sarnie  gentoo.org>

 ...c-2.28.5029.102-abseil-20230802.0-fcitx4.patch} | 13 --
 .../mozc-2.28.5029.102-abseil-20230802.0.patch | 29 --
 app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild |  1 +
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch 
b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch
similarity index 74%
copy from app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
copy to app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch
index fcc1be4d4b8d..b7ebce42348e 100644
--- a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
+++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch
@@ -1,16 +1,3 @@
-diff --git a/src/base/absl.gyp b/src/base/absl.gyp
-index 932f6ac..35e5a22 100644
 a/src/base/absl.gyp
-+++ b/src/base/absl.gyp
-@@ -398,7 +398,7 @@
-   'all_dependent_settings': {
- 'link_settings': {
-   'libraries': [
--'-labsl_synchronization -labsl_flags 
-labsl_graphcycles_internal',
-+'-labsl_synchronization -labsl_flags 
-labsl_graphcycles_internal -labsl_string_view',
-   ],
- },
-   },
 diff --git a/src/unix/fcitx/surrounding_text_util.cc 
b/src/unix/fcitx/surrounding_text_util.cc
 index b2d533c..76357cd 100644
 --- a/src/unix/fcitx/surrounding_text_util.cc

diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch 
b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
index fcc1be4d4b8d..5e134bd1f003 100644
--- a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
+++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
@@ -11,32 +11,3 @@ index 932f6ac..35e5a22 100644
],
  },
},
-diff --git a/src/unix/fcitx/surrounding_text_util.cc 
b/src/unix/fcitx/surrounding_text_util.cc
-index b2d533c..76357cd 100644
 a/src/unix/fcitx/surrounding_text_util.cc
-+++ b/src/unix/fcitx/surrounding_text_util.cc
-@@ -233,9 +233,9 @@ bool GetSurroundingText(FcitxInstance* instance,
- 
- const size_t selection_start = std::min(cursor_pos, anchor_pos);
- const size_t selection_length = std::abs(info->relative_selected_length);
--info->preceding_text = Util::Utf8SubString(surrounding_text, 0, 
selection_start);
--info->selection_text = Util::Utf8SubString(surrounding_text, 
selection_start, selection_length);
--info->following_text = Util::Utf8SubString(surrounding_text, 
selection_start + selection_length);
-+info->preceding_text = std::string(Util::Utf8SubString(surrounding_text, 
0, selection_start));
-+info->selection_text = std::string(Util::Utf8SubString(surrounding_text, 
selection_start, selection_length));
-+info->following_text = std::string(Util::Utf8SubString(surrounding_text, 
selection_start + selection_length));
- return true;
- }
-
-diff --git a/src/unix/fcitx/eim.cc b/src/unix/fcitx/eim.cc
-index 4da2e80..fc7a9ff 100644
 a/src/unix/fcitx/eim.cc
-+++ b/src/unix/fcitx/eim.cc
-@@ -33,6 +33,7 @@
- #include 
- #include 
- #include 
-+#undef InvokeFunction
- #include "fcitx_mozc.h"
- #include "mozc_connection.h"
- #include "mozc_response_parser.h

diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild 
b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
index f9b3f38102d8..df14388aa428 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
@@ -154,6 +154,7 @@ src_unpack() {
 src_prepare() {
if use fcitx4; then
cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
+   PATCHES+=( 
"${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch )
fi
 
pushd "${WORKDIR}/${P}" > /dev/null || die

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2023-09-25 Thread Nick Sarnie 
commit: 7b7b4ffeec3bf8f7badb711a05a44865e9c7a341
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Sep 25 17:19:41 2023 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Sep 25 17:22:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7b4ffe

app-i18n/mozc: Fix build with new abseil

Closes: https://bugs.gentoo.org/912776
Closes: https://bugs.gentoo.org/913243

Signed-off-by: Nick Sarnie  gentoo.org>

 .../mozc-2.28.5029.102-abseil-20230802.0.patch |  42 +++
 app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild | 399 +
 2 files changed, 441 insertions(+)

diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch 
b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
new file mode 100644
index ..fcc1be4d4b8d
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch
@@ -0,0 +1,42 @@
+diff --git a/src/base/absl.gyp b/src/base/absl.gyp
+index 932f6ac..35e5a22 100644
+--- a/src/base/absl.gyp
 b/src/base/absl.gyp
+@@ -398,7 +398,7 @@
+   'all_dependent_settings': {
+ 'link_settings': {
+   'libraries': [
+-'-labsl_synchronization -labsl_flags 
-labsl_graphcycles_internal',
++'-labsl_synchronization -labsl_flags 
-labsl_graphcycles_internal -labsl_string_view',
+   ],
+ },
+   },
+diff --git a/src/unix/fcitx/surrounding_text_util.cc 
b/src/unix/fcitx/surrounding_text_util.cc
+index b2d533c..76357cd 100644
+--- a/src/unix/fcitx/surrounding_text_util.cc
 b/src/unix/fcitx/surrounding_text_util.cc
+@@ -233,9 +233,9 @@ bool GetSurroundingText(FcitxInstance* instance,
+ 
+ const size_t selection_start = std::min(cursor_pos, anchor_pos);
+ const size_t selection_length = std::abs(info->relative_selected_length);
+-info->preceding_text = Util::Utf8SubString(surrounding_text, 0, 
selection_start);
+-info->selection_text = Util::Utf8SubString(surrounding_text, 
selection_start, selection_length);
+-info->following_text = Util::Utf8SubString(surrounding_text, 
selection_start + selection_length);
++info->preceding_text = std::string(Util::Utf8SubString(surrounding_text, 
0, selection_start));
++info->selection_text = std::string(Util::Utf8SubString(surrounding_text, 
selection_start, selection_length));
++info->following_text = std::string(Util::Utf8SubString(surrounding_text, 
selection_start + selection_length));
+ return true;
+ }
+
+diff --git a/src/unix/fcitx/eim.cc b/src/unix/fcitx/eim.cc
+index 4da2e80..fc7a9ff 100644
+--- a/src/unix/fcitx/eim.cc
 b/src/unix/fcitx/eim.cc
+@@ -33,6 +33,7 @@
+ #include 
+ #include 
+ #include 
++#undef InvokeFunction
+ #include "fcitx_mozc.h"
+ #include "mozc_connection.h"
+ #include "mozc_response_parser.h

diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild 
b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
new file mode 100644
index ..f9b3f38102d8
--- /dev/null
+++ b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
@@ -0,0 +1,399 @@
+# Copyright 2010-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig 
toolchain-funcs xdg
+
+if [[ "${PV}" == "" ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/google/mozc;
+   EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
+else
+   MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837"
+   MOZC_DATE="${PV#*_p}"
+   MOZC_DATE="${MOZC_DATE%%_p*}"
+
+   FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001"
+   FCITX_MOZC_DATE="${PV#*_p}"
+   FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}"
+   FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}"
+
+   
JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925"
+   JAPANESE_USAGE_DICTIONARY_DATE="20180701040110"
+fi
+
+DESCRIPTION="Mozc - Japanese input method editor"
+HOMEPAGE="https://github.com/google/mozc;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   SRC_URI="
+   
https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> 
${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
+   
https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz
 -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+   
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz
+   fcitx4? ( 
https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> 
fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
+   "
+fi
+
+# Mozc: BSD
+# src/data/dictionary_oss: ipadic, public-domain
+# src/data/unicode: unicode
+# japanese-usage-dictionary: BSD-2
+LICENSE="BSD BSD-2 ipadic public-domain

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2022-01-29 Thread Yixun Lan 
commit: da6212a99d181d54f22c73fb2a9b8a9a5df2d21b
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Wed Jan 12 00:00:00 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Jan 29 15:18:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6212a9

app-i18n/mozc: Fix building with >=dev-libs/protobuf-3.18.0

Closes: https://bugs.gentoo.org/828527
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Yixun Lan  gentoo.org>

 app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch  | 13 +
 ...zc-2.23.2815.102-r1.ebuild => mozc-2.23.2815.102.ebuild} |  7 ---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch 
b/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch
new file mode 100644
index ..15077bb1752a
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf-3.18.patch
@@ -0,0 +1,13 @@
+Fix building with Protocol Buffers >=3.18.
+
+--- /src/dictionary/user_dictionary_storage.cc
 /src/dictionary/user_dictionary_storage.cc
+@@ -108,7 +108,7 @@
+   // wants to use more than 512MB.
+   mozc::protobuf::io::IstreamInputStream zero_copy_input();
+   mozc::protobuf::io::CodedInputStream decoder(_copy_input);
+-  decoder.SetTotalBytesLimit(kDefaultTotalBytesLimit, -1);
++  decoder.SetTotalBytesLimit(kDefaultTotalBytesLimit);
+   if (!user_dictionary_storage_base.ParseFromCodedStream()) {
+ LOG(ERROR) << "Failed to parse";
+ if (!decoder.ConsumedEntireMessage() || !ifs.eof()) {

diff --git a/app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild 
b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
similarity index 98%
rename from app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild
rename to app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 0d8162f9bcdb..88ce0b3c1c22 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Gentoo Authors
+# Copyright 2010-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -41,13 +41,13 @@ REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( 
handwriting-tegaki handwritin
 RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
-   =dev-libs/protobuf-3.0.0
dev-util/gyp
dev-util/ninja
virtual/pkgconfig
emacs? ( app-editors/emacs:* )
fcitx4? ( sys-devel/gettext )"
-RDEPEND="=dev-libs/protobuf-3.0.0:=
emacs? ( app-editors/emacs:* )
fcitx4? (
app-i18n/fcitx:4
@@ -113,6 +113,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 
"${DISTDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+   eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf-3.18.patch"
eapply -p2 
"${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2020-12-27 Thread Mike Gilbert 
commit: a8d6f62a23fcd36032df86eb2e2093907852124e
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Dec 24 00:00:00 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Dec 27 18:39:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d6f62a

app-i18n/mozc: Version bump (2.26.4220_p20201212102434_p20201219202429).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/mozc/Manifest |   3 +
 .../mozc-2.26.4220-environmental_variables.patch   |  89 +
 .../files/mozc-2.26.4220-server_path_check.patch   |  95 +
 .../files/mozc-2.26.4220-system_abseil-cpp.patch   | 407 +
 .../mozc/files/mozc-2.26.4220-system_gtest.patch   | 141 +++
 .../mozc/files/mozc-2.26.4220-system_jsoncpp.patch | 117 ++
 ...26.4220_p20201212102434_p20201219202429.ebuild} | 145 
 app-i18n/mozc/mozc-.ebuild | 137 +++
 8 files changed, 1006 insertions(+), 128 deletions(-)

diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 72d8dc73f38..c9793aee241 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,4 +1,7 @@
 DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 
709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3
 SHA512 
e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
+DIST fcitx-mozc-2.26.4220-20201219202429.tar.gz 37174759 BLAKE2B 
3f320523103ee7a35a763f6613889e282e8a654db8ef11b5a1168db12611387e300621f015977875ffec3c10c055e36b3cb525a1e8559013f3ac42bc5b0cc296
 SHA512 
823e64267aa69e4d30dd7408f946a54072994f9a2d68691a3d393b216a15e70fd28bcb24705f9d9f483a2291517c48c5a1aeda893d2315f9a1d9cd352fb3feb2
 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 
08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1
 SHA512 
b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
+DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B 
dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d
 SHA512 
68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3
 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
+DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 
7d3c236809c8feb017f35e3f7a9b024ac34204f483c69913a2d1ae6b771054548f7f81afde35ed3a6887c9f7503584cee0fc646653fc7cde6fd015158de9c3d3
 SHA512 
9d87947b9b9256a3cc66cb23ab6caf4b6974142090b0d315c101bdc700fd289c259d09cb7f02f5f9e7462f48d652cd2d5b4822a645751fdcaed88b939520c429

diff --git a/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch 
b/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch
new file mode 100644
index 000..dccdff76f15
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch
@@ -0,0 +1,89 @@
+https://github.com/google/mozc/issues/470
+
+--- /src/base/system_util.cc
 /src/base/system_util.cc
+@@ -226,6 +226,11 @@
+ 
+ std::string UserProfileDirectoryImpl::GetUserProfileDirectory() const {
+ #if defined(OS_CHROMEOS)
++  const char *configuration_directory_env = 
Environ::GetEnv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++return configuration_directory_env;
++  }
++
+   // TODO(toka): Must use passed in user profile dir which passed in. If mojo
+   // platform the user profile is determined on runtime.
+   // It's hack, the user profile dir should be passed in. Although the value 
in
+@@ -245,13 +250,23 @@
+ #elif defined(OS_IOS)
+   // OS_IOS block must be placed before __APPLE__ because both macros are
+   // currently defined on iOS.
+-  //
++
++  const char *configuration_directory_env = 
Environ::GetEnv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++return configuration_directory_env;
++  }
++
+   // On iOS, use Caches directory instead of Application Spport directory
+   // because the support directory doesn't

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2019-12-29 Thread Mike Gilbert 
commit: fc7858caf393bf3d2c1463c0bf65c61b65bb7cab
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Dec 23 20:35:11 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Dec 29 19:31:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7858ca

app-i18n/mozc: Fix server path check.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 .../mozc-2.23.2815.102-server_path_check.patch | 95 ++
 app-i18n/mozc/mozc-2.23.2815.102.ebuild|  1 +
 app-i18n/mozc/mozc-.ebuild |  1 +
 3 files changed, 97 insertions(+)

diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch 
b/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch
new file mode 100644
index 000..dd606e27fb5
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch
@@ -0,0 +1,95 @@
+https://github.com/google/mozc/issues/471
+
+--- /src/ipc/ipc_path_manager.cc
 /src/ipc/ipc_path_manager.cc
+@@ -332,9 +332,21 @@
+ return false;
+   }
+ 
++  // Expand symbolic links in the expected server path to avoid false 
negatives
++  // during comparisons of the expected server path and the actual server 
path.
++  string real_server_path = server_path;
++#ifndef OS_WIN
++  char real_server_path_[PATH_MAX];
++  if (realpath(server_path.c_str(), real_server_path_) == NULL) {
++LOG(ERROR) << "realpath failed: " << strerror(errno);
++return false;
++  }
++  real_server_path = real_server_path_;
++#endif
++
+   // compare path name
+   if (pid == server_pid_) {
+-return (server_path == server_path_);
++return (real_server_path == server_path_);
+   }
+ 
+   server_pid_ = 0;
+@@ -344,17 +356,17 @@
+   {
+ std::wstring expected_server_ntpath;
+ const std::map::const_iterator it =
+-expected_server_ntpath_cache_.find(server_path);
++expected_server_ntpath_cache_.find(real_server_path);
+ if (it != expected_server_ntpath_cache_.end()) {
+   expected_server_ntpath = it->second;
+ } else {
+   std::wstring wide_server_path;
+-  Util::UTF8ToWide(server_path, _server_path);
++  Util::UTF8ToWide(real_server_path, _server_path);
+   if (WinUtil::GetNtPath(wide_server_path, _server_ntpath)) {
+-// Caches the relationship from |server_path| to
+-// |expected_server_ntpath| in case |server_path| is renamed later.
++// Caches the relationship from |real_server_path| to
++// |expected_server_ntpath| in case |real_server_path| is renamed 
later.
+ // (This can happen during the updating).
+-expected_server_ntpath_cache_[server_path] = expected_server_ntpath;
++expected_server_ntpath_cache_[real_server_path] = 
expected_server_ntpath;
+   }
+ }
+ 
+@@ -371,9 +383,9 @@
+   return false;
+ }
+ 
+-// Here we can safely assume that |server_path| (expected one) should be
++// Here we can safely assume that |real_server_path| (expected one) 
should be
+ // the same to |server_path_| (actual one).
+-server_path_ = server_path;
++server_path_ = real_server_path;
+ server_pid_ = pid;
+   }
+ #endif  // OS_WIN
+@@ -399,7 +411,7 @@
+ #ifdef OS_LINUX
+   // load from /proc//exe
+   char proc[128];
+-  char filename[512];
++  char filename[PATH_MAX];
+   snprintf(proc, sizeof(proc) - 1, "/proc/%u/exe", pid);
+   const ssize_t size = readlink(proc, filename, sizeof(filename) - 1);
+   if (size == -1) {
+@@ -412,18 +424,18 @@
+   server_pid_ = pid;
+ #endif  // OS_LINUX
+ 
+-  VLOG(1) << "server path: " << server_path << " " << server_path_;
+-  if (server_path == server_path_) {
++  VLOG(1) << "server path: " << real_server_path << " " << server_path_;
++  if (real_server_path == server_path_) {
+ return true;
+   }
+ 
+ #ifdef OS_LINUX
+-  if ((server_path + " (deleted)") == server_path_) {
+-LOG(WARNING) << server_path << " on disk is modified";
++  if ((real_server_path + " (deleted)") == server_path_) {
++LOG(WARNING) << real_server_path << " on disk is modified";
+ // If a user updates the server binary on disk during the server is 
running,
+ // "readlink /proc//exe" returns a path with the " (deleted)" suffix.
+ // We allow the special case.
+-server_path_ = server_path;
++server_path_ = real_server_path;
+ return true;
+   }
+ #endif  // OS_LINUX

diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild 
b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index f2300b60324..425b785cbfa 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -110,6 +110,7 @@ src_prepare() {
eapply -p2 
"${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
eapply -p2 
"${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2019-12-29 Thread Mike Gilbert 
commit: e0f9705d877888eeb0615fb586d917f34ff48dd9
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Dec 23 20:31:34 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Dec 29 19:31:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f9705d

app-i18n/mozc: Support environmental variables.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 ...ozc-2.23.2815.102-environmental_variables.patch | 132 +
 app-i18n/mozc/metadata.xml |   4 +-
 app-i18n/mozc/mozc-2.23.2815.102.ebuild|  36 +-
 app-i18n/mozc/mozc-.ebuild |  36 +-
 4 files changed, 198 insertions(+), 10 deletions(-)

diff --git 
a/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch 
b/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch
new file mode 100644
index 000..02e522a32e9
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch
@@ -0,0 +1,132 @@
+https://github.com/google/mozc/issues/470
+
+--- /src/base/system_util.cc
 /src/base/system_util.cc
+@@ -208,28 +208,39 @@
+   dir_ = "/";
+   return;
+ #else  // MOZC_USE_PEPPER_FILE_IO
++  const char *configuration_directory_env;
+   string dir;
+ 
+ #ifdef OS_WIN
+-  DCHECK(SUCCEEDED(Singleton::get()->result()));
+-  dir = Singleton::get()->path();
++  configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++dir = configuration_directory_env;
++  } else {
++DCHECK(SUCCEEDED(Singleton::get()->result()));
++dir = Singleton::get()->path();
+ #ifdef GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish);
+-  FileUtil::CreateDirectory(dir);
++dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish);
++FileUtil::CreateDirectory(dir);
+ #endif  // GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, kProductNameInEnglish);
++dir = FileUtil::JoinPath(dir, kProductNameInEnglish);
++  }
+ 
+ #elif defined(OS_MACOSX)
+-  dir = MacUtil::GetApplicationSupportDirectory();
++  configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++dir = configuration_directory_env;
++  } else {
++dir = MacUtil::GetApplicationSupportDirectory();
+ #ifdef GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, "Google");
+-  // The permission of ~/Library/Application Support/Google seems to be 0755.
+-  // TODO(komatsu): nice to make a wrapper function.
+-  ::mkdir(dir.c_str(), 0755);
+-  dir = FileUtil::JoinPath(dir, "JapaneseInput");
++dir = FileUtil::JoinPath(dir, "Google");
++// The permission of ~/Library/Application Support/Google seems to be 
0755.
++// TODO(komatsu): nice to make a wrapper function.
++::mkdir(dir.c_str(), 0755);
++dir = FileUtil::JoinPath(dir, "JapaneseInput");
+ #else  //  GOOGLE_JAPANESE_INPUT_BUILD
+-  dir = FileUtil::JoinPath(dir, "Mozc");
++dir = FileUtil::JoinPath(dir, "Mozc");
+ #endif  //  GOOGLE_JAPANESE_INPUT_BUILD
++  }
+ 
+ #elif defined(OS_ANDROID)
+   // For android, we do nothing here because user profile directory,
+@@ -237,14 +248,24 @@
+   // is injected from Java layer.
+ 
+ #else  // !OS_WIN && !OS_MACOSX && !OS_ANDROID
+-  char buf[1024];
+-  struct passwd pw, *ppw;
+-  const uid_t uid = geteuid();
+-  CHECK_EQ(0, getpwuid_r(uid, , buf, sizeof(buf), ))
+-  << "Can't get passwd entry for uid " << uid << ".";
+-  CHECK_LT(0, strlen(pw.pw_dir))
+-  << "Home directory for uid " << uid << " is not set.";
+-  dir = FileUtil::JoinPath(pw.pw_dir, ".mozc");
++  configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY");
++  if (configuration_directory_env) {
++dir = configuration_directory_env;
++  } else {
++const char *home_env = ::getenv("HOME");
++if (home_env) {
++  dir = FileUtil::JoinPath(home_env, ".mozc");
++} else {
++  char buf[1024];
++  struct passwd pw, *ppw;
++  const uid_t uid = geteuid();
++  CHECK_EQ(0, getpwuid_r(uid, , buf, sizeof(buf), ))
++  << "Can't get passwd entry for uid " << uid << ".";
++  CHECK_LT(0, strlen(pw.pw_dir))
++  << "Home directory for uid " << uid << " is not set.";
++  dir = FileUtil::JoinPath(pw.pw_dir, ".mozc");
++}
++  }
+ #endif  // !OS_WIN && !OS_MACOSX && !OS_ANDROID
+ 
+   FileUtil::CreateDirectory(dir);
+@@ -356,6 +377,10 @@
+ #endif  // OS_WIN
+ 
+ string SystemUtil::GetServerDirectory() {
++  const char *server_directory_env = ::getenv("MOZC_SERVER_DIRECTORY");
++  if (server_directory_env) {
++return server_directory_env;
++  }
+ #ifdef OS_WIN
+   DCHECK(SUCCEEDED(Singleton::get()->result()));
+ #if defined(GOOGLE_JAPANESE_INPUT_BUILD)
+@@ -409,6 +434,10 @@
+ }
+ 
+ string SystemUtil::GetDocumentDirectory() {
++  const char *documents_directory_env =

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2019-05-05 Thread Mike Gilbert 
commit: cf8c637056d4c4ef0853e469361d252438a54cb6
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun May  5 02:19:04 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun May  5 19:04:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf8c6370

app-i18n/mozc: Fix building with dev-libs/protobuf future version.

Fixes: https://bugs.gentoo.org/681702
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 ...protobuf_generated_classes_no_inheritance.patch | 1039 
 app-i18n/mozc/mozc-2.23.2815.102.ebuild|1 +
 app-i18n/mozc/mozc-.ebuild |1 +
 3 files changed, 1041 insertions(+)

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
new file mode 100644
index 000..2cd75728154
--- /dev/null
+++ 
b/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
@@ -0,0 +1,1039 @@
+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_);
++>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_);
++>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) {
+ UserDictionary *dictionary =
+ UserDictionaryUtil::GetMutableUserDictionaryById(
+-storage, dictionary_id_);
++>user_dictionary_storage_base, dictionary_id_);
+ if (dictionary == NULL ||
+ index_ < 0 || dictionary->entries_size() <= index_) {
+   return false;
+@@ -240,7 +240,7 @@
+   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
+ UserDictionary *dictionary =
+ UserDictionaryUtil::GetMutableUserDictionaryById(
+-storage, dictionary_id_);
++>user_dictionary_storage_base, dictionary_id_);
+ if (dictionary == NULL) {
+   return false;
+ }
+@@ -306,7 +306,7 @@
+   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
+ UserDictionary *dictionary =
+ UserDictionaryUtil::GetMutableUserDictionaryById(
+-storage, dictionary_id_);
++>user_dictionary_storage_base, dictionary_id_);
+ if (dictionary == NULL) {
+   return false;
+ }
+@@ -345,7 +345,7 @@
+ 
+ // TODO(hidehiko) move this to header.
+ const UserDictionaryStorage ::storage() const {
+-  return *storage_;
++  return storage_->user_dictionary_storage_base;
+ }
+ mozc::UserDictionaryStorage *UserDictionarySession::mutable_storage() {
+   return storage_.get();
+@@ -464,7 +464,7 @@
+ const string _name, uint64 *new_dictionary_id) {
+   UserDictionaryCommandStatus::Status status =
+   UserDictionaryUtil::CreateDictionary(
+-  storage_.get(),

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2018-04-16 Thread Mike Gilbert 
commit: 48b27d41776ecb1700b27b35f4b5b248aeae344d
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Apr 16 17:22:04 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr 16 18:27:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b27d41

app-i18n/mozc: Update patch to apply again.

https://github.com/google/mozc/commit/4ed6d8dd06ff640895a2f4a21f2559a4c53936a4

 .../mozc-2.23.2815.102-system_libraries.patch  | 274 +
 app-i18n/mozc/mozc-.ebuild |   2 +-
 2 files changed, 275 insertions(+), 1 deletion(-)

diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-system_libraries.patch 
b/app-i18n/mozc/files/mozc-2.23.2815.102-system_libraries.patch
new file mode 100644
index 000..064b910c702
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-system_libraries.patch
@@ -0,0 +1,274 @@
+--- /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  // !MOZC_JSONCPP_JSON_H_INCLUDED
+ 
+--- /src/testing/testing.gyp
 /src/testing/testing.gyp
+@@ -53,66 +53,101 @@
+   'targets': [
+ {
+   'target_name': 'testing',
+-  'type': 'static_library',
+-  'variables': {
+-'gtest_defines': [
+-  'GTEST_LANG_CXX11=1',
+-  'GTEST_HAS_TR1_TUPLE=0',  # disable tr1 tuple in favor of C++11 
tuple.
+-],
+-'gtest_dir': '<(third_party_dir)/gtest/googletest',
+-'gmock_dir': '<(third_party_dir)/gtest/googlemock',
+-'conditions': [
+-  ['_toolset=="target" and target_platform=="Android"', {
+-'gtest_defines': [
+-  'GTEST_HAS_RTTI=0',  # Android NDKr7 requires this.
+-  'GTEST_HAS_CLONE=0',
+-  'GTEST_HAS_GLOBAL_WSTRING=0',
+-  'GTEST_HAS_POSIX_RE=0',
+-  'GTEST_HAS_STD_WSTRING=0',
+-  'GTEST_OS_LINUX=1',
+-  'GTEST_OS_LINUX_ANDROID=1',
+-],
+-  }],
+-],
+-  },
+-  'sources': [
+-'<(gmock_dir)/src/gmock-cardinalities.cc',
+-'<(gmock_dir)/src/gmock-internal-utils.cc',
+-'<(gmock_dir)/src/gmock-matchers.cc',
+-'<(gmock_dir)/src/gmock-spec-builders.cc',
+-'<(gmock_dir)/src/gmock.cc',
+-'<(gtest_dir)/src/gtest-death-test.cc',
+-'<(gtest_dir)/src/gtest-filepath.cc',
+-'<(gtest_dir)/src/gtest-port.cc',
+-'<(gtest_dir)/src/gtest-printers.cc',
+-'<(gtest_dir)/src/gtest-test-part.cc',
+-'<(gtest_dir)/src/gtest-typed-test.cc',
+-'<(gtest_dir)/src/gtest.cc',
+-  ],
+-  'include_dirs': [
+-'<(gmock_dir)',
+-'<(gmock_dir)/include',
+-'<(gtest_dir)',
+-'<(gtest_dir)/include',
+-  ],
+-  'defines': [
+-'<@(gtest_defines)',
+-  ],
+-  'all_dependent_settings': {
+-'defines': [
+-  '<@(gtest_defines)',
+-],
+-'include_dirs': [
+-  '<(gmock_dir)/include',
+-  '<(gtest_dir)/include',
+-],
+-  },
+   'conditions': [
+-['(_toolset=="target" and compiler_target=="clang") or '
+- '(_toolset=="host" and compiler_host=="clang")', {
+-  'cflags': [
+-'-Wno-missing-field-initializers',
+-'-Wno-unused-private-field',
++['use_libgtest==1', {
++  'type': 'none',
++  'variables': {
++'gtest_defines': [
++  'GTEST_LANG_CXX11=1',
++

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2017-11-01 Thread Mike Gilbert 
commit: 710a10897f53040823ee971c316aad4ca49ed65e
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Wed Nov  1 12:45:31 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Nov  1 20:54:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=710a1089

app-i18n/mozc: Delete old versions (1.10.1390.102-r1, 1.13.1651.102, 
2.16.2037.102).

 app-i18n/mozc/Manifest |  10 -
 .../files/mozc-1.10.1390.102-drop-Werror.patch |  12 -
 .../files/mozc-1.13.1651.102-gtk-renderer.patch|  13 -
 app-i18n/mozc/files/mozc-ibus-1.5.4.patch  | 299 -
 app-i18n/mozc/metadata.xml |   6 +-
 app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild | 176 
 app-i18n/mozc/mozc-1.13.1651.102.ebuild| 181 -
 app-i18n/mozc/mozc-2.16.2037.102.ebuild| 230 
 8 files changed, 2 insertions(+), 925 deletions(-)

diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 03af05380cd..c6ed7c5ef6f 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,13 +1,3 @@
-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 
90518e621ef784b438fcf677e211fdb6753719f3d78d14ce866ccea22d6d87f8d64e334bc568eebe93cb2850d3d545eb0b73d6f6de820eaf1d43f16bfdef4100
-DIST mozc-1.13.1651.102.tar.bz2 31635636 SHA256 
a275accc726d55d696adf235fa40822ae099f0a02d3dc9f8d0257ba191a1bc49 SHA512 
caa75e60704e904a72fd06e315a219ff304a54adaeee70a8ab75d413f7801960add103b9aae1c19ee92f6d10c4c408fd840cf78c5dde0cc21c605feac59deaf4
 WHIRLPOOL

[gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/files/, app-i18n/mozc/

2017-10-05 Thread Mike Gilbert 
commit: 2e39fb4302b42981b5eee984cdccc933a44692b1
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Oct  5 18:24:51 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Oct  5 18:57:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e39fb43

app-i18n/mozc: Disable check for jsoncpp.pc with USE="-test".

Bug: https://bugs.gentoo.org/633458

 .../mozc-2.20.2673.102-system_libraries.patch  | 254 +
 app-i18n/mozc/mozc-2.20.2673.102.ebuild|   2 +
 app-i18n/mozc/mozc-.ebuild |   2 +
 3 files changed, 210 insertions(+), 48 deletions(-)

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
index dd6e57717d1..2b2828b7999 100644
--- 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
@@ -1,12 +1,26 @@
+--- /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,31 +31,25 @@
+@@ -31,32 +31,57 @@
'targets': [
  {
'target_name': 'jsoncpp',
 -  'type': 'static_library',
-+  'type': 'none',
-   'variables': {
+-  'variables': {
 -'jsoncpp_root': '<(third_party_dir)/jsoncpp',
 -'jsoncpp_srcs': [
 -  '<(jsoncpp_root)/src/lib_json/json_reader.cpp',
@@ -14,11 +28,61 @@
 -  '<(jsoncpp_root)/src/lib_json/json_writer.cpp',
 -],
 -'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'],
- 'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'],
-   },
+-'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': [
++  '