diff -Nru uim-1.8.8/debian/changelog uim-1.8.8/debian/changelog
--- uim-1.8.8/debian/changelog	2024-03-15 07:21:36.000000000 +0000
+++ uim-1.8.8/debian/changelog	2024-04-03 15:37:02.000000000 +0000
@@ -1,3 +1,31 @@
+uim (1:1.8.8-9.3ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against Qt 5.15.13.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Wed, 03 Apr 2024 18:37:02 +0300
+
+uim (1:1.8.8-9.3ubuntu1) noble; urgency=medium
+
+  * Merge from Debian unstable, remaining change:
+    - Remove uim_internal_strl{cat,cpy} from debian/libuim8.symbols.
+      Uim now uses strlcat and strlcpy which were added in glibc 2.38.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Wed, 03 Apr 2024 18:19:35 +0300
+
+uim (1:1.8.8-9.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ./configure related FTBFS with -Werror=implicit-function-declaration.
+    Closes: #1066433
+
+ -- Andreas Metzler <ametzler@debian.org>  Sun, 24 Mar 2024 10:52:54 +0100
+
+uim (1:1.8.8-9.2ubuntu5) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- William Grant <wgrant@ubuntu.com>  Mon, 01 Apr 2024 16:16:03 +1100
+
 uim (1:1.8.8-9.2ubuntu4) noble; urgency=medium
 
   * No-change rebuild against libqt5core5t64
diff -Nru uim-1.8.8/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
--- uim-1.8.8/debian/patches/configure-Fix-snprintf-check-for-strict-er-C99-compi.patch	1970-01-01 00:00:00.000000000 +0000
+++ uim-1.8.8/debian/patches/configure-Fix-snprintf-check-for-strict-er-C99-compi.patch	2024-04-03 15:19:35.000000000 +0000
@@ -0,0 +1,33 @@
+From 99fd890fa601b81ff99e5e0f1977fe309f56b90e Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+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/series uim-1.8.8/debian/patches/series
--- uim-1.8.8/debian/patches/series	2021-07-24 10:06:11.000000000 +0000
+++ uim-1.8.8/debian/patches/series	2024-04-03 15:19:35.000000000 +0000
@@ -3,3 +3,4 @@
 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