Package: mozilla-firefox
Severity: normal
Tags: patch

When building 'mozilla-firefox' on amd64 or ppc64 with gcc-4.0,
I get the following error:

make[5]: Entering directory 
`/srv/dbuild/tmp/mozilla-firefox-1.0.2/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/srv/dbuild/tmp/mozilla-firefox-1.0.2/dist/include  
-I../../../../dist/public/nss -I../../../../dist/private/nss 
-I../../../../dist/include 
-I/srv/dbuild/tmp/mozilla-firefox-1.0.2/dist/include/nspr 
-I/srv/dbuild/tmp/mozilla-firefox-1.0.2/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 
`/srv/dbuild/tmp/mozilla-firefox-1.0.2/security/nss/lib/pki'

With the attached patch 'mozilla-firefox' can be compiled
on amd64 with gcc-4.0.

Regards
Andreas Jochens

diff -urN ../tmp-orig/mozilla-firefox-1.0.1/security/nss/lib/pki1/oiddata.h 
./security/nss/lib/pki1/oiddata.h
--- ../tmp-orig/mozilla-firefox-1.0.1/security/nss/lib/pki1/oiddata.h   
2002-01-04 06:22:07.000000000 +0100
+++ ./security/nss/lib/pki1/oiddata.h   2005-03-22 14:25:10.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-orig/mozilla-firefox-1.0.1/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
 ./netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
--- 
../tmp-orig/mozilla-firefox-1.0.1/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
 2004-09-02 01:31:03.000000000 +0200
+++ ./netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-03-22 
13:27:34.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-orig/mozilla-firefox-1.0.1/gfx/src/freetype/nsFreeType.cpp 
./gfx/src/freetype/nsFreeType.cpp
--- ../tmp-orig/mozilla-firefox-1.0.1/gfx/src/freetype/nsFreeType.cpp   
2004-02-07 16:22:30.000000000 +0100
+++ ./gfx/src/freetype/nsFreeType.cpp   2005-03-22 13:45: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-orig/mozilla-firefox-1.0.1/widget/src/gtk2/nsDragService.cpp 
./widget/src/gtk2/nsDragService.cpp
--- ../tmp-orig/mozilla-firefox-1.0.1/widget/src/gtk2/nsDragService.cpp 
2003-10-30 02:48:41.000000000 +0100
+++ ./widget/src/gtk2/nsDragService.cpp 2005-03-22 13:59:04.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));
@@ -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));
@@ -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));



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to