Hi, I have tested the patches from Hayashi-san to be working. It would be great to have this applied to fix mozc (which has since been removed from testing due to this bug.)
As an attempt to help, I took the liberty to incorporate Hayashi-san's patches and provided the compiled packages on mentors[1], as well as created a merge request on salsa[2] (I have also attached the patch set in case people prefer these for reviewing.) I haven't filed an RFS bug for the packages on mentors yet, but let me know if that's a good idea. According the Salsa CI pipeline[3], the building went fine. There are 2 failed tests: blhc fails due to missing suggested building/linking flags, piuparts fails because the current version (-2.2) fails to install due to the fact that it is still depending on the previous version of abseil which is no longer available in testing. (Also, the crossbuild test has been marked as expected to fail.) So I hope the Salsa-CI pipeline results show that the NMU package in a good-enough shape. I am adding Gunnar who previously provided NMU of this package as well as the maintainer hoping them to review and sponsor my NMU attempt. (Also CCed Kentaro Hayashi as FYI.) [1] https://mentors.debian.net/package/mozc/ [2] https://salsa.debian.org/debian/mozc/-/merge_requests/10 [3] https://salsa.debian.org/manphiz/mozc/-/pipelines/683514 -- Xiyue Deng
>From 7c83a80bb31420e76ae96746a8192673988f8a7e Mon Sep 17 00:00:00 2001 From: Xiyue Deng <manp...@gmail.com> Date: Tue, 28 May 2024 02:39:45 -0700 Subject: [PATCH 1/3] Apply patches by Kentaro HAYASHI to fix FTBFS with latest abseil (Closes: #1068186) --- ...-error-of-ParseCommandLineFlags-with.patch | 34 +++++++++++++++++ ...Fix-missing-abseil-gyp-link-settings.patch | 38 +++++++++++++++++++ debian/patches/series | 2 + 3 files changed, 74 insertions(+) create mode 100644 debian/patches/0010-Fix-the-compile-error-of-ParseCommandLineFlags-with.patch create mode 100644 debian/patches/0011-Fix-missing-abseil-gyp-link-settings.patch diff --git a/debian/patches/0010-Fix-the-compile-error-of-ParseCommandLineFlags-with.patch b/debian/patches/0010-Fix-the-compile-error-of-ParseCommandLineFlags-with.patch new file mode 100644 index 000000000..361fa959f --- /dev/null +++ b/debian/patches/0010-Fix-the-compile-error-of-ParseCommandLineFlags-with.patch @@ -0,0 +1,34 @@ +From: Kentaro Hayashi <ken...@gmail.com> +Date: Fri, 17 May 2024 18:21:29 +0900 +Subject: Fix the compile error of ParseCommandLineFlags with Abseil LTS + 20230802. + +Origin: https://github.com/google/mozc/commit/cad4064c8884eb711e0e19b4b79d2ff5610823dc +Description: Fix the compile error of ParseCommandLineFlags with Abseil LTS 20230802. + * Added the check of the Abseil version to the arguments of ParseCommandLineImpl. + * https://github.com/google/mozc/issues/790 + #codehealth + PiperOrigin-RevId: 561867167 +Author: Hiroyuki Komatsu <koma...@google.com> + +Released in 2.29.5374.102 + +Signed-off-by: Kentaro Hayashi <ken...@gmail.com> +--- + src/base/init_mozc.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/base/init_mozc.cc b/src/base/init_mozc.cc +index eee8b62..5e5b558 100644 +--- a/src/base/init_mozc.cc ++++ b/src/base/init_mozc.cc +@@ -87,7 +87,9 @@ 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 + absl::flags_internal::ArgvListAction::kRemoveParsedArgs, ++#endif // ABSL_LTS_RELEASE_VERSION < 20230802 + // Suppress help messages invoked by --help and others. + // Use UsageFlagsAction::kHandleUsage to enable it. + absl::flags_internal::UsageFlagsAction::kIgnoreUsage, diff --git a/debian/patches/0011-Fix-missing-abseil-gyp-link-settings.patch b/debian/patches/0011-Fix-missing-abseil-gyp-link-settings.patch new file mode 100644 index 000000000..9eba7f14d --- /dev/null +++ b/debian/patches/0011-Fix-missing-abseil-gyp-link-settings.patch @@ -0,0 +1,38 @@ +From: Kentaro Hayashi <ken...@gmail.com> +Date: Sat, 18 May 2024 17:05:16 +0900 +Subject: Fix missing abseil libraries + +It fixes the following error: + + /usr/bin/ld: obj/base/base_core.file_util.o: undefined reference to + symbol '_ZN4absl7debian5lsERSoNS0_11string_viewE' + /usr/bin/ld: + /lib/x86_64-linux-gnu/libabsl_string_view.so.20230802: error adding + symbols: DSO missing from command line + + /usr/bin/ld: obj/unix/emacs/mozc_emacs_helper_lib.client_pool.o: + undefined reference to symbol + '_ZN4absl7debian516raw_log_internal21internal_log_functionB5cxx11E' + /usr/bin/ld: + /lib/x86_64-linux-gnu/libabsl_raw_logging_internal.so.20230802: error + adding symbols: DSO missing from command line collect2: error: ld + returned 1 exit status + +Signed-off-by: Kentaro Hayashi <ken...@gmail.com> +--- + src/base/absl.gyp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/base/absl.gyp b/src/base/absl.gyp +index 4bacb59..6105498 100644 +--- a/src/base/absl.gyp ++++ b/src/base/absl.gyp +@@ -47,7 +47,7 @@ + ['use_libabseil==1', { + 'link_settings': { + 'libraries': [ +- '-latomic -labsl_base -labsl_int128 -labsl_base -labsl_hash -labsl_city -labsl_flags_reflection -labsl_raw_hash_set -labsl_str_format_internal -labsl_throw_delegate -labsl_time_zone -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_strings_internal -labsl_strings -labsl_spinlock_wait -labsl_status -labsl_statusor -labsl_flags_internal -labsl_flags_usage_internal -labsl_flags_marshalling -labsl_flags_parse', ++ '-latomic -labsl_base -labsl_int128 -labsl_base -labsl_hash -labsl_city -labsl_flags_reflection -labsl_raw_hash_set -labsl_str_format_internal -labsl_throw_delegate -labsl_time_zone -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_strings_internal -labsl_strings -labsl_spinlock_wait -labsl_status -labsl_statusor -labsl_flags_internal -labsl_flags_usage_internal -labsl_flags_marshalling -labsl_flags_parse -labsl_string_view -labsl_raw_logging_internal', + ], + }, + },], diff --git a/debian/patches/series b/debian/patches/series index bcc42299e..a24a56252 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,5 @@ 0007-common.gypi-Use-command-v-instead-of-which.patch #0008-renderer-Convert-Gtk2-to-Gtk3.patch 0009-protobuf.gyp-Add-latomic-to-link_settings.patch +0010-Fix-the-compile-error-of-ParseCommandLineFlags-with.patch +0011-Fix-missing-abseil-gyp-link-settings.patch -- 2.39.2
>From 4354ef4dd80a18e9ee4d1b3c392995fe63f09ed1 Mon Sep 17 00:00:00 2001 From: Xiyue Deng <manp...@gmail.com> Date: Tue, 28 May 2024 23:42:48 -0700 Subject: [PATCH 2/3] Update d/changelog --- debian/changelog | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f7542e977..f8deb5692 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mozc (2.28.4715.102+dfsg-3) UNRELEASED; urgency=medium +mozc (2.28.4715.102+dfsg-2.3) UNRELEASED; urgency=medium [ Gunnar Hjalmarsson ] * debian/mozc-utils-gui.install: Install Credits file (LP: #2028730) @@ -6,6 +6,16 @@ mozc (2.28.4715.102+dfsg-3) UNRELEASED; urgency=medium [ Edward Betts ] * d/control and d/copyright: Remove .git from end of github URL + [ Kentaro HAYASHI ] + * Add patches + 0010-Fix-the-compile-error-of-ParseCommandLineFlags-with.patch and + 0011-Fix-missing-abseil-gyp-link-settings.patch to fix FTBFS with + latest abseil (Closes: #1068186) + + [ Xiyue Deng ] + * Non-maintainer upload + * Apply patches from Kentaro Hayashi + -- Gunnar Hjalmarsson <gunna...@debian.org> Wed, 26 Jul 2023 15:36:02 +0200 mozc (2.28.4715.102+dfsg-2.2) unstable; urgency=medium -- 2.39.2
>From 0918d0097747f377334812d2311285546f4bc493 Mon Sep 17 00:00:00 2001 From: Xiyue Deng <manp...@gmail.com> Date: Tue, 28 May 2024 23:43:18 -0700 Subject: [PATCH 3/3] Finalize for uploading --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f8deb5692..dd78fa7c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mozc (2.28.4715.102+dfsg-2.3) UNRELEASED; urgency=medium +mozc (2.28.4715.102+dfsg-2.3) unstable; urgency=medium [ Gunnar Hjalmarsson ] * debian/mozc-utils-gui.install: Install Credits file (LP: #2028730) @@ -16,7 +16,7 @@ mozc (2.28.4715.102+dfsg-2.3) UNRELEASED; urgency=medium * Non-maintainer upload * Apply patches from Kentaro Hayashi - -- Gunnar Hjalmarsson <gunna...@debian.org> Wed, 26 Jul 2023 15:36:02 +0200 + -- Xiyue Deng <manp...@gmail.com> Tue, 28 May 2024 23:43:09 -0700 mozc (2.28.4715.102+dfsg-2.2) unstable; urgency=medium -- 2.39.2
