Package: uim
Followup-For: Bug #1021075
X-Debbugs-Cc: [email protected]
Dear Maintainer,
Now its newer version 1.9.0 is available.
I have created a patch to update to 1.9.0.
Note that uim 1.8.9 adds KDE Plasma 5 applet, which is probably not used in
trixie/sid where KDE 6 is used. So this patch enables building of the applet
but it is not installed to any binary package.
Regards,
--
YOSHINO Yoshihito <[email protected]>
diff -Nru uim-1.8.8/debian/changelog uim-1.9.0/debian/changelog
--- uim-1.8.8/debian/changelog 2025-02-09 22:55:59.000000000 +0900
+++ uim-1.9.0/debian/changelog 2025-03-02 21:39:34.000000000 +0900
@@ -1,3 +1,26 @@
+uim (1:1.9.0-0.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release (Closes: #1021075).
+ * d/p/configure-Fix-snprintf-check-for-strict-er-C99-compi.patch:
+ removed, applied upstream.
+ * d/p/0007-skip-po-check-keep-Makefile.in.in.patch: Refreshed.
+ * d/{control,rules}: Add Qt 6 support.
+
+ -- YOSHINO Yoshihito <[email protected]> Sun, 02 Mar 2025 21:39:34 +0900
+
+uim (1:1.8.9-0.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release (Closes: #1021075).
+ * d/p/replace_obsolete_since_emacs22.1.patch: removed, applied upstream.
+ * d/p/0007-skip-po-check-keep-Makefile.in.in.patch: Refreshed.
+ * d/control: Add extra-cmake-modules, libkf5plasma-dev, qtdeclarative5-dev
+ to Build-Depends.
+ * d/watch: Updated to really watch GitHub.
+
+ -- YOSHINO Yoshihito <[email protected]> Sun, 02 Mar 2025 21:29:53 +0900
+
uim (1:1.8.8-10) unstable; urgency=medium
* debian/patches/0007-skip-po-check-keep-Makefile.in.in.patch: workaround
po/ test, closes: #1092240
diff -Nru uim-1.8.8/debian/control uim-1.9.0/debian/control
--- uim-1.8.8/debian/control 2025-02-09 22:55:59.000000000 +0900
+++ uim-1.9.0/debian/control 2025-03-02 20:23:26.000000000 +0900
@@ -28,7 +28,12 @@
qtbase5-dev,
qtbase5-private-dev,
libqt5x11extras5-dev,
- x11proto-core-dev
+ x11proto-core-dev,
+ extra-cmake-modules,
+ libkf5plasma-dev,
+ qtdeclarative5-dev,
+ qt6-base-dev,
+ qt6-base-private-dev
Standards-Version: 4.4.1
Homepage: https://github.com/uim/uim/wiki
Vcs-Git: https://salsa.debian.org/debian/uim.git
@@ -57,6 +62,7 @@
Recommends: wordlist, im-config,
uim-gtk2.0 (>= ${source:Version}),
uim-qt5 (>= ${source:Version}),
+ uim-qt6 (>= ${source:Version}),
uim-gtk3 (>= ${source:Version}),
uim-xim (>= ${source:Version}),
uim-fep (>= ${source:Version})
@@ -304,6 +310,40 @@
.
This package contains an IM-module to support the use of uim on Qt 5.x.
+Package: uim-qt6
+Section: x11
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ libuim8 (= ${binary:Version}),
+ uim-qt6-immodule (= ${binary:Version}),
+ uim (>= ${source:Upstream-Version}),
+ uim-data (>= ${source:Upstream-Version})
+Description: Universal Input Method - Qt 6.x front end
+ Uim is an input method module library which supports various scripts and can
+ act as a front end for a range of input methods, including Anthy, Canna,
+ or SKK (for Japanese), Pinyin (for Chinese), Byeoru (for Korean), and
+ M17n (for many other languages). Most of its functions are implemented in
+ Scheme, so it's very simple and flexible.
+ .
+ This package contains some graphical utilities (but not a full IM-module)
+ using Qt 6.x.
+
+Package: uim-qt6-immodule
+Section: x11
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ libuim8 (= ${binary:Version})
+Description: Universal Input Method - Qt 6.x IM module
+ Uim is an input method module library which supports various scripts and can
+ act as a front end for a range of input methods, including Anthy, Canna,
+ PRIME, or SKK (for Japanese), Pinyin (for Chinese), Byeoru (for Korean), and
+ M17n (for many other languages). Most of its functions are implemented in
+ Scheme, so it's very simple and flexible.
+ .
+ This package contains an IM-module to support the use of uim on Qt 6.x.
+
Package: uim-xim
Section: x11
Architecture: any
@@ -312,7 +352,7 @@
libuim8 (= ${binary:Version}),
uim (>= ${source:Version}),
uim-data (>= ${source:Version})
-Suggests: uim-gtk2.0, uim-gtk3, uim-qt5
+Suggests: uim-gtk2.0, uim-gtk3, uim-qt5, uim-qt6
Description: Universal Input Method - XIM compatibility interface
Uim is an input method module library which supports various scripts and can
act as a front end for a range of input methods, including Anthy, Canna,
diff -Nru uim-1.8.8/debian/patches/0007-skip-po-check-keep-Makefile.in.in.patch
uim-1.9.0/debian/patches/0007-skip-po-check-keep-Makefile.in.in.patch
--- uim-1.8.8/debian/patches/0007-skip-po-check-keep-Makefile.in.in.patch
2025-02-09 22:55:59.000000000 +0900
+++ uim-1.9.0/debian/patches/0007-skip-po-check-keep-Makefile.in.in.patch
2025-03-02 21:38:00.000000000 +0900
@@ -1,28 +1,35 @@
From: NOKUBI Takatsugu <[email protected]>
Date: Sun, 9 Feb 2025 13:45:36 +0000
Subject: skip po check, keep Makefile.in.in
+Last-Update: 2025-03-02
---
autogen.sh | 3 +++
po/Makefile.in.in | 13 +++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
-diff --git a/autogen.sh b/autogen.sh
-index 80ab7f8..e00defc 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -1,4 +1,7 @@
- #!/bin/sh
+Index: uim-1.9.0/autogen.sh
+===================================================================
+--- uim-1.9.0.orig/autogen.sh
++++ uim-1.9.0/autogen.sh
+@@ -2,6 +2,8 @@
+
+ set -e
+# XXX
+cp po/Makefile.in.in debian/
- ${AUTORECONF:-autoreconf} --force --install "$@" \
- && intltoolize --copy --force --automake
+ ${AUTORECONF:-autoreconf} --force --install "$@"
+ # WORKAROUND: intltool-merge creates .intltool-merge-cache.lock but
+ # it's not listed in mostlyclean in po/Makefile.in.in. It causes a
+@@ -9,3 +11,4 @@ ${AUTORECONF:-autoreconf} --force --inst
+ sed -i.bak -e 's/ \.intltool-merge-cache$/ .intltool-merge-cache{,.lock}/g' \
+ po/Makefile.in.in
+ rm -f po/Makefile.in.in.bak
+cp debian/Makefile.in.in po/
-diff --git a/po/Makefile.in.in b/po/Makefile.in.in
-index fcd2c3b..bef9b42 100644
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
+Index: uim-1.9.0/po/Makefile.in.in
+===================================================================
+--- uim-1.9.0.orig/po/Makefile.in.in
++++ uim-1.9.0/po/Makefile.in.in
@@ -145,12 +145,13 @@ uninstall:
rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
diff -Nru
uim-1.8.8/debian/patches/configure-Fix-snprintf-check-for-strict-er-C99-compi.patch
uim-1.9.0/debian/patches/configure-Fix-snprintf-check-for-strict-er-C99-compi.patch
---
uim-1.8.8/debian/patches/configure-Fix-snprintf-check-for-strict-er-C99-compi.patch
2025-02-09 22:55:59.000000000 +0900
+++
uim-1.9.0/debian/patches/configure-Fix-snprintf-check-for-strict-er-C99-compi.patch
1970-01-01 09:00:00.000000000 +0900
@@ -1,33 +0,0 @@
-From 99fd890fa601b81ff99e5e0f1977fe309f56b90e Mon Sep 17 00:00:00 2001
-From: Florian Weimer <[email protected]>
-Date: Wed, 30 Nov 2022 00:48:49 +0100
-Subject: [PATCH] configure: Fix snprintf check for strict(er) C99 compilers
- (#187)
-
-C99 removed support for implicit function declarations. The test calls
-the undeclared exit function, so it may fail incorrectly with C99
-compilers. Return from main instead to report the test result.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 56fb1dd4..e115da3a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -593,11 +593,11 @@ str = gai_strerror(0);],[
- if test "x$ac_cv_func_snprintf" = xyes; then
- AC_MSG_CHECKING([whether snprintf correctly terminates long strings])
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
- #include <stdio.h>
--int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
-+int main(void){char b[5];snprintf(b,5,"123456789");return b[4]!='\0';}
- ]])],
- [AC_MSG_RESULT(yes)],
- [
- AC_MSG_RESULT(no)
- AC_DEFINE(BROKEN_SNPRINTF, 1,
---
-2.43.0
-
diff -Nru uim-1.8.8/debian/patches/replace_obsolete_since_emacs22.1.patch
uim-1.9.0/debian/patches/replace_obsolete_since_emacs22.1.patch
--- uim-1.8.8/debian/patches/replace_obsolete_since_emacs22.1.patch
2025-02-09 22:55:59.000000000 +0900
+++ uim-1.9.0/debian/patches/replace_obsolete_since_emacs22.1.patch
1970-01-01 09:00:00.000000000 +0900
@@ -1,38 +0,0 @@
-From 164e2eb050b5fec25033124834cf49ea1a7d8cbb Mon Sep 17 00:00:00 2001
-From: multiSnow <[email protected]>
-Date: Thu, 7 Feb 2019 01:03:47 +0800
-Subject: [PATCH] replace process-kill-without-query with
- set-process-query-on-exit-flag
-
-see https://www.gnu.org/software/emacs/news/NEWS.22.1 and
https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=f1c48b0ec521744826ed43ae27eed0e152c472bf
----
- emacs/uim-helper.el | 2 +-
- emacs/uim.el | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/emacs/uim-helper.el b/emacs/uim-helper.el
-index e86e32d06..19ecd4538 100644
---- a/emacs/uim-helper.el
-+++ b/emacs/uim-helper.el
-@@ -106,7 +106,7 @@
- (if (not proc)
- (error "uim.el: Couldn't invoke uim-el-helper-agent."))
-
-- (process-kill-without-query proc)
-+ (set-process-query-on-exit-flag proc nil)
-
- ;; wait "OK"
- (let ((patience uim-startup-timeout) (ok nil))
-diff --git a/emacs/uim.el b/emacs/uim.el
-index 9110c3cb6..7e1fadbba 100644
---- a/emacs/uim.el
-+++ b/emacs/uim.el
-@@ -488,7 +488,7 @@
- (error "uim.el: Couldn't invoke uim-el-agent."))
-
- ;; don't ask kill
-- (process-kill-without-query proc)
-+ (set-process-query-on-exit-flag proc nil)
-
- ;; wait "OK"
- (let ((patience uim-startup-timeout) (ok nil))
diff -Nru uim-1.8.8/debian/patches/series uim-1.9.0/debian/patches/series
--- uim-1.8.8/debian/patches/series 2025-02-09 22:55:59.000000000 +0900
+++ uim-1.9.0/debian/patches/series 2025-03-02 18:26:54.000000000 +0900
@@ -2,6 +2,4 @@
fix_t-code_mazegaki_location.patch
support_anthy-0.3.patch
disable-composer-test.patch
-replace_obsolete_since_emacs22.1.patch
-configure-Fix-snprintf-check-for-strict-er-C99-compi.patch
0007-skip-po-check-keep-Makefile.in.in.patch
diff -Nru uim-1.8.8/debian/rules uim-1.9.0/debian/rules
--- uim-1.8.8/debian/rules 2025-02-09 22:55:59.000000000 +0900
+++ uim-1.9.0/debian/rules 2025-03-02 18:27:39.000000000 +0900
@@ -38,6 +38,8 @@
--without-qt4-immodule \
--with-qt5 \
--with-qt5-immodule \
+ --with-qt6 \
+ --with-qt6-immodule \
--with-expat \
--disable-dict \
--disable-gnome-applet \
diff -Nru uim-1.8.8/debian/uim-qt6-immodule.install
uim-1.9.0/debian/uim-qt6-immodule.install
--- uim-1.8.8/debian/uim-qt6-immodule.install 1970-01-01 09:00:00.000000000
+0900
+++ uim-1.9.0/debian/uim-qt6-immodule.install 2024-12-07 21:38:16.000000000
+0900
@@ -0,0 +1 @@
+usr/lib/*/qt6/plugins/platforminputcontexts/libuimplatforminputcontextplugin.so
diff -Nru uim-1.8.8/debian/uim-qt6.install uim-1.9.0/debian/uim-qt6.install
--- uim-1.8.8/debian/uim-qt6.install 1970-01-01 09:00:00.000000000 +0900
+++ uim-1.9.0/debian/uim-qt6.install 2024-12-07 21:38:16.000000000 +0900
@@ -0,0 +1,5 @@
+usr/bin/uim-pref-qt6
+usr/bin/uim-im-switcher-qt6
+usr/bin/uim-chardict-qt6
+usr/bin/uim-toolbar-qt6
+usr/lib/uim/uim-candwin-qt6
diff -Nru uim-1.8.8/debian/uim-qt6.lintian-overrides
uim-1.9.0/debian/uim-qt6.lintian-overrides
--- uim-1.8.8/debian/uim-qt6.lintian-overrides 1970-01-01 09:00:00.000000000
+0900
+++ uim-1.9.0/debian/uim-qt6.lintian-overrides 2024-12-07 21:38:16.000000000
+0900
@@ -0,0 +1,4 @@
+uim-qt6: binary-without-manpage usr/bin/uim-chardict-qt6
+uim-qt6: binary-without-manpage usr/bin/uim-im-switcher-qt6
+uim-qt6: binary-without-manpage usr/bin/uim-pref-qt6
+uim-qt6: binary-without-manpage usr/bin/uim-toolbar-qt6
diff -Nru uim-1.8.8/debian/uim-qt6.postinst uim-1.9.0/debian/uim-qt6.postinst
--- uim-1.8.8/debian/uim-qt6.postinst 1970-01-01 09:00:00.000000000 +0900
+++ uim-1.9.0/debian/uim-qt6.postinst 2024-12-07 21:38:16.000000000 +0900
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = configure ]; then
+ update-alternatives --install /usr/bin/uim-toolbar uim-toolbar \
+ /usr/bin/uim-toolbar-qt6 40
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru uim-1.8.8/debian/uim-qt6.prerm uim-1.9.0/debian/uim-qt6.prerm
--- uim-1.8.8/debian/uim-qt6.prerm 1970-01-01 09:00:00.000000000 +0900
+++ uim-1.9.0/debian/uim-qt6.prerm 2024-12-07 21:38:16.000000000 +0900
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = remove ] || [ "$1" = deconfigure ]; then
+ update-alternatives --remove uim-toolbar \
+ /usr/bin/uim-toolbar-qt6
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru uim-1.8.8/debian/watch uim-1.9.0/debian/watch
--- uim-1.8.8/debian/watch 2025-02-09 22:55:59.000000000 +0900
+++ uim-1.9.0/debian/watch 2024-12-22 14:34:45.000000000 +0900
@@ -1,3 +1,3 @@
-version=3
-opts="uversionmangle=s/-alpha/~alpha/;s/-beta/~beta/" \
- https://github.com/uim/uim/releases .*/uim-(\d\.\d\.\d.*)\.tar\.gz
+version=4
+opts="searchmode=plain,uversionmangle=s/-alpha/~alpha/;s/-beta/~beta/" \
+ https://api.github.com/repos/@PACKAGE@/@PACKAGE@/releases
https://github.com/@PACKAGE@/@PACKAGE@/releases/download/v?[\d.]+/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
