Package: uim
Version: 1:1.1.0-1.0.1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my uim 1:1.1.0-1.1 NMU.
diff -u uim-1.1.0/debian/changelog uim-1.1.0/debian/changelog
--- uim-1.1.0/debian/changelog
+++ uim-1.1.0/debian/changelog
@@ -1,3 +1,12 @@
+uim (1:1.1.0-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Make must_malloc return void* instead of char*, like the real malloc;
+ fixes FTBFS on several architectures since the package is built using
+ -Wcast-align -Werror. (Closes: #375081)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Wed, 5 Jul 2006 22:03:59 +0200
+
uim (1:1.1.0-1.0.1) unstable; urgency=low
* NMU.
only in patch2:
unchanged:
--- uim-1.1.0.orig/debian/patches/09_fix_ftbfs_on_alpha.dpatch
+++ uim-1.1.0/debian/patches/09_fix_ftbfs_on_alpha.dpatch
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_fix_ftbfs_on_alpha.dpatch by Steinar H. Gunderson <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix "cast increases required alignment of target type" warnings
+## DP: (turned into errors due to -Werror) on several architectures, among
+## DP: them alpha.
+
[EMAIL PROTECTED]@
+--- uim-0.4.7.orig/uim/slib.c 2006-06-09 03:46:13.000000000 +0200
++++ uim-0.4.7/uim/slib.c 2006-07-05 22:02:18.000000000 +0200
+@@ -241,7 +241,7 @@
+ #endif
+ static LISP lapply (LISP fcn, LISP args);
+ static LISP listn (long n,...);
+-static char *must_malloc (unsigned long size);
++static void *must_malloc (unsigned long size);
+ static FILE *get_c_file (LISP p, FILE * deflt);
+ #if 0
+ static char *last_c_errmsg (int);
+@@ -2158,12 +2158,12 @@
+ }
+
+
+-static char *
++static void *
+ must_malloc (unsigned long size)
+ {
+- char *tmp;
+- tmp = (char *) malloc ((size) ? size : 1);
+- if (tmp == (char *) NULL)
++ void *tmp;
++ tmp = malloc ((size) ? size : 1);
++ if (tmp == NULL)
+ my_err ("failed to allocate storage from system", NIL);
+ return (tmp);
+ }
+@@ -2973,7 +2973,7 @@
+ }
+ setjmp (save_regs_gc_mark);
+ mark_locations ((LISP *) (uintptr_t)save_regs_gc_mark,
+- (LISP *) (((char *) save_regs_gc_mark) + sizeof (save_regs_gc_mark)));
++ ((LISP *) ((void *) save_regs_gc_mark)) + 1);
+ mark_protected_registers ();
+ mark_locations ((LISP *) stack_start_ptr,
+ (LISP *) & stack_end);
only in patch2:
unchanged:
--- uim-1.1.0.orig/debian/patches/00list
+++ uim-1.1.0/debian/patches/00list
@@ -0,0 +1 @@
+09_fix_ftbfs_on_alpha
