diff --git a/.gitignore b/.gitignore index b248ef5..3592f3d 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ clog /mozc-2.26.4556.102.tar.bz2 /mozc-2.26.4577.102.tar.bz2 /mozc-2.28.4730.102.tar.bz2 +/mozc-2.28.4950.102.tar.bz2 diff --git a/mozc-use-system-abseil-cpp.patch b/mozc-use-system-abseil-cpp.patch index 2744c7e..150654b 100644 --- a/mozc-use-system-abseil-cpp.patch +++ b/mozc-use-system-abseil-cpp.patch @@ -1,7 +1,7 @@ -diff -pruN mozc-2.28.4730.102.orig/base/absl.gyp mozc-2.28.4730.102/base/absl.gyp ---- mozc-2.28.4730.102.orig/base/absl.gyp 2022-05-12 15:09:52.000000000 +0900 -+++ mozc-2.28.4730.102/base/absl.gyp 2022-05-12 19:16:20.412275745 +0900 -@@ -28,247 +28,406 @@ +diff -pruN mozc-2.28.4950.102.orig/base/absl.gyp mozc-2.28.4950.102/base/absl.gyp +--- mozc-2.28.4950.102.orig/base/absl.gyp 2022-12-02 22:06:47.000000000 +0900 ++++ mozc-2.28.4950.102/base/absl.gyp 2023-01-05 18:25:45.442048185 +0900 +@@ -28,269 +28,429 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. { @@ -20,7 +20,7 @@ diff -pruN mozc-2.28.4730.102.orig/base/absl.gyp mozc-2.28.4730.102/base/absl.gy 'targets': [ { 'target_name': 'absl_base', - 'type': 'static_library', +- 'type': 'static_library', 'toolsets': ['host', 'target'], - 'sources': [ - '<(absl_srcdir)/base/internal/cycleclock.cc', @@ -57,28 +57,17 @@ diff -pruN mozc-2.28.4730.102.orig/base/absl.gyp mozc-2.28.4730.102/base/absl.gy + }, { + 'type': 'static_library', + 'sources': [ -+ # libabsl_base + '<(absl_srcdir)/base/internal/cycleclock.cc', -+ # libabsl_malloc_internal + '<(absl_srcdir)/base/internal/low_level_alloc.cc', -+ # libabsl_raw_logging_internal + '<(absl_srcdir)/base/internal/raw_logging.cc', -+ # libabsl_base + '<(absl_srcdir)/base/internal/spinlock.cc', -+ # libabsl_spinlock_wait + '<(absl_srcdir)/base/internal/spinlock_wait.cc', -+ # libabsl_strerror + '<(absl_srcdir)/base/internal/strerror.cc', -+ # libabsl_base + '<(absl_srcdir)/base/internal/sysinfo.cc', + '<(absl_srcdir)/base/internal/thread_identity.cc', -+ # libabsl_throw_delegate + '<(absl_srcdir)/base/internal/throw_delegate.cc', -+ # libabsl_base + '<(absl_srcdir)/base/internal/unscaledcycleclock.cc', -+ # libabsl_log_severity + '<(absl_srcdir)/base/log_severity.cc', -+ # libabsl_exponential_biased + '<(absl_srcdir)/profiling/internal/exponential_biased.cc', + ], + 'dependencies': [ @@ -165,7 +154,7 @@ diff -pruN mozc-2.28.4730.102.orig/base/absl.gyp mozc-2.28.4730.102/base/absl.gy + 'all_dependent_settings': { + 'link_settings': { + 'libraries': [ -+ '-labsl_flags_commandlineflag -labsl_flags_usage -labsl_flags -labsl_flags_config -labsl_flags_marshalling -labsl_flags_parse -labsl_flags_internal -labsl_flags_reflection -labsl_hash -labsl_raw_hash_set -labsl_city', ++ '-labsl_flags_commandlineflag -labsl_flags_usage -labsl_flags -labsl_flags_config -labsl_flags_marshalling -labsl_flags_parse -labsl_flags_internal -labsl_flags_reflection -labsl_flags_usage -labsl_hash -labsl_raw_hash_set -labsl_city', + ], + }, + }, @@ -224,7 +213,7 @@ diff -pruN mozc-2.28.4730.102.orig/base/absl.gyp mozc-2.28.4730.102/base/absl.gy + 'all_dependent_settings': { + 'link_settings': { + 'libraries': [ -+ '-labsl_flags_commandlineflag_internal -labsl_flags_internal -labsl_flags_usage_internal', ++ '-labsl_flags_commandlineflag_internal -labsl_flags_internal -labsl_flags_private_handle_accessor -labsl_flags_program_name -labsl_flags_usage_internal', + ], + }, + }, @@ -266,7 +255,7 @@ diff -pruN mozc-2.28.4730.102.orig/base/absl.gyp mozc-2.28.4730.102/base/absl.gy + 'all_dependent_settings': { + 'link_settings': { + 'libraries': [ -+ '-labsl_raw_hash_set -labsl_city -labsl_hash', ++ '-labsl_raw_hash_set -labsl_city -labsl_hash -labsl_low_level_hash', + ], + }, + }, @@ -312,6 +301,58 @@ diff -pruN mozc-2.28.4730.102.orig/base/absl.gyp mozc-2.28.4730.102/base/absl.gy ], }, { + 'target_name': 'absl_random', +- 'type': 'static_library', + 'toolsets': ['host', 'target'], +- 'sources': [ +- '<(absl_srcdir)/random/discrete_distribution.cc', +- '<(absl_srcdir)/random/gaussian_distribution.cc', +- '<(absl_srcdir)/random/internal/chi_square.cc', +- '<(absl_srcdir)/random/internal/pool_urbg.cc', +- '<(absl_srcdir)/random/internal/randen.cc', +- '<(absl_srcdir)/random/internal/randen_detect.cc', +- '<(absl_srcdir)/random/internal/randen_hwaes.cc', +- '<(absl_srcdir)/random/internal/randen_round_keys.cc', +- '<(absl_srcdir)/random/internal/randen_slow.cc', +- '<(absl_srcdir)/random/internal/seed_material.cc', +- '<(absl_srcdir)/random/seed_gen_exception.cc', +- '<(absl_srcdir)/random/seed_sequences.cc', +- ], +- 'dependencies': [ +- 'absl_base', ++ 'conditions': [ ++ ['use_system_abseil_cpp==1', { ++ 'type': 'none', ++ 'all_dependent_settings': { ++ 'link_settings': { ++ 'libraries': [ ++ '-labsl_random_distributions -labsl_random_internal_distribution_test_util -labsl_random_internal_pool_urbg -labsl_random_internal_randen -labsl_random_internal_randen_hwaes -labsl_random_internal_randen_hwaes_impl -labsl_random_internal_randen_slow -labsl_random_internal_seed_material -labsl_random_seed_gen_exception -labsl_random_seed_sequences', ++ ], ++ }, ++ }, ++ }, { ++ 'type': 'static_library', ++ 'sources': [ ++ '<(absl_srcdir)/random/discrete_distribution.cc', ++ '<(absl_srcdir)/random/gaussian_distribution.cc', ++ '<(absl_srcdir)/random/internal/chi_square.cc', ++ '<(absl_srcdir)/random/internal/pool_urbg.cc', ++ '<(absl_srcdir)/random/internal/randen.cc', ++ '<(absl_srcdir)/random/internal/randen_detect.cc', ++ '<(absl_srcdir)/random/internal/randen_hwaes.cc', ++ '<(absl_srcdir)/random/internal/randen_round_keys.cc', ++ '<(absl_srcdir)/random/internal/randen_slow.cc', ++ '<(absl_srcdir)/random/internal/seed_material.cc', ++ '<(absl_srcdir)/random/seed_gen_exception.cc', ++ '<(absl_srcdir)/random/seed_sequences.cc', ++ ], ++ 'dependencies': [ ++ 'absl_base', ++ ], ++ }], + ], + }, + { 'target_name': 'absl_strings_internal', - 'type': 'static_library', 'toolsets': ['host', 'target'], @@ -594,28 +635,9 @@ diff -pruN mozc-2.28.4730.102.orig/base/absl.gyp mozc-2.28.4730.102/base/absl.gy ], }, ], -diff -pruN mozc-2.28.4730.102.orig/config/config_test.gyp mozc-2.28.4730.102/config/config_test.gyp ---- mozc-2.28.4730.102.orig/config/config_test.gyp 2021-11-15 16:08:54.000000000 +0900 -+++ mozc-2.28.4730.102/config/config_test.gyp 2022-05-12 19:16:20.412275745 +0900 -@@ -66,6 +66,7 @@ - 'stats_config_util_test.cc', - ], - 'dependencies': [ -+ '../base/absl.gyp:absl_base', - '../testing/testing.gyp:gtest_main', - 'config.gyp:stats_config_util', - 'install_stats_config_util_test_data', -@@ -81,6 +82,7 @@ - 'character_form_manager_test.cc', - ], - 'dependencies': [ -+ '../base/absl.gyp:absl_base', - '../testing/testing.gyp:gtest_main', - 'config.gyp:character_form_manager', - ], -diff -pruN mozc-2.28.4730.102.orig/gyp/common.gypi mozc-2.28.4730.102/gyp/common.gypi ---- mozc-2.28.4730.102.orig/gyp/common.gypi 2022-05-12 19:16:02.803261304 +0900 -+++ mozc-2.28.4730.102/gyp/common.gypi 2022-05-12 19:16:20.413275746 +0900 +diff -pruN mozc-2.28.4950.102.orig/gyp/common.gypi mozc-2.28.4950.102/gyp/common.gypi +--- mozc-2.28.4950.102.orig/gyp/common.gypi 2023-01-05 14:13:22.292599294 +0900 ++++ mozc-2.28.4950.102/gyp/common.gypi 2023-01-05 17:56:52.095027386 +0900 @@ -191,7 +191,13 @@ 'include_dirs': [ '<(abs_depth)', @@ -631,10 +653,10 @@ diff -pruN mozc-2.28.4730.102.orig/gyp/common.gypi mozc-2.28.4730.102/gyp/common ], 'mac_framework_headers': [], 'target_conditions': [ -diff -pruN mozc-2.28.4730.102.orig/gyp/common_win.gypi mozc-2.28.4730.102/gyp/common_win.gypi ---- mozc-2.28.4730.102.orig/gyp/common_win.gypi 2022-05-12 15:09:52.000000000 +0900 -+++ mozc-2.28.4730.102/gyp/common_win.gypi 2022-05-12 19:18:36.896387668 +0900 -@@ -314,10 +314,16 @@ +diff -pruN mozc-2.28.4950.102.orig/gyp/common_win.gypi mozc-2.28.4950.102/gyp/common_win.gypi +--- mozc-2.28.4950.102.orig/gyp/common_win.gypi 2022-12-20 14:42:26.000000000 +0900 ++++ mozc-2.28.4950.102/gyp/common_win.gypi 2023-01-05 17:57:52.290887360 +0900 +@@ -317,10 +317,16 @@ 'include_dirs': [ '<(abs_depth)', '<(SHARED_INTERMEDIATE_DIR)', @@ -652,9 +674,9 @@ diff -pruN mozc-2.28.4730.102.orig/gyp/common_win.gypi mozc-2.28.4730.102/gyp/co 'msvs_configuration_attributes': { 'CharacterSet': '<(win_char_set_unicode)', }, -diff -pruN mozc-2.28.4730.102.orig/gyp/defines.gypi mozc-2.28.4730.102/gyp/defines.gypi ---- mozc-2.28.4730.102.orig/gyp/defines.gypi 2021-10-06 14:11:23.000000000 +0900 -+++ mozc-2.28.4730.102/gyp/defines.gypi 2022-05-12 19:16:20.413275746 +0900 +diff -pruN mozc-2.28.4950.102.orig/gyp/defines.gypi mozc-2.28.4950.102/gyp/defines.gypi +--- mozc-2.28.4950.102.orig/gyp/defines.gypi 2021-10-06 14:11:23.000000000 +0900 ++++ mozc-2.28.4950.102/gyp/defines.gypi 2023-01-05 17:58:47.510676254 +0900 @@ -68,6 +68,10 @@ # use_libibus represents if ibus library is used or not. # This option is only for Linux. @@ -666,9 +688,9 @@ diff -pruN mozc-2.28.4730.102.orig/gyp/defines.gypi mozc-2.28.4730.102/gyp/defin }, 'target_defaults': { 'defines': [ -diff -pruN mozc-2.28.4730.102.orig/gyp/directories.gypi mozc-2.28.4730.102/gyp/directories.gypi ---- mozc-2.28.4730.102.orig/gyp/directories.gypi 2021-10-06 14:11:23.000000000 +0900 -+++ mozc-2.28.4730.102/gyp/directories.gypi 2022-05-12 19:16:20.414275747 +0900 +diff -pruN mozc-2.28.4950.102.orig/gyp/directories.gypi mozc-2.28.4950.102/gyp/directories.gypi +--- mozc-2.28.4950.102.orig/gyp/directories.gypi 2021-10-06 14:11:23.000000000 +0900 ++++ mozc-2.28.4950.102/gyp/directories.gypi 2023-01-05 18:01:37.980111655 +0900 @@ -31,7 +31,12 @@ 'variables': { # Top directory of third party libraries. @@ -683,25 +705,3 @@ diff -pruN mozc-2.28.4730.102.orig/gyp/directories.gypi mozc-2.28.4730.102/gyp/d # Top directory of additional third party libraries. 'ext_third_party_dir%': '<(abs_depth)/third_party', -diff -pruN mozc-2.28.4730.102.orig/session/session_test.gyp mozc-2.28.4730.102/session/session_test.gyp ---- mozc-2.28.4730.102.orig/session/session_test.gyp 2022-05-12 15:09:52.000000000 +0900 -+++ mozc-2.28.4730.102/session/session_test.gyp 2022-05-12 19:16:20.414275747 +0900 -@@ -222,6 +222,7 @@ - 'internal/key_event_transformer_test.cc', - ], - 'dependencies': [ -+ '../base/absl.gyp:absl_base', - '../base/base.gyp:base', - '../converter/converter_base.gyp:converter_mock', - '../engine/engine.gyp:mock_converter_engine', -diff -pruN mozc-2.28.4730.102.orig/storage/storage_test.gyp mozc-2.28.4730.102/storage/storage_test.gyp ---- mozc-2.28.4730.102.orig/storage/storage_test.gyp 2021-10-06 14:11:23.000000000 +0900 -+++ mozc-2.28.4730.102/storage/storage_test.gyp 2022-05-12 19:16:20.414275747 +0900 -@@ -42,6 +42,7 @@ - 'tiny_storage_test.cc', - ], - 'dependencies': [ -+ '../base/absl.gyp:absl_base', - '../testing/testing.gyp:gtest_main', - 'storage.gyp:storage', - ], diff --git a/mozc.spec b/mozc.spec index 22d254d..1307c10 100644 --- a/mozc.spec +++ b/mozc.spec @@ -5,8 +5,8 @@ %bcond_without qt Name: mozc -Version: 2.28.4730.102 -Release: 3%{?dist} +Version: 2.28.4950.102 +Release: 1%{?dist} Summary: A Japanese Input Method Editor (IME) designed for multi-platform License: BSD and ASL 2.0 and UCD and Public Domain and mecab-ipadic @@ -132,7 +132,7 @@ sed -ne "/'linux_cflags':/{p;n;p;:a;/[[:space:]]*\],/{\ $opts p;b b};n;b a;};{p};:b" gyp/common.gypi > $t && mv $t gyp/common.gypi || exit 1 GYP_DEFINES="use_libprotobuf=1 use_system_abseil_cpp=1 %{?with_zinnia:use_libzinnia=1 zinnia_model_file=/usr/share/zinnia/model/tomoe/handwriting-ja.model} %{!?with_zinnia:use_libzinnia=0} ibus_mozc_path=%{_libexecdir}/ibus-engine-mozc ibus_mozc_icon_path=%{_datadir}/ibus-mozc/product_icon.png" python build_mozc.py gyp --gypdir=%{_bindir} --server_dir=%{_libexecdir}/mozc --target_platform=Linux %{!?with_qt:--noqt} -python build_mozc.py build -c Release unix/ibus/ibus.gyp:ibus_mozc unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server gui/gui.gyp:mozc_tool renderer/renderer.gyp:mozc_renderer +python build_mozc.py build --use_gyp_for_ibus_build -c Release unix/ibus/ibus.gyp:ibus_mozc unix/emacs/emacs.gyp:mozc_emacs_helper server/server.gyp:mozc_server gui/gui.gyp:mozc_tool renderer/renderer.gyp:mozc_renderer %install @@ -249,6 +249,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %changelog +* Thu Jan 5 2023 Akira TAGOH - 2.28.4950.102-1 +- Update to 2.28.4950.102. +- Update dictionaries. +- Fix obsolete function warnings in mozc.el + Resolves: rhbz#2155094 + * Mon Aug 22 2022 Akira TAGOH - 2.28.4730.102-3 - Rebuilt for abseil-cpp 20220623.0 diff --git a/sources b/sources index 76d5d8a..12f74d3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (mozc-2.28.4730.102.tar.bz2) = dd0e55bc39cd9972f79a874f690da7deca553b276467df188e0b76edc000fbeeda563e9013595c4a0da255f7277cf36464ba60dfd29ae5b4ebcefe383799c4b4 -SHA512 (ken_all.zip) = 2e47b04bdedaa2f7caa513bb9a79aa440e006e6280c4d3f3873d5a01a300d1d912bc231592b6aeb6961890837b85c3d4f81a2167d997f7254543b9235d42e888 -SHA512 (jigyosyo.zip) = a1ad0d5423acec3a9f9e92c50cd08df49ab7f425bee0908932af29f74d34e8f02710f2c9c072339441f57ca4e86a723788525634217822857d0d07739f3131a4 +SHA512 (mozc-2.28.4950.102.tar.bz2) = de7d14e14c16c406f5bbc552090e62df12cd7202103f39de8193be33bb0fc18ae267f529eb4183e8b85027c8a6be9d50c11ccf3f553adca259bad278098c9026 +SHA512 (ken_all.zip) = fa9f23c0c99629d3d3ddfa32789e185f65c88b5f14888d8c57de11d5aa242b32b5a57b8ba51faaadaf6f6dc3962485d931f0c9e78a27c9987a7e625e129528cb +SHA512 (jigyosyo.zip) = f0ec98316ff38c13e63e375e1b1fb08ef3570da3379630339e46d14de2aa10b080818523dcd1cfa6a27b1820dec922d246c86c95ad0f01a41a0f22e8cfb0c75b