[gentoo-commits] repo/gentoo:master commit in: app-i18n/libskk/files/, app-i18n/libskk/

[gentoo-commits] repo/gentoo:master commit in: app-i18n/libskk/files/, app-i18n/libskk/

[Miroslav Šulc]

commit:     4c8fd97d3f7abed5729177581252c1cadaaa4bc0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 10:45:09 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 10:45:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c8fd97d

app-i18n/libskk: fixed incompatible pointer

Closes: https://bugs.gentoo.org/882607
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../libskk-1.0.5_p20210830-incompatible-pointer.patch    | 16 ++++++++++++++++
 app-i18n/libskk/libskk-1.0.5_p20210830.ebuild            |  6 +++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app-i18n/libskk/files/libskk-1.0.5_p20210830-incompatible-pointer.patch b/app-i18n/libskk/files/libskk-1.0.5_p20210830-incompatible-pointer.patch
new file mode 100644
index 000000000000..156d1e6f611b
--- /dev/null
+++ b/app-i18n/libskk/files/libskk-1.0.5_p20210830-incompatible-pointer.patch
@@ -0,0 +1,16 @@
+From 7ec4a42459b090b23a772d6a568f910f380e44db Mon Sep 17 00:00:00 2001
+From: YOSHIOKA Takuma <nop_thread@nops.red>
+Date: Mon, 20 May 2024 06:56:28 +0900
+Subject: [PATCH] Fix build failure with gcc-14
+
+--- a/libskk/file-dict.vala
++++ b/libskk/file-dict.vala
+@@ -70,7 +70,7 @@ namespace Skk {
+         // Skip until the first occurrence of line.  This moves offset
+         // at the beginning of the next line.
+         bool read_until (ref long offset, string line) {
+-            return_val_if_fail (offset < mmap.length, null);
++            return_val_if_fail (offset < mmap.length, false);
+             while (offset + line.length < mmap.length) {
+                 char *p = ((char *)mmap.memory + offset);
+                 if (*p == '\n' &&

diff --git a/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild b/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild
index ba96b7514156..2942b3a3386c 100644
--- a/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild
+++ b/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -27,6 +27,10 @@ BDEPEND="$(vala_depend)
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-incompatible-pointer.patch"
+)
+
 src_prepare() {
 	vala_src_prepare
 	default