[packages/uim] - up to 1.9.6 - disabled dead code - qt4 and wnn - added qt6 plugin

baggins baggins at pld-linux.org
Wed Oct 1 23:30:45 CEST 2025 

commit 5d88a909ce32fe2fc9ed6472c30aa375c2976d4c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Oct 2 01:30:12 2025 +0200

    - up to 1.9.6
    - disabled dead code - qt4 and wnn
    - added qt6 plugin

 build.patch                  | 10 +++++
 uim-gnome-panel-update.patch |  9 ++---
 uim-qt5-options.patch        |  3 +-
 uim.spec                     | 93 ++++++++++++++++++++++++++++++++------------
 4 files changed, 84 insertions(+), 31 deletions(-)
---
diff --git a/uim.spec b/uim.spec
index 5619071..20c52c2 100644
--- a/uim.spec
+++ b/uim.spec
@@ -5,30 +5,32 @@
 %bcond_without	kde5	# KDE 5 plasmoid
 %bcond_with	qt3	# Qt 3 support / immodule
 %bcond_with	qt4	# Qt 4 support / immodule
-%bcond_without	qt5	# Qt 5 support / immodule / quick plugin
+%bcond_without	qt5	# Qt 5 support / immodule
+%bcond_without	qt6	# Qt 5 support / immodule
 %bcond_without	anthy	# Anthy IM and dictionary support
 %bcond_without	canna	# Canna IM and dictionary support
 %bcond_without	eb	# EB text search support
 %bcond_without	m17n	# m17n IM support
 %bcond_with	mana	# mana IM support
 %bcond_without	prime	# PRIME IM support
-%bcond_without	wnn	# Wnn IM support
+%bcond_with	wnn	# Wnn IM support
 #
 Summary:	Multilingual input method library
 Summary(pl.UTF-8):	Biblioteka obsługująca wejście w wielu językach
 Name:		uim
-Version:	1.8.9
-Release:	3
+Version:	1.9.6
+Release:	1
 License:	BSD
 Group:		Libraries
 #Source0Download: https://github.com/uim/uim/releases
 Source0:	https://github.com/uim/uim/releases/download/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	fd4a5f60dea0596cac81956792942b9b
+# Source0-md5:	80fe78318b4e9e593ad5f52b3d03e1b4
 Source1:	%{name}.xinputd
 Source2:	%{name}-init.el
 Patch0:		%{name}-emacs-utf8.patch
 Patch1:		%{name}-gnome-panel-update.patch
 Patch2:		%{name}-qt5-options.patch
+Patch3:		build.patch
 URL:		https://github.com/uim/uim/wiki
 %{?with_canna:BuildRequires:	Canna-devel}
 %{?with_wnn:BuildRequires:	FreeWnn-devel}
@@ -40,12 +42,16 @@ URL:		https://github.com/uim/uim/wiki
 %{?with_qt5:BuildRequires:	Qt5Qml-devel >= 5}
 %{?with_qt5:BuildRequires:	Qt5Quick-devel >= 5}
 %{?with_qt5:BuildRequires:	Qt5Widgets-devel >= 5}
-%{?with_kde5:BuildRequires:	Qt5X11Extras-devel >= 5}
+%{?with_qt6:BuildRequires:	Qt6Core-devel}
+%{?with_qt6:BuildRequires:	Qt6Gui-devel}
+%{?with_qt6:BuildRequires:	Qt6Qml-devel}
+%{?with_qt6:BuildRequires:	Qt6Quick-devel}
+%{?with_qt6:BuildRequires:	Qt6Widgets-devel}
 %{?with_anthy:BuildRequires:	anthy-devel >= 9100h-2}
 BuildRequires:	autoconf >= 2.60b
 BuildRequires:	automake >= 1:1.10
 %{?with_kde4:BuildRequires:	automoc4}
-%if %{with kde4} || %{with qt5}
+%if %{with kde4} || %{with qt5} || %{with qt6}
 BuildRequires:	cmake
 %endif
 BuildRequires:	curl-devel >= 7.16.4
@@ -261,6 +267,25 @@ wprowadzania dla wszystkich języków.
 
 Ten pakiet zawiera moduł IM Qt 5 oraz programy pomocnicze.
 
