Hi Keita, Have you made any progress on this bug? Andreas's patch applies fine, but I find upon rebuilding the package that as a result of a change in the behavior of imake (probably related to the switch to xorg), the SONAME of the library has changed and the package can no longer be named libwnn6 because it doesn't provide the same interface!
I don't have a problem with renaming the library package (libwnn6-1 seems like a good name), but seeing that this package uses imake *in addition* to including non-ANSI C code, I wonder whether it's worth the effort to fix these bugs, or maybe the library should be removed and kinput should be rebuilt without it? Anyway, attached is a complete patch that fixes both issues. I'll probably go ahead and upload it to unstable in a few days if I don't hear any objections from you. If this package is to be kept, it would probably be a good idea to fix it at some point so that this is a non-native package instead of a native one. I haven't tried to figure out which parts of the source package would properly belong to the .orig.tar.gz. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -Nru /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/changelog
/tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/changelog
--- /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/changelog 2004-10-08
06:48:51.000000000 -0700
+++ /tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/changelog 2005-09-17
01:23:07.000000000 -0700
@@ -1,3 +1,13 @@
+wnn6-sdk (1.0.0-12.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Medium-urgency upload for RC bugfix.
+ * Remove broken non-ANSI redefinitions of malloc/free. Closes: #259894.
+ * Rename libwnn6 to libwnn6-1, since new versions of imake have
+ changed the SONAME for us.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sat, 17 Sep 2005 00:43:08 -0700
+
wnn6-sdk (1.0.0-12) unstable; urgency=low
* Updated Standards-Version: to 3.6.1.
diff -Nru /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/control
/tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/control
--- /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/control 2004-10-08
17:29:11.000000000 -0700
+++ /tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/control 2005-09-17
01:22:40.000000000 -0700
@@ -7,7 +7,7 @@
Package: libwnn6-dev
Section: libdevel
Architecture: any
-Depends: libwnn6 (= ${Source-Version}), libc6-dev
+Depends: libwnn6-1 (= ${Source-Version}), libc6-dev
Conflicts: wnn-dev, freewnn-jserver-dev, wnn6-dev, libwnn-dev
Replaces: wnn6-dev
Description: Header files and static library for Wnn6 client library
@@ -20,7 +20,7 @@
Wnn6 client library. Install this package if you wish to develop your
own Wnn6 client programs.
-Package: libwnn6
+Package: libwnn6-1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
diff -Nru /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/libwnn6-1.install
/tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/libwnn6-1.install
--- /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/libwnn6-1.install 1969-12-31
16:00:00.000000000 -0800
+++ /tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/libwnn6-1.install 2005-09-17
01:25:04.000000000 -0700
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libwnn6.so.1
+debian/tmp/usr/lib/libwnn6.so.1.0.0
diff -Nru /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/libwnn6-1.shlibs
/tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/libwnn6-1.shlibs
--- /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/libwnn6-1.shlibs 1969-12-31
16:00:00.000000000 -0800
+++ /tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/libwnn6-1.shlibs 2005-09-17
01:24:27.000000000 -0700
@@ -0,0 +1 @@
+libwnn6 1 libwnn6-1
diff -Nru /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/libwnn6.install
/tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/libwnn6.install
--- /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/libwnn6.install 2004-10-08
07:51:09.000000000 -0700
+++ /tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/libwnn6.install 1969-12-31
16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libwnn6.so.1.0
-debian/tmp/usr/lib/libwnn6.so.1.0.0
diff -Nru /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/libwnn6.shlibs
/tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/libwnn6.shlibs
--- /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/debian/libwnn6.shlibs 2001-03-31
01:05:12.000000000 -0800
+++ /tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/debian/libwnn6.shlibs 1969-12-31
16:00:00.000000000 -0800
@@ -1 +0,0 @@
-libwnn6 1.0 libwnn6
diff -Nru /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/patch/malloc.patch
/tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/patch/malloc.patch
--- /tmp/CHtbgQ79aj/wnn6-sdk-1.0.0/patch/malloc.patch 2001-03-31
00:18:55.000000000 -0800
+++ /tmp/UVcC0pi8Oh/wnn6-sdk-1.0.0/patch/malloc.patch 2005-09-17
00:42:54.000000000 -0700
@@ -1,16 +1,7 @@
diff -uNr src/contrib/im/Xsi.orig/Wnn/etc/bdic.c
src/contrib/im/Xsi/Wnn/etc/bdic.c
--- src/contrib/im/Xsi.orig/Wnn/etc/bdic.c Fri Sep 1 18:58:54 2000
+++ src/contrib/im/Xsi/Wnn/etc/bdic.c Sat Mar 31 17:17:50 2001
-@@ -179,6 +179,8 @@
- #define max(a, b) ((a < b)? b:a)
- #endif
-
-+extern char *malloc0();
-+
- /*:::DOC_START
- *
- * Function Name: dic_get_compressed_filename
-@@ -1849,7 +1851,7 @@
+@@ -1849,7 +1849,7 @@
hjt.hindo_area = (int)((serial + MAX_HINDO_DATA_AREA - 1) /
MAX_HINDO_DATA_AREA);
if(hjt.hindo_area != 0) {
if((hjt.curserial = (unsigned char *)
@@ -19,7 +10,7 @@
return(-1);
for(i = 0; i < hjt.hindo_area; i++) (hjt.curserial)[i] = 0;
} else
-@@ -1977,7 +1979,7 @@
+@@ -1977,7 +1977,7 @@
return(-1);
if(hjt1->hindo_area != 0) {
if((hjt1->curserial = (unsigned char *)
@@ -841,7 +832,7 @@
diff -uNr src/contrib/im/Xsi.orig/Wnn/jlib/malloc.c
src/contrib/im/Xsi/Wnn/jlib/malloc.c
--- src/contrib/im/Xsi.orig/Wnn/jlib/malloc.c Thu Jan 1 09:00:00 1970
+++ src/contrib/im/Xsi/Wnn/jlib/malloc.c Sat Mar 31 17:17:50 2001
-@@ -0,0 +1,94 @@
+@@ -0,0 +1,86 @@
+/*
+ * $Id: malloc.c,v 1.3 1994/08/19 01:31:26 kuwa Exp $
+ */
@@ -894,14 +885,6 @@
+ */
+#include <stdio.h>
+/* #include "wnn_malloc.h" */
-+#undef malloc
-+#undef realloc
-+#undef free
-+
-+extern char *malloc();
-+extern void free();
-+extern char *realloc();
-+extern char *calloc();
+
+char *
+malloc0(size)
signature.asc
Description: Digital signature
