From 867c3ec8f94e744fc8c747f292568db76979ccf9 Mon Sep 17 00:00:00 2001 From: Universebenzene Date: Mon, 27 Jun 2022 14:05:04 +0800 Subject: [PATCH] app-i18n/mozc: Verion bump (2.26.4632_p20220213064411_p20220214004422). --- app-i18n/mozc/Manifest | 4 +- .../mozc-2.26.4632-environmental_variables.patch | 89 +++++++++++++++++++++ ...atch => mozc-2.26.4632-server_path_check.patch} | 0 ...z => mozc-2.26.4632-system_abseil-cpp.patch.xz} | Bin ...26.4632_p20220213064411_p20220214004422.ebuild} | 21 +++-- 5 files changed, 101 insertions(+), 13 deletions(-) create mode 100644 app-i18n/mozc/files/mozc-2.26.4632-environmental_variables.patch rename app-i18n/mozc/files/{mozc-2.26.4220-server_path_check-20211102.patch => mozc-2.26.4632-server_path_check.patch} (100%) rename app-i18n/mozc/files/{mozc-2.26.4220-system_abseil-cpp-20211102.patch.xz => mozc-2.26.4632-system_abseil-cpp.patch.xz} (100%) rename app-i18n/mozc/{mozc-2.26.4220_p20211115025624_p20220214004422.ebuild => mozc-2.26.4632_p20220213064411_p20220214004422.ebuild} (95%) diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest index 7c6d0d9bf..81fafb57e 100644 --- a/app-i18n/mozc/Manifest +++ b/app-i18n/mozc/Manifest @@ -1,5 +1,5 @@ DIST fcitx-mozc-2.26.4220-20201219202429.tar.gz 37174759 BLAKE2B 3f320523103ee7a35a763f6613889e282e8a654db8ef11b5a1168db12611387e300621f015977875ffec3c10c055e36b3cb525a1e8559013f3ac42bc5b0cc296 SHA512 823e64267aa69e4d30dd7408f946a54072994f9a2d68691a3d393b216a15e70fd28bcb24705f9d9f483a2291517c48c5a1aeda893d2315f9a1d9cd352fb3feb2 -DIST fcitx-mozc-2.26.4220-20220214004422.tar.gz 37072137 BLAKE2B 4177ca93bd0a369db1b7bc5b2bae73968c7d648bd8614c6154c63a3556a54d7f6adf9cbf8b8706eedfba223611fc0efda099bdbd558e5253e56766ca72c68140 SHA512 dd6a9ea9485b302ebecbaf2beb33e45a2cd2d708461c3f94ba5eb440aa2e040f2e416b42ca0b0729d8649b32a87823cc1d03e339f90167913e9eea13cbe373b3 +DIST fcitx-mozc-2.26.4632-20220214004422.tar.gz 37072137 BLAKE2B 4177ca93bd0a369db1b7bc5b2bae73968c7d648bd8614c6154c63a3556a54d7f6adf9cbf8b8706eedfba223611fc0efda099bdbd558e5253e56766ca72c68140 SHA512 dd6a9ea9485b302ebecbaf2beb33e45a2cd2d708461c3f94ba5eb440aa2e040f2e416b42ca0b0729d8649b32a87823cc1d03e339f90167913e9eea13cbe373b3 DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d SHA512 68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3 DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35e3f7a9b024ac34204f483c69913a2d1ae6b771054548f7f81afde35ed3a6887c9f7503584cee0fc646653fc7cde6fd015158de9c3d3 SHA512 9d87947b9b9256a3cc66cb23ab6caf4b6974142090b0d315c101bdc700fd289c259d09cb7f02f5f9e7462f48d652cd2d5b4822a645751fdcaed88b939520c429 -DIST mozc-2.26.4220-20211115025624.tar.gz 36992945 BLAKE2B cab0561334a5dbd3b100a46d5517dd20667c24e813bda4550626754adbac3148f1cfb7f00e1f8d035d8c6fda38855d91d6216e7891fbf73e130c0ffdd8c7bd1c SHA512 f85343bf44fc1cbcf14b4593bebebe1aa9bc96c247a67a9a88255652350a0fb02149a0b5540dd5d28bffbf4044a50912e18f48f5167dd8b33e4fb0eafa457c28 +DIST mozc-2.26.4632-20220213064411.tar.gz 37001875 BLAKE2B 08ce19bd102c7ad01d364987a0329855093e53fc805568ae9310995a412c26a20b33b46a55dcace294ac0874b400a5539c8a75d407eab45520f6e75ce4b9a22f SHA512 dbd63c1916b95e9b7be260061048b9ef340d2c616e9022c791ee70da34c0457aa7456277d15e3f15ff082830291c1bcedc0b2b190bb515abfca2641107010001 diff --git a/app-i18n/mozc/files/mozc-2.26.4632-environmental_variables.patch b/app-i18n/mozc/files/mozc-2.26.4632-environmental_variables.patch new file mode 100644 index 000000000..7377dd41c --- /dev/null +++ b/app-i18n/mozc/files/mozc-2.26.4632-environmental_variables.patch @@ -0,0 +1,89 @@ +https://github.com/google/mozc/issues/470 + +--- a/src/base/system_util.cc 2022-06-27 02:02:49.363848587 +0800 ++++ b/src/base/system_util.cc 2022-06-27 02:25:41.701524057 +0800 +@@ -239,6 +239,11 @@ + + std::string UserProfileDirectoryImpl::GetUserProfileDirectory() const { + #if defined(OS_CHROMEOS) ++ const char *configuration_dir_env = Environ::GetEnv("MOZC_CONFIGURATION_DIR"); ++ if (configuration_dir_env) { ++ return configuration_dir_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 +@@ -258,13 +263,23 @@ + #elif defined(OS_IOS) + // OS_IOS block must be placed before __APPLE__ because both macros are + // currently defined on iOS. +- // ++ ++ const char *configuration_dir_env = Environ::GetEnv("MOZC_CONFIGURATION_DIR"); ++ if (configuration_dir_env) { ++ return configuration_dir_env; ++ } ++ + // On iOS, use Caches directory instead of Application Spport directory + // because the support directory doesn't exist by default. Also, it is backed + // up by iTunes and iCloud. + return FileUtil::JoinPath({MacUtil::GetCachesDirectory(), kProductPrefix}); + + #elif defined(OS_WIN) ++ const char *configuration_dir_env = Environ::GetEnv("MOZC_CONFIGURATION_DIR"); ++ if (configuration_dir_env) { ++ return configuration_dir_env; ++ } ++ + DCHECK(SUCCEEDED(Singleton::get()->result())); + std::string dir = Singleton::get()->path(); + +@@ -277,6 +292,11 @@ + return FileUtil::JoinPath(dir, kProductNameInEnglish); + + #elif defined(__APPLE__) ++ const char *configuration_dir_env = Environ::GetEnv("MOZC_CONFIGURATION_DIR"); ++ if (configuration_dir_env) { ++ return configuration_dir_env; ++ } ++ + std::string dir = MacUtil::GetApplicationSupportDirectory(); + #ifdef GOOGLE_JAPANESE_INPUT_BUILD + dir = FileUtil::JoinPath(dir, "Google"); +@@ -289,6 +309,11 @@ + #endif // GOOGLE_JAPANESE_INPUT_BUILD + + #elif defined(OS_LINUX) ++ const char *configuration_dir_env = Environ::GetEnv("MOZC_CONFIGURATION_DIR"); ++ if (configuration_dir_env) { ++ return configuration_dir_env; ++ } ++ + // 1. If "$HOME/.mozc" already exists, + // use "$HOME/.mozc" for backward compatibility. + // 2. If $XDG_CONFIG_HOME is defined +@@ -421,6 +446,11 @@ + #endif // OS_WIN + + std::string SystemUtil::GetServerDirectory() { ++ const char *server_dir_env = Environ::GetEnv("MOZC_SERVER_DIR"); ++ if (server_dir_env) { ++ return server_dir_env; ++ } ++ + #ifdef OS_WIN + DCHECK(SUCCEEDED(Singleton::get()->result())); + #if defined(GOOGLE_JAPANESE_INPUT_BUILD) +@@ -477,6 +507,11 @@ + } + + std::string SystemUtil::GetDocumentDirectory() { ++ const char *documents_dir_env = Environ::GetEnv("MOZC_DOCUMENTS_DIR"); ++ if (documents_dir_env) { ++ return documents_dir_env; ++ } ++ + #if defined(OS_LINUX) + + #ifndef MOZC_DOCUMENT_DIR diff --git a/app-i18n/mozc/files/mozc-2.26.4220-server_path_check-20211102.patch b/app-i18n/mozc/files/mozc-2.26.4632-server_path_check.patch similarity index 100% rename from app-i18n/mozc/files/mozc-2.26.4220-server_path_check-20211102.patch rename to app-i18n/mozc/files/mozc-2.26.4632-server_path_check.patch diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp-20211102.patch.xz b/app-i18n/mozc/files/mozc-2.26.4632-system_abseil-cpp.patch.xz similarity index 100% rename from app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp-20211102.patch.xz rename to app-i18n/mozc/files/mozc-2.26.4632-system_abseil-cpp.patch.xz diff --git a/app-i18n/mozc/mozc-2.26.4220_p20211115025624_p20220214004422.ebuild b/app-i18n/mozc/mozc-2.26.4632_p20220213064411_p20220214004422.ebuild similarity index 95% rename from app-i18n/mozc/mozc-2.26.4220_p20211115025624_p20220214004422.ebuild rename to app-i18n/mozc/mozc-2.26.4632_p20220213064411_p20220214004422.ebuild index 5c65f69ee..fec99b1eb 100644 --- a/app-i18n/mozc/mozc-2.26.4220_p20211115025624_p20220214004422.ebuild +++ b/app-i18n/mozc/mozc-2.26.4632_p20220213064411_p20220214004422.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/google/mozc" EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary) else - MOZC_GIT_REVISION="c9c46b8fb015c13465053eeecb380c8e736d79e9" + MOZC_GIT_REVISION="7f02ce1923516502854aa48a95e2c1e84a3e5a9f" MOZC_DATE="${PV#*_p}" MOZC_DATE="${MOZC_DATE%%_p*}" @@ -157,8 +157,8 @@ src_unpack() { cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx5-${PN} || die fi fi - xz -cd "${FILESDIR}"/${PN}-2.26.4220-system_abseil-cpp-20211102.patch.xz > \ - "${S}"/${PN}-2.26.4220-system_abseil-cpp-20211102.patch || die + xz -cd "${FILESDIR}"/${PN}-2.26.4632-system_abseil-cpp.patch.xz > \ + "${S}"/${PN}-2.26.4632-system_abseil-cpp.patch || die } src_prepare() { @@ -171,11 +171,11 @@ src_prepare() { pushd "${WORKDIR}/${P}" > /dev/null || die - eapply "${S}/${PN}-2.26.4220-system_abseil-cpp-20211102.patch" + eapply "${S}/${PN}-2.26.4632-system_abseil-cpp.patch" eapply "${FILESDIR}/${PN}-2.26.4220-system_gtest.patch" eapply "${FILESDIR}/${PN}-2.26.4220-system_jsoncpp.patch" - eapply "${FILESDIR}/${PN}-2.26.4220-environmental_variables.patch" -# eapply "${FILESDIR}/${PN}-2.26.4220-server_path_check-20211102.patch" + eapply "${FILESDIR}/${PN}-2.26.4632-environmental_variables.patch" +# eapply "${FILESDIR}/${PN}-2.26.4632-server_path_check.patch" eapply_user @@ -213,9 +213,8 @@ src_prepare() { # https://github.com/google/mozc/issues/489 sed \ - -e "/'-lc++'/d" \ + -e "/'-lc++'/s/-lc++/-Wl,--copy-dt-needed-entries/" \ -e "/'-stdlib=libc++'/d" \ - -e "/'linux_ldflags'/a\ '-Wl,--copy-dt-needed-entries'," \ -i gyp/common.gypi || die } @@ -402,13 +401,13 @@ pkg_postinst() { elog elog "ENVIRONMENTAL VARIABLES" elog - elog "MOZC_SERVER_DIRECTORY" + elog "MOZC_SERVER_DIR" elog " Mozc server directory" elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc\"" - elog "MOZC_DOCUMENTS_DIRECTORY" + elog "MOZC_DOCUMENTS_DIR" elog " Mozc documents directory" elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\"" - elog "MOZC_CONFIGURATION_DIRECTORY" + elog "MOZC_CONFIGURATION_DIR" elog " Mozc configuration directory" elog " Value used by default: \"~/.mozc\"" elog -- 2.11.4.GIT