Control: tags 1097855 + patch
Control: tags 1097855 + pending

Dear maintainer,

I've prepared an NMU for scim (versioned as 1.4.18+git20211204-0.3) and
uploaded it to DELAYED/10. Please feel free to tell me if I should delay
it longer.

Cheers,
Flo
diff -Nru scim-1.4.18+git20211204/debian/changelog scim-1.4.18+git20211204/debian/changelog
--- scim-1.4.18+git20211204/debian/changelog	2023-06-11 23:01:00.000000000 +0200
+++ scim-1.4.18+git20211204/debian/changelog	2025-12-29 18:10:04.000000000 +0100
@@ -1,3 +1,12 @@
+scim (1.4.18+git20211204-0.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * add d/patches/071bf29d5125343d1f4fb7d024b22342171a5174.patch to fix FTBFS
+    with GCC 15 (Closes: #1097855)
+  * d/control: s#pkg-config#pkgconf# while I'm at it
+
+ -- Florian Ernst <[email protected]>  Mon, 29 Dec 2025 18:10:04 +0100
+
 scim (1.4.18+git20211204-0.2) unstable; urgency=medium
 
   [ tzhuan ]
diff -Nru scim-1.4.18+git20211204/debian/control scim-1.4.18+git20211204/debian/control
--- scim-1.4.18+git20211204/debian/control	2023-06-11 23:00:59.000000000 +0200
+++ scim-1.4.18+git20211204/debian/control	2025-12-29 18:10:01.000000000 +0100
@@ -5,7 +5,7 @@
 Uploaders: Tz-Huan Huang <[email protected]>, Benda Xu <[email protected]>
 Standards-Version: 4.6.2
 Build-Depends: dpkg-dev (>= 1.14.6), debhelper (>= 9),
- dh-autoreconf, intltool, autopoint, pkg-config, x11proto-core-dev, libx11-dev,
+ dh-autoreconf, intltool, autopoint, pkgconf, x11proto-core-dev, libx11-dev,
  libpango1.0-dev, libglib2.0-dev, libgtk2.0-dev, libgtk-3-dev | libgtk2.0-dev (<< 2.21),
  libltdl-dev, doxygen,
  libgtk-4-dev,
diff -Nru scim-1.4.18+git20211204/debian/patches/071bf29d5125343d1f4fb7d024b22342171a5174.patch scim-1.4.18+git20211204/debian/patches/071bf29d5125343d1f4fb7d024b22342171a5174.patch
--- scim-1.4.18+git20211204/debian/patches/071bf29d5125343d1f4fb7d024b22342171a5174.patch	1970-01-01 01:00:00.000000000 +0100
+++ scim-1.4.18+git20211204/debian/patches/071bf29d5125343d1f4fb7d024b22342171a5174.patch	2025-12-29 18:00:50.000000000 +0100
@@ -0,0 +1,53 @@
+Description: Fix FTBFS with GCC 15
+Author: Z. Liu (clan)
+Origin: https://github.com/scim-im/scim/pull/44/commits/071bf29d5125343d1f4fb7d024b22342171a5174
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097855
+
+diff --git a/modules/FrontEnd/IMdkit/Xi18n.h b/modules/FrontEnd/IMdkit/Xi18n.h
+index 5bb5837..5ec7f7b 100644
+--- a/modules/FrontEnd/IMdkit/Xi18n.h
++++ b/modules/FrontEnd/IMdkit/Xi18n.h
+@@ -69,12 +69,18 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #define I18N_SET	1
+ #define I18N_GET	2
+ 
+-typedef struct
++typedef struct _Xi18nCore *Xi18n;
++struct _TransportSW;
++typedef struct _TransportSW TransportSW;
++
++typedef Bool (*CheckAddrFunc)(Xi18n i18n_core, TransportSW *transSW, char *address);
++
++struct _TransportSW
+ {
+     char        *transportname;
+     int         namelen;
+-    Bool        (*checkAddr) ();
+-} TransportSW;
++    CheckAddrFunc checkAddr;
++};
+ 
+ typedef struct _XIMPending
+ {
+@@ -168,8 +174,6 @@ typedef struct _Xi18nClient
+     struct _Xi18nClient *next;
+ } Xi18nClient;
+ 
+-typedef struct _Xi18nCore *Xi18n;
+-
+ /*
+  * Callback Struct for XIM Protocol
+  */
+diff --git a/modules/FrontEnd/IMdkit/i18nMethod.c b/modules/FrontEnd/IMdkit/i18nMethod.c
+index 203f831..6c06bec 100644
+--- a/modules/FrontEnd/IMdkit/i18nMethod.c
++++ b/modules/FrontEnd/IMdkit/i18nMethod.c
+@@ -89,7 +89,7 @@ TransportSW _TransR[] =
+ #ifdef DNETCONN
+     {"decnet",          6, _Xi18nCheckTransAddress},
+ #endif
+-    {(char *) NULL,     0, (Bool (*) ()) NULL}
++    {(char *) NULL,     0, (CheckAddrFunc) NULL}
+ };
+ 
+ static Bool GetInputStyles (Xi18n i18n_core, XIMStyles **p_style)
diff -Nru scim-1.4.18+git20211204/debian/patches/series scim-1.4.18+git20211204/debian/patches/series
--- scim-1.4.18+git20211204/debian/patches/series	2023-06-11 22:58:59.000000000 +0200
+++ scim-1.4.18+git20211204/debian/patches/series	2025-12-29 18:01:25.000000000 +0100
@@ -1,2 +1,3 @@
 01_scim_config.patch
 02_replace_AC_CHECK_FILE.patch
+071bf29d5125343d1f4fb7d024b22342171a5174.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to