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

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

[Sam James]

commit:     9156135267823d5025c81d56f803e05456612252
Author:     Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Tue Feb 25 10:17:23 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 10 09:53:03 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91561352

app-i18n/scim: fix build with clang 19

Closes: https://bugs.gentoo.org/874552
Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40763
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/scim-1.4.18-cast-in-initializer.patch    | 38 ++++++++++++++++++++++
 app-i18n/scim/scim-1.4.18-r1.ebuild                |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/app-i18n/scim/files/scim-1.4.18-cast-in-initializer.patch b/app-i18n/scim/files/scim-1.4.18-cast-in-initializer.patch
new file mode 100644
index 000000000000..1fa643433ac1
--- /dev/null
+++ b/app-i18n/scim/files/scim-1.4.18-cast-in-initializer.patch
@@ -0,0 +1,38 @@
+https://github.com/scim-im/scim/pull/44
+
+From b7d38add13fea31a1153922269670d2a51ebd6f1 Mon Sep 17 00:00:00 2001
+From: "Z. Liu" <zhixu.liu@gmail.com>
+Date: Tue, 25 Feb 2025 18:07:50 +0800
+Subject: [PATCH] extras/panel/scim_panel_gtk.cpp: fix build with clang19
+
+clang 19 report:
+
+  error: type 'gdouble' (aka 'double') cannot be narrowed to 'guint16' (aka 'unsigned short') in initializer list
+
+Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
+---
+ extras/panel/scim_panel_gtk.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/extras/panel/scim_panel_gtk.cpp b/extras/panel/scim_panel_gtk.cpp
+index 3fecc01..e1489dc 100644
+--- a/extras/panel/scim_panel_gtk.cpp
++++ b/extras/panel/scim_panel_gtk.cpp
+@@ -2560,10 +2560,10 @@ create_pango_attrlist (const String        &mbs,
+     guint wlen = g_utf8_strlen (mbs.c_str (), mbs.length ());
+ 
+ #if GTK_CHECK_VERSION(3, 0, 0)
+-    guint16 _normal_bg_rgb[] = { 65536*_normal_bg.red, 65536*_normal_bg.green, 65536*_normal_bg.blue };
+-    guint16 _active_bg_rgb[] = { 65536*_active_bg.red, 65536*_active_bg.green, 65536*_active_bg.blue };
+-    guint16 _normal_text_rgb[] = { 65536*_normal_text.red, 65536*_normal_text.green, 65536*_normal_text.blue };
+-    guint16 _active_text_rgb[] = { 65536*_active_text.red, 65536*_active_text.green, 65536*_active_text.blue };
++    guint16 _normal_bg_rgb[] = { (guint16)(65536*_normal_bg.red), (guint16)(65536*_normal_bg.green), (guint16)(65536*_normal_bg.blue) };
++    guint16 _active_bg_rgb[] = { (guint16)(65536*_active_bg.red), (guint16)(65536*_active_bg.green), (guint16)(65536*_active_bg.blue) };
++    guint16 _normal_text_rgb[] = { (guint16)(65536*_normal_text.red), (guint16)(65536*_normal_text.green), (guint16)(65536*_normal_text.blue) };
++    guint16 _active_text_rgb[] = { (guint16)(65536*_active_text.red), (guint16)(65536*_active_text.green), (guint16)(65536*_active_text.blue) };
+ #else
+     guint16 _normal_bg_rgb[] = { _normal_bg.red, _normal_bg.green, _normal_bg.blue };
+     guint16 _active_bg_rgb[] = { _active_bg.red, _active_bg.green, _active_bg.blue };
+-- 
+2.45.2
+

diff --git a/app-i18n/scim/scim-1.4.18-r1.ebuild b/app-i18n/scim/scim-1.4.18-r1.ebuild
index 209c18c60104..4b1e480ce23c 100644
--- a/app-i18n/scim/scim-1.4.18-r1.ebuild
+++ b/app-i18n/scim/scim-1.4.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,6 +45,7 @@ DOCS=( README AUTHORS ChangeLog docs/developers docs/scim.cfg )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.18-slibtool.patch
+	"${FILESDIR}"/${PN}-1.4.18-cast-in-initializer.patch
 )
 
 src_prepare() {