Package: mozilla
Version: 2:1.7.6-1
Severity: normal
Tags: patch
When building 'mozilla' on amd64/unstable with gcc-4.0,
I get the following error:
make[5]: Entering directory
`/mozilla-1.7.6/build-tree/mozilla/security/nss/lib/pki'
gcc -o Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ/asymmkey.o -c -O2 -fPIC -DLINUX1_2
-D_XOPEN_SOURCE -DLINUX2_1 -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE
-D_BSD_SOURCE -DHAVE_STRERROR -DXP_UNIX -DNSS_3_4_CODE -UDEBUG -DNDEBUG
-D_REENTRANT -I/mozilla-1.7.6/build-tree/mozilla/dist/include
-I../../../../dist/public/nss -I../../../../dist/private/nss
-I../../../../dist/include
-I/mozilla-1.7.6/build-tree/mozilla/dist/include/nspr
-I/mozilla-1.7.6/build-tree/mozilla/dist/include/dbm
-I../../../../dist/public/nspr asymmkey.c
In file included from ../../../../dist/private/nss/nsspki1.h:57,
from nsspki.h:56,
from asymmkey.c:39:
../../../../dist/private/nss/oiddata.h:46: error: array type has incomplete
element type
make[5]: *** [Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ/asymmkey.o] Error 1
make[5]: Leaving directory
`/mozilla-1.7.6/build-tree/mozilla/security/nss/lib/pki'
With the attached patch 'mozilla' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/mozilla-1.7.6/debian/patches/gcc4-fix
./debian/patches/gcc4-fix
--- ../tmp-orig/mozilla-1.7.6/debian/patches/gcc4-fix 1970-01-01
01:00:00.000000000 +0100
+++ ./debian/patches/gcc4-fix 2005-03-26 10:19:08.000000000 +0100
@@ -0,0 +1,101 @@
+diff -urN tmp/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
+--- tmp/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2004-09-02
01:45:24.000000000 +0200
++++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-03-11
12:46:05.000000000 +0100
+@@ -834,8 +834,8 @@
+ void
+ nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
+ {
+- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16;
+- PRUint16 value = PRUint32(param) & 0x0000FFFF;
++ PRUint16 name = (long(param) & 0xFFFF0000) >> 16;
++ PRUint16 value = long(param) & 0x0000FFFF;
+
+ switch (name) {
+ case MAX_CONNECTIONS:
+diff -urN tmp/gfx/src/freetype/nsFreeType.cpp
mozilla/gfx/src/freetype/nsFreeType.cpp
+--- tmp/gfx/src/freetype/nsFreeType.cpp 2004-02-07 16:22:30.000000000
+0100
++++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-03-11 13:19:02.000000000
+0100
+@@ -96,7 +96,7 @@
+ // Define the FreeType2 functions we resolve at run time.
+ // see the comment near nsFreeType2::DoneFace() for more info
+ //
+-#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
++#define NS_FT2_OFFSET(f) (long)&((nsFreeType2*)0)->f
+ FtFuncList nsFreeType2::FtFuncs [] = {
+ {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face),
PR_TRUE},
+ {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType),
PR_TRUE},
+diff -urN tmp/widget/src/gtk2/nsDragService.cpp
mozilla/widget/src/gtk2/nsDragService.cpp
+--- tmp/widget/src/gtk2/nsDragService.cpp 2003-10-30 02:48:41.000000000
+0100
++++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-03-11 13:57:55.000000000
+0100
+@@ -838,7 +838,7 @@
+ (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+ listTarget->target = g_strdup(gMimeListType);
+ listTarget->flags = 0;
+- listTarget->info = (guint)listAtom;
++ listTarget->info = (gulong)listAtom;
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with id %ld\n",
+ listTarget->target, listAtom));
+@@ -877,7 +877,7 @@
+ (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
+ listTarget->target = g_strdup(gTextUriListType);
+ listTarget->flags = 0;
+- listTarget->info = (guint)listAtom;
++ listTarget->info = (gulong)listAtom;
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with \
+ id %ld\n", listTarget->target, listAtom));
+@@ -931,7 +931,7 @@
+ (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
+ plainTarget->target = g_strdup(kTextMime);
+ plainTarget->flags = 0;
+- plainTarget->info = (guint)plainAtom;
++ plainTarget->info = (gulong)plainAtom;
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with \
+ id %ld\n", plainTarget->target,
plainAtom));
+@@ -948,7 +948,7 @@
+ (GtkTargetEntry
*)g_malloc(sizeof(GtkTargetEntry));
+ urlTarget->target = g_strdup(gMozUrlType);
+ urlTarget->flags = 0;
+- urlTarget->info = (guint)urlAtom;
++ urlTarget->info = (gulong)urlAtom;
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("automatically adding target %s with \
+ id %ld\n", urlTarget->target, urlAtom));
+diff -urN tmp/widget/src/gtk2/nsDragService.cpp
mozilla/widget/src/gtk2/nsDragService.cpp
+--- tmp/widget/src/gtk2/nsDragService.cpp 2005-03-11 13:57:55.000000000
+0100
++++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-03-11 14:17:52.000000000
+0100
+@@ -914,7 +914,7 @@
+ (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+ target->target = g_strdup(flavorStr);
+ target->flags = 0;
+- target->info = (guint)atom;
++ target->info = (gulong)atom;
+ PR_LOG(sDragLm, PR_LOG_DEBUG,
+ ("adding target %s with id %ld\n",
+ target->target, atom));
+diff -urN tmp/dist/private/nss/oiddata.h
mozilla/security/nss/lib/pki1/oiddata.h
+--- tmp/dist/private/nss/oiddata.h 2002-01-04 06:22:07.000000000 +0100
++++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-12 11:27:09.000000000
+0100
+@@ -43,7 +43,7 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+
+-extern const NSSOID nss_builtin_oids[];
++extern const NSSOID *nss_builtin_oids;
+ extern const PRUint32 nss_builtin_oid_count;
+
+ /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+diff -urN tmp/security/nss/lib/pki1/oiddata.c
mozilla/security/nss/lib/pki1/oiddata.c
+--- tmp/security/nss/lib/pki1/oiddata.c 2002-01-04 06:22:07.000000000
+0100
++++ mozilla/security/nss/lib/pki1/oiddata.c 2005-03-12 11:28:16.000000000
+0100
+@@ -39,7 +39,7 @@
+ #include "pki1t.h"
+ #endif /* PKI1T_H */
+
+-const NSSOID nss_builtin_oids[] = {
++const NSSOID *nss_builtin_oids = {
+ {
+ #ifdef DEBUG
+ "ccitt",
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
