PR#1: Fix build with GCC 13 (F38FTBFS) - rpms/fcitx5-mozc

Yaakov Selkowitz • a year ago

0b7be97

fcitx5-mozc.spec

file modified

		`@@ -52,6 +52,7 @@`

		`# add -v to ninja command, to make verbose output during building`
		`Patch0: mozc-build-verbosely.patch`
		`+ Patch1: mozc-gcc13.patch`

		`BuildRequires: python3-devel`
		`BuildRequires: gettext`
		`@@ -86,6 +87,7 @@`
		`%prep`
		`%setup -q -n mozc -a 1 -a 2`
		`%patch0 -p1`
		`+ %patch1 -p1`
		`(cd src/data/dictionary_oss;`
		`PYTHONPATH="${PYTHONPATH}:../../" python3 ../../dictionary/gen_zip_code_seed.py --zip_code=../../../KEN_ALL.CSV --jigyosyo=../../../JIGYOSYO.CSV >> dictionary09.txt;`
		`)`

mozc-gcc13.patch

file added

+11

		`@@ -0,0 +1,11 @@`
		`+ diff -ur mozc.orig/src/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h mozc/src/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h`
		`+ --- mozc.orig/src/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h 2022-11-21 02:36:33.000000000 -0500`
		`+ +++ mozc/src/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h 2023-01-25 15:26:54.129122166 -0500`
		`+ @@ -19,6 +19,7 @@`
		`+ #include <limits.h>`
		`+`
		`+ #include <cstddef>`
		`+ +#include <cstdint>`
		`+ #include <cstring>`
		`+ #include <ostream>`
		`+`

Note that this is already fixed in https://src.fedoraproject.org/rpms/abseil-cpp/. It would be nice if someone could figure out a sane way to unbundle abseil-cpp.

Unlikely, given the source tree's build systems.

Pull-Request has been merged by yselkowitz

a year ago