+%package qt6
+Summary:	Qt 6 support for Uim
+Summary(pl.UTF-8):	Obsługa Qt 6 dla biblioteki Uim
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description qt6
+Uim is a multilingual input method library. Uim aims to provide secure
+and useful input methods for all languages.
+
+This package provides the Qt 6 IM module and helper programs.
+
+%description qt6 -l pl.UTF-8
+Uim jest biblioteką obsługującą wejście w wielu językach. Celem
+projektu jest udostępnienie bezpiecznych i użytecznych metod
+wprowadzania dla wszystkich języków.
+
+Ten pakiet zawiera moduł IM Qt 6 oraz programy pomocnicze.
+
 %package kde
 Summary:	KDE 4 Applet for Uim
 Summary(pl.UTF-8):	Aplet KDE 4 dla biblioteki Uim
@@ -479,6 +504,7 @@ japońskich.
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
 
 cp -a fep/README fep/README.fep
 cp -a fep/README.ja fep/README.fep.ja
@@ -501,41 +527,48 @@ cp -a xim/README xim/README.xim
 	--enable-default-toolkit=gtk3 \
 	--enable-dict \
 	--disable-gnome-applet \
-	%{?with_gnome:--enable-gnome3-applet} \
-	%{?with_kde4:--enable-kde4-applet} \
+	%{__enable_disable gnome gnome3-applet} \
+	%{__enable_disable kde4 kde4-applet} \
 	--enable-notify=libnotify%{?with_kde4:,knotify4} \
-	--enable-openssl \
+	--disable-openssl \
+	--without-openssl-header-check \
 	--enable-pref \
-	%{?with_qt4:--enable-qt4-qt3support} \
 	--without-anthy \
-	%{?with_anthy:--with-anthy-utf8} \
-	%{?with_canna:--with-canna} \
+	%{__with_without anthy anthy-utf8} \
+	%{__with_without canna} \
 	--with-curl \
-	%{?with_eb:--with-eb} \
+	%{__with_without eb} \
 	--with-expat \
 	--with-ffi \
 	--with-gtk2 \
 	--with-gtk3 \
-	%{!?with_kde5:--without-kde5} \
+	%{__with_without kde5} \
 	--with-libedit \
 	--with-libgcroots=installed \
 	--with-lispdir=%{_datadir}/emacs/site-lisp \
-	%{!?with_m17n:--without-m17nlib} \
-	%{!?with_mana:--without-mana} \
-	--without-openssl-header-check \
-	%{!?with_prime:--without-prime} \
-	%{?with_qt3:--with-qt --with-qt-immodule} \
-	%{?with_qt4:--with-qt4 --with-qt4-immodule} \
-	%{?with_qt5:--with-qt5 --with-qt5-immodule --with-quick} \
+	%{__with_without m17n m17nlib} \
+	%{__with_without mana} \
+	%{__with_without prime} \
+	%{__with_without qt} \
+	%{__with_without qt qt-immodule} \
+	%{__with_without qt4} \
+	%{__with_without qt4 qt4-immodule} \
+	%{__enable_disable qt4 qt4-qt3support} \
+	%{__with_without qt5} \
+	%{__with_without qt5 qt5-immodule} \
+	%{__with_without qt6} \
+	%{__with_without qt6 qt6-immodule} \
+	--without-scim \
 	--with-sj3 \
 	--with-skk \
 	--with-sqlite3 \
 	--with-ssl-engine \
-	%{?with_wnn:--with-wnn --with-wnn-includes=/usr/include/wnn} \
+	%{__with_without wnn} \
+	%{?with_wnn:--with-wnn-includes=/usr/include/wnn} \
 	--with-x \
 	--with-xft
 
-%{__make} -j1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -840,6 +873,17 @@ fi
 %{_libdir}/qt5/qml/uim/qmldir
 %endif
 
+%if %{with qt6}
+%files qt6
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/uim-chardict-qt6
+%attr(755,root,root) %{_bindir}/uim-im-switcher-qt6
+%attr(755,root,root) %{_bindir}/uim-pref-qt6
+%attr(755,root,root) %{_bindir}/uim-toolbar-qt6
+%attr(755,root,root) %{_libexecdir}/uim-candwin-qt6
+%attr(755,root,root) %{_libdir}/qt6/plugins/platforminputcontexts/libuimplatforminputcontextplugin.so
+%endif
+
 %if %{with kde4}
 %files kde
 %defattr(644,root,root,755)
