Your message dated Wed, 6 Jun 2007 12:11:52 +0800
with message-id <[EMAIL PROTECTED]>
and subject line diff for 11.4.1870-7.1 NMU for im-sdk
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: im-sdk
Version: 11.4.1870-7
Severity: normal
Tags: patch
Hi,
Attached is the diff for my im-sdk 11.4.1870-7.1 NMU.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u im-sdk-11.4.1870/debian/changelog im-sdk-11.4.1870/debian/changelog
--- im-sdk-11.4.1870/debian/changelog
+++ im-sdk-11.4.1870/debian/changelog
@@ -1,3 +1,12 @@
+im-sdk (11.4.1870-7.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS due to cast which loses precision (Closes: #327078).
+ * Fix FTBFS due to conflicting static and non-static decl (Closes: #320899).
+ * Fix FTBFS on ppc64 due to unknown architecture (Closes: #327349).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sun, 5 Mar 2006 19:12:20 +0100
+
im-sdk (11.4.1870-7) unstable; urgency=high
* Recompiled with dependencies from sarge.
only in patch2:
unchanged:
--- im-sdk-11.4.1870.orig/debian/patches/005_gcc4_fix.patch
+++ im-sdk-11.4.1870/debian/patches/005_gcc4_fix.patch
@@ -0,0 +1,168 @@
+diff -Nru3 ./im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.am
im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.am
+--- ./im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.am
2004-08-16 05:40:06.000000000 -0700
++++ im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.am
2005-09-01 02:31:25.496312826 -0700
+@@ -34,6 +34,9 @@
+ -e "s/parse_small_token/parse_$*/g" \
+ -e "s/^void yyunput/static void yyunput/g" \
+ -e "s/^int yylen/static int yylen/g" \
++ -e "/^extern int yylen/d" \
++ -e "/^#undef YY_INPUT/i \
++ static int loc_input (char *buf, int ms);" \
+ -e "s/^YY_BUFFER_STATE yy_create_buffer/static YY_BUFFER_STATE
yy_create_buffer/g" \
+ -e "s/^void yy_load_buffer_state/static void yy_load_buffer_state/g" \
+ -e "s/^void yyrestart/static void yyrestart/g" \
+@@ -57,23 +60,25 @@
+ -e "s/^int yyprevious/static int yyprevious/g" \
+ -e "s/^char \*yysptr/static char \*yysptr/g" \
+ -e "s/^int yylineno/static int yylineno/g" \
++ -e "/^extern int yylineno/d" \
+ -e "s/^char yyextra/static char yyextra/g" \
+ -e "s/^char yymatch/static char yymatch/g" \
+ -e "s/^struct yywork \*yytop/static struct yywork \*yytop/g" \
+ -e "s/^struct yywork { YYTYPE verify, advance; } yycrank/static struct
yywork { YYTYPE verify, advance; } yycrank/g" \
+ -e "s/^FILE \*yyin/static FILE \*yyin/g" \
++ -e "/^extern FILE \*yyin/d" \
+ -e "s/^struct yysvf \*yybgin/static struct yysvf \*yybgin/g" \
+ -e "s/^int yyvstop/static int yyvstop/g" \
+ -e "s/^int yylook/static int yylook/g" \
+ -e "s/^struct yysvf yysvec/static struct yysvf yysvec/g" \
+ -e "s/^int yylex/static int yylex/g" \
+- -e "s/^yylex/static int yylex/g" \
++ -e "s/^extern int yywrap/static int yywrap/g" \
++ -e "/^extern int yylex/d" \
+ -e "s/^#define YY_DECL int yylex/#define YY_DECL static int yylex/g" \
+ -e "s/^# define input().*/# define input() (\*global_ptr++)/g" \
+ -e "s/^static int input().*/static int redef_input()/g" \
+ -e "s/^# define unput(c).*/# define unput(c) (\*--global_ptr=c)/g" \
+ -e "s/^#define unput(c).*/#define unput(c) (\*--global_ptr=c)/g" \
+- -e "/^#line/d" \
+ -e "/^static char \*global_ptr\;/i\
+ #define YY_NO_INPUT" -e "/^static char \*global_ptr\;/i\
+ #define YY_NO_UNPUT" -e "/^static char \*global_ptr\;/i\
+diff -Nru3 ./im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.in
../build-tree.new/im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.in
+--- im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.in
2004-08-16 06:28:05.000000000 -0700
++++ im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.in
2005-09-01 02:31:33.000000000 -0700
+@@ -593,6 +593,9 @@
+ -e "s/parse_small_token/parse_$*/g" \
+ -e "s/^void yyunput/static void yyunput/g" \
+ -e "s/^int yylen/static int yylen/g" \
++ -e "/^extern int yylen/d" \
++ -e "/^#undef YY_INPUT/i \
++ static int loc_input (char *buf, int ms);" \
+ -e "s/^YY_BUFFER_STATE yy_create_buffer/static YY_BUFFER_STATE
yy_create_buffer/g" \
+ -e "s/^void yy_load_buffer_state/static void yy_load_buffer_state/g" \
+ -e "s/^void yyrestart/static void yyrestart/g" \
+@@ -616,23 +619,25 @@
+ -e "s/^int yyprevious/static int yyprevious/g" \
+ -e "s/^char \*yysptr/static char \*yysptr/g" \
+ -e "s/^int yylineno/static int yylineno/g" \
++ -e "/^extern int yylineno/d" \
+ -e "s/^char yyextra/static char yyextra/g" \
+ -e "s/^char yymatch/static char yymatch/g" \
+ -e "s/^struct yywork \*yytop/static struct yywork \*yytop/g" \
+ -e "s/^struct yywork { YYTYPE verify, advance; } yycrank/static struct
yywork { YYTYPE verify, advance; } yycrank/g" \
+ -e "s/^FILE \*yyin/static FILE \*yyin/g" \
++ -e "/^extern FILE \*yyin/d" \
+ -e "s/^struct yysvf \*yybgin/static struct yysvf \*yybgin/g" \
+ -e "s/^int yyvstop/static int yyvstop/g" \
+ -e "s/^int yylook/static int yylook/g" \
+ -e "s/^struct yysvf yysvec/static struct yysvf yysvec/g" \
+ -e "s/^int yylex/static int yylex/g" \
+- -e "s/^yylex/static int yylex/g" \
++ -e "s/^extern int yywrap/static int yywrap/g" \
++ -e "/^extern int yylex/d" \
+ -e "s/^#define YY_DECL int yylex/#define YY_DECL static int yylex/g" \
+ -e "s/^# define input().*/# define input() (\*global_ptr++)/g" \
+ -e "s/^static int input().*/static int redef_input()/g" \
+ -e "s/^# define unput(c).*/# define unput(c) (\*--global_ptr=c)/g" \
+ -e "s/^#define unput(c).*/#define unput(c) (\*--global_ptr=c)/g" \
+- -e "/^#line/d" \
+ -e "/^static char \*global_ptr\;/i\
+ #define YY_NO_INPUT" -e "/^static char \*global_ptr\;/i\
+ #define YY_NO_UNPUT" -e "/^static char \*global_ptr\;/i\
+diff -Nru3 ./im-sdk-r11_4-1870/leif/canna/CannaLE.c
im-sdk-r11_4-1870/leif/canna/CannaLE.c
+--- ./im-sdk-r11_4-1870/leif/canna/CannaLE.c 2004-08-16 00:31:54.000000000
-0700
++++ im-sdk-r11_4-1870/leif/canna/CannaLE.c 2005-09-01 03:27:42.798116123
-0700
+@@ -118,6 +118,7 @@
+ void canna_status_draw_off(iml_session_t *s);
+ static void canna_change_mode(iml_session_t *s, int id);
+ static Bool canna_drop_privilege(const char *username);
++static int canna_get_current_mode(iml_session_t *s);
+
+ /* IF Method */
+ if_methods_t canna_methods = {
+--- ./im-sdk-r11_4-1870/leif/sampleja3/xaux_common/xaux_ext_common.h
2005-09-01 03:59:51.297887161 -0700
++++ im-sdk-r11_4-1870/leif/sampleja3/xaux_common/xaux_ext_common.h
2005-09-01 04:00:13.464928210 -0700
+@@ -80,10 +80,6 @@
+ extern Bool xaux_ext_Draw(xaux_class_t *, aux_ext_data_t *);
+ extern Bool xaux_ext_Done(xaux_class_t *, aux_ext_data_t *);
+
+-/* conversion utilities */
+-extern size_t utf16_mb(const char **, size_t *, char **, size_t *);
+-extern size_t mb_utf16(const char **, size_t *, char **, size_t *);
+-
+ #ifndef linux
+ #include <Xm/Xm.h>
+ #endif
+--- ./im-sdk-r11_4-1870/leif/sampleja3/xaux_common/xaux_ext_common.c
2004-08-16 00:31:54.000000000 -0700
++++ im-sdk-r11_4-1870/leif/sampleja3/xaux_common/xaux_ext_common.c
2005-09-01 04:01:15.176262833 -0700
+@@ -55,6 +55,16 @@
+ #include "xaux_common.h"
+ #include "xaux_ext_common.h"
+
++static Bool
++xaux_xs_send_message(
++ Display * display,
++ xaux_class_t * xc,
++ int im_id,
++ int ic_id,
++ aux_ext_data_type_t type,
++ Atom atom);
++
++
+ /* from iiimpAux.c */
+ static size_t
+ utf16_mb(
+
+diff -urN ../im-sdk-r11_4-1870/iiimsf/src/LE.cpp
im-sdk-r11_4-1870/iiimsf/src/LE.cpp
+--- ../im-sdk-r11_4-1870/iiimsf/src/LE.cpp 2004-08-16 07:41:39.000000000
+0000
++++ im-sdk-r11_4-1870/iiimsf/src/LE.cpp 2005-09-07 12:23:08.000000000
+0000
+@@ -313,7 +313,7 @@
+ {
+ // later, we should use TLS or something.
+ s->SessionContext = pimlex;
+- LOG_DEBUG("Bound imlexec:(%x -> %x)", (int) s, (int) pimlex);
++ LOG_DEBUG("Bound imlexec:(%lx -> %lx)", (long) s, (long) pimlex);
+ }
+
+ bool
+@@ -447,7 +447,7 @@
+ {
+ IMLock lock(get_leif_sync_object());
+ s = iml_construct_session(iml_desktop, &args[0], args.size());
+- LOG_DEBUG("Create session context(%x)", (int) s);
++ LOG_DEBUG("Create session context(%lx)", (long) s);
+ }
+ if (!s) return false;
+
+@@ -488,7 +488,7 @@
+ {
+ IMLock lock(get_leif_sync_object());
+ if (s) {
+- LOG_DEBUG("Destroy session context(%x)", (int) s);
++ LOG_DEBUG("Destroy session context(%lx)", (long) s);
+ if_DestroySC_WithoutDesktopDestruction(s);
+ }
+ }
+diff -urN ../im-sdk-r11_4-1870/iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp
im-sdk-r11_4-1870/iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp
+--- ../im-sdk-r11_4-1870/iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp
2004-08-16 07:42:18.000000000 +0000
++++ im-sdk-r11_4-1870/iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp
2005-09-07 12:34:06.000000000 +0000
+@@ -197,7 +197,7 @@
+ application_name = (char*)argp->value; // extension
+ break;
+ case DisableStatusArea:
+- disable_status_area = (Bool)argp->value; // extension
++ disable_status_area = (long)argp->value; // extension
+ break;
+ case DefaultFontName:
+ default_font_name = (char*)argp->value; // extension
only in patch2:
unchanged:
--- im-sdk-11.4.1870.orig/debian/patches/006_ppc64.patch
+++ im-sdk-11.4.1870/debian/patches/006_ppc64.patch
@@ -0,0 +1,12 @@
+diff -urN ../im-sdk-r11_4-1870/iiimxcf/xiiimp.so/iiimp/iiimpDL.c
im-sdk-r11_4-1870/iiimxcf/xiiimp.so/iiimp/iiimpDL.c
+--- ../im-sdk-r11_4-1870/iiimxcf/xiiimp.so/iiimp/iiimpDL.c 2005-09-09
10:53:09.000000000 +0200
++++ im-sdk-r11_4-1870/iiimxcf/xiiimp.so/iiimp/iiimpDL.c 2005-09-09
11:29:58.000000000 +0200
+@@ -54,7 +54,7 @@
+ #ifdef _LP64
+ # if defined(__sparcv9)
+ # define _MACH64_NAME "sparcv9"
+-# elif defined(__amd64__) || defined(__ia64__)
++# elif defined(__amd64__) || defined(__ia64__) || defined(__powerpc64__)
+ # undef _MACH64_NAME
+ # else
+ # error "Unknown architecture"
--- End Message ---
--- Begin Message ---
Version: 12.3.91-5
This bug should have been fixed upstream, and the fixes are now in 12.3.91-5.
Thanks
Roger
--- End Message ---
