And now also send the patch ...

---------- Forwarded message ----------
Hello.

Enclosed please find fix of original 50_kbsd.dpatch.
With attached patch applied against 1.5.0.8-3,
icedove builds fine on (linux-)amd64.
This platform have been previously affected,
(http://buildd.debian.org/build.php?&pkg=icedove&ver=1.5.0.8-2&arch=amd64&file=log)
now it builds fine.

Please, could you reenable fixed kbsd dpatches.

Petr
diff -u icedove-1.5.0.8/debian/patches/00list 
icedove-1.5.0.8/debian/patches/00list
--- icedove-1.5.0.8/debian/patches/00list
+++ icedove-1.5.0.8/debian/patches/00list
@@ -14,13 +14,13 @@
 50_arch_mips_preemptive
 50_arch_parisc_Makefile_fix
 50_arch_parisc_fix
-#50_kbsd_nspr
-#50_kbsd
-#50_kbsd_csdk
+50_kbsd_nspr
+50_kbsd
+50_kbsd_csdk
 70_gtk-settings-patch
 70_exclude_sep_extensions_autobuild
 70_single_typeaheadfind_package.dpatch
-90_ppc64-build-fix
+#90_ppc64-build-fix
 91_fontsfix_359763
 91_replytolist
 91_gnome_path_fix
diff -u icedove-1.5.0.8/debian/patches/50_kbsd.dpatch 
icedove-1.5.0.8/debian/patches/50_kbsd.dpatch
--- icedove-1.5.0.8/debian/patches/50_kbsd.dpatch
+++ icedove-1.5.0.8/debian/patches/50_kbsd.dpatch
@@ -137,7 +137,7 @@
 diff -urN mozilla/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
 --- mozilla/security/coreconf/Linux.mk 2005-02-02 00:39:18.000000000 +0100
 +++ mozilla/security/coreconf/Linux.mk 2006-11-20 22:16:26.000000000 +0100
-@@ -52,59 +52,35 @@
+@@ -52,59 +52,34 @@
  
  DEFAULT_COMPILER = gcc
  
@@ -204,7 +204,7 @@
 -      OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 -      CPU_ARCH        = mips
 +ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
- else
+-else
 -      OS_REL_CFLAGS   = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
 +      OS_REL_CFLAGS   += -Di386
        CPU_ARCH        = x86

Reply via email to