From 5e6b36028f60eb7996c52a941432c7365e628f18 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sun, 18 May 2025 18:38:13 +0900
Subject: [PATCH] uim: update to 1.9.6.

---
 srcpkgs/uim-qt6                        |  1 +
 srcpkgs/uim/patches/anthy-0.4.patch    | 18 +++++++++---------
 srcpkgs/uim/patches/fix-segfault.patch | 25 +++++++++++++++++++++++++
 srcpkgs/uim/template                   | 20 +++++++++++++++-----
 4 files changed, 50 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/uim-qt6
 create mode 100644 srcpkgs/uim/patches/fix-segfault.patch

diff --git a/srcpkgs/uim-qt6 b/srcpkgs/uim-qt6
new file mode 120000
index 00000000000..0a8c0ecf38f
--- /dev/null
+++ b/srcpkgs/uim-qt6
@@ -0,0 +1 @@
+uim
\ No newline at end of file
diff --git a/srcpkgs/uim/patches/anthy-0.4.patch b/srcpkgs/uim/patches/anthy-0.4.patch
index 4a3812bf6a4..f68459e9bbb 100644
--- a/srcpkgs/uim/patches/anthy-0.4.patch
+++ b/srcpkgs/uim/patches/anthy-0.4.patch
@@ -1,13 +1,13 @@
-Index: configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index e3a36f04..fbd9ff43 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -124,7 +124,7 @@ AC_ARG_WITH(anthy-utf8,
-   [with_anthy_utf8=no])
- 
- if test "x$with_anthy_utf8" != xno; then
--  PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622,
-+  PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4,
+@@ -146,7 +146,7 @@ if test "x$with_anthy_utf8" != xno; then
                      [with_anthy_utf8=yes
                       AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
-                      [libanthy can handle UTF-8])],
+                      [libanthy-unicode can handle UTF-8])],
+-                    [PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622,
++                    [PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 0.4,
+                                        [with_anthy_utf8=yes
+                                         AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1,
+                                         [libanthy can handle UTF-8])],
diff --git a/srcpkgs/uim/patches/fix-segfault.patch b/srcpkgs/uim/patches/fix-segfault.patch
new file mode 100644
index 00000000000..a444e0b23da
--- /dev/null
+++ b/srcpkgs/uim/patches/fix-segfault.patch
@@ -0,0 +1,25 @@
+commit 7dc7d5abe26a30e59c96b82e6bc44603b9813e89
+Author: hazen2215 <haz@disroot.org>
+Date:   Sun Mar 16 22:01:23 2025 +0900
+
+    Revert "Add workaround for NetBSD-i386-9.1 with gcc-7.5.0 and -O2"
+    
+    This reverts commit 7fa131e8234b6e69f67f91e33f16fce9d74e8d1c.
+
+    See: https://github.com/uim/uim/issues/207
+
+diff --git a/configure.ac b/configure.ac
+index 282b1c61..379a195c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -425,10 +425,6 @@ AX_CFLAGS_GCC_OPTION([-Wno-overlength-strings])
+ # Disable the problematic preprocessing on Mac OS X
+ AX_CFLAGS_GCC_OPTION([-no-cpp-precomp])
+ 
+-# Workaround for NetBSD-i386-9.1 with gcc-7.5.0 and -O2.
+-# See also: https://github.com/uim/uim/issues/140#issuecomment-752380919
+-AX_CFLAGS_GCC_OPTION([-fno-inline-small-functions])
+-
+ # Deprecated autoconf macro used in AX_CXXFLAGS_GCC_OPTION.
+ AC_DEFUN([AC_LANG_CXX], [AC_LANG([C++])])
+ 
diff --git a/srcpkgs/uim/template b/srcpkgs/uim/template
index 1615a2d8025..2cd1466fecd 100644
--- a/srcpkgs/uim/template
+++ b/srcpkgs/uim/template
@@ -1,22 +1,23 @@
 # Template file for 'uim'
 pkgname=uim
-version=1.8.9
+version=1.9.6
 revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--enable-pref --enable-fep --with-gtk2 --with-gtk3
  --with-libgcroots=installed
- --with-qt5 --with-qt5-immodule --with-x --with-anthy-utf8 --with-skk"
+ --with-qt5 --with-qt5-immodule --with-x --with-anthy-utf8 --with-skk
+ --with-qt6 --with-qt6-immodule"
 hostmakedepends="pkg-config intltool qt5-host-tools qt5-qmake automake
- libtool gettext-devel"
+ libtool gettext-devel qt6-base qt6-tools autoconf-archive"
 makedepends="gtk+-devel gtk+3-devel qt5-devel ncurses-devel anthy-devel
- libgcroots-devel qt5-x11extras-devel"
+ libgcroots-devel qt5-x11extras-devel qt6-base-devel qt6-base-private-devel"
 short_desc="Multilingual input method library and environment"
 maintainer="Kazuho Sakoda <hyonhyoro.kazuho@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/uim/uim/wiki"
 distfiles="https://github.com/uim/uim/releases/download/${version}/uim-${version}.tar.bz2"
-checksum=dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4
+checksum=67f0e5fa4292a533edc6f98b842df60c531a89cf82d0336a4e1ab72202ab8c83
 
 CFLAGS="-fcommon"
 
@@ -59,6 +60,15 @@ uim-qt_package() {
 	}
 }
 
+uim-qt6_package() {
+	short_desc+=" - Qt6 IM module"
+	pkg_install() {
+		vmove "usr/bin/uim-*-qt6"
+		vmove usr/libexec/uim-candwin-qt6
+		vmove usr/lib/qt6
+	}
+}
+
 uim-anthy_package() {
 	short_desc+=" - Anthy IME"
 	pkg_install() {