pkg/34034: [patch] (gcc-4) www/mozilla gets conflicts with new declaration with 'C' linkage

[makoto%ki.nu@localhost]

>Number:         34034
>Category:       pkg
>Synopsis:       making mozilla gets error with 'C' linkage
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jul 19 00:50:00 +0000 2006
>Originator:     Makoto Fujiwara
>Release:        NetBSD 3.99.21
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD yoshimi.ki.nu 3.99.21 NetBSD 3.99.21 (GENERIC) #0: Sat Jul 15 
18:48:07 JST 2006 
root@mini:/export/20060702/checkout/src/sys/arch/macppc/compile/GENERIC macppc
Architecture: powerpc
Machine: macppc
>Description:
        www/mozilla gets gcc-4 error as
    c++ -o mimemult.o -c -DE ....
    mimemult.cpp:55: warning: missing braces around initializer for 
'MimeContainerClass'
    mimemult.cpp:55: warning: missing braces around initializer for 
'MimeObjectClass'
    mimeeobj.h:57: error: previous declaration of 'MimeExternalObjectClass 
mimeExternalObjectClass' with 'C++' linkage
    mimemult.cpp:76: error: conflicts with new declaration with 'C' linkage

>How-To-Repeat:
        get on gcc-4.1.2 machine
        cd /usr/pkgsrc/www/mozilla
        make
>Fix:

Index: distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/www/mozilla/distinfo,v
retrieving revision 1.90
diff -u -a -r1.90 distinfo
--- distinfo    6 Jun 2006 18:28:45 -0000       1.90
+++ distinfo    19 Jul 2006 00:06:24 -0000
@@ -47,3 +47,4 @@
 SHA1 (patch-cm) = 2a347bcf5814816539835caf65dd888f71ceea20
 SHA1 (patch-cn) = e9cb26ee724c044491cc1b02d6eeb59b50769edf
 SHA1 (patch-co) = 2d0c80d7f6df59c5c12f559f1c409a82e057959d
+SHA1 (patch-cp) = 7df879523ab36dabbdb7f8e729f8806472923d9a
Index: patches/patch-cp
===================================================================
RCS file: patches/patch-cp
diff -N patches/patch-cp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-cp    19 Jul 2006 00:34:11 -0000      1.1
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- mailnews/mime/src/mimeeobj.h.~1.3.~        2001-09-29 05:07:42.000000000 
+0900
++++ mailnews/mime/src/mimeeobj.h       2006-07-19 08:38:25.000000000 +0900
+@@ -54,7 +54,7 @@
+   MimeLeafClass leaf;
+ };
+ 
+-extern MimeExternalObjectClass mimeExternalObjectClass;
++extern "C" MimeExternalObjectClass mimeExternalObjectClass;
+ 
+ struct MimeExternalObject {
+   MimeLeaf leaf;
        

>Unformatted: