From b0c2f3abf6c6c7f1a180e6668e1026cc702f96c4 Mon Sep 17 00:00:00 2001 From: jca Date: Tue, 10 Jan 2023 13:26:15 +0000 Subject: [PATCH] Return FALSE instead of NULL, avoids a fatal error with clang 15 --- inputmethods/libskk/Makefile | 2 +- inputmethods/libskk/patches/patch-libskk_file-dict_c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 inputmethods/libskk/patches/patch-libskk_file-dict_c diff --git a/inputmethods/libskk/Makefile b/inputmethods/libskk/Makefile index b6512a2d60c..2c99b7f6cb3 100644 --- a/inputmethods/libskk/Makefile +++ b/inputmethods/libskk/Makefile @@ -3,7 +3,7 @@ COMMENT = library to deal with Japanese kana-to-kanji conversion V = 1.0.5 DISTNAME = libskk-${V} EXTRACT_SUFX = .tar.xz -REVISION = 0 +REVISION = 1 SHARED_LIBS += skk 0.1 # 0.0 diff --git a/inputmethods/libskk/patches/patch-libskk_file-dict_c b/inputmethods/libskk/patches/patch-libskk_file-dict_c new file mode 100644 index 00000000000..2e6cbf4d0cc --- /dev/null +++ b/inputmethods/libskk/patches/patch-libskk_file-dict_c @@ -0,0 +1,12 @@ +Index: libskk/file-dict.c +--- libskk/file-dict.c.orig ++++ libskk/file-dict.c +@@ -398,7 +398,7 @@ skk_file_dict_read_until (SkkFileDict* self, + _tmp0_ = self->priv->mmap; + _tmp1_ = skk_memory_mapped_file_get_length (_tmp0_); + _tmp2_ = _tmp1_; +- g_return_val_if_fail (((gsize) (*offset)) < _tmp2_, NULL); ++ g_return_val_if_fail (((gsize) (*offset)) < _tmp2_, FALSE); + while (TRUE) { + gint _tmp3_; + gint _tmp4_;