@@ -851,7 +895,6 @@ fi
 %if %{with kde5}
 %files kde5
 %defattr(644,root,root,755)
-%{_datadir}/kservices5/plasma-applet-com.github.uim.status.desktop
 %{_datadir}/metainfo/com.github.uim.status.appdata.xml
 %{_datadir}/plasma/plasmoids/com.github.uim.status
 %endif
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..f3d522f
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,10 @@
+--- uim-1.9.6/notify/Makefile.am~	2025-05-16 15:45:08.000000000 +0200
++++ uim-1.9.6/notify/Makefile.am	2025-10-02 00:16:53.989999497 +0200
+@@ -5,6 +5,7 @@
+ 
+ if LIBNOTIFY
+ # XXX
++AM_CPPFLAGS = -I$(top_srcdir)/replace -I$(top_srcdir)
+ CFLAGS+= -Wno-error
+ uimnotify_plugin_LTLIBRARIES += libuimnotify-libnotify.la
+ libuimnotify_libnotify_la_SOURCES = uim-libnotify.c
diff --git a/uim-gnome-panel-update.patch b/uim-gnome-panel-update.patch
index 92de0d1..45283b6 100644
--- a/uim-gnome-panel-update.patch
+++ b/uim-gnome-panel-update.patch
@@ -164,7 +164,7 @@
 +</interface>
 --- uim-1.8.9/gtk3/toolbar/Makefile.am.orig	2023-01-31 07:05:10.013442140 +0100
 +++ uim-1.8.9/gtk3/toolbar/Makefile.am	2023-01-31 17:07:05.979481235 +0100
-@@ -4,46 +4,27 @@ EXTRA_DIST = UimApplet.panel-applet.in.i
+@@ -4,45 +4,26 @@ EXTRA_DIST = UimApplet.panel-applet.in.i
  if GNOME3_APPLET
  helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
  
@@ -184,7 +184,7 @@
 -libuim_toolbar_applet_gnome3_la_CPPFLAGS = \
 +uim_la_CPPFLAGS = \
  			   -DUIM_UIDATADIR="\"${xmluidir}\"" \
- 			   $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
+ 			   $(helper_defs) $(AM_CPPFLAGS)
 -libuim_toolbar_applet_gnome3_la_LDFLAGS = \
 +uim_la_LDFLAGS = \
  			   -module -avoid-version
@@ -192,9 +192,8 @@
 -libuim_toolbar_applet_gnome3_la_CFLAGS = @GTK3_CFLAGS@ @GNOME3_APPLET_CFLAGS@
 +uim_la_CFLAGS = @GTK3_CFLAGS@ @GNOME3_APPLET_CFLAGS@
  
--libuim_toolbar_applet_gnome3_la_SOURCES = applet-gnome3.c \
-+uim_la_SOURCES = applet-gnome3.c \
- 			       ../../gtk2/toolbar/common-gtk.c
+-libuim_toolbar_applet_gnome3_la_SOURCES = applet-gnome3.c common-gtk.c
++uim_la_SOURCES = applet-gnome3.c common-gtk.c
  
 -APPLET_LOCATION = $(pkglibdir)/libuim-toolbar-applet-gnome3.so
 -
diff --git a/uim-qt5-options.patch b/uim-qt5-options.patch
index 17e9620..060e9e2 100644
--- a/uim-qt5-options.patch
+++ b/uim-qt5-options.patch
@@ -42,7 +42,8 @@
      ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
 --- uim-1.8.9/qt5/applet/CMakeLists.txt.orig	2020-03-27 23:51:26.000000000 +0100
 +++ uim-1.8.9/qt5/applet/CMakeLists.txt	2023-02-01 22:18:53.598368328 +0100
-@@ -1,5 +1,9 @@
+@@ -1,6 +1,10 @@
+ 
  project(uim-applet)
  
 +option(WITH_KDE5 "KDE5 plasmoid applet")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/uim.git/commitdiff/5d88a909ce32fe2fc9ed6472c30aa375c2976d4c

More information about the pld-cvs-commit mailing list