pkg/34155: www/mozilla: fails to build on -current

[Auster <lrou%rtk0.lneuro.x.ua@localhost>]

>Number:         34155
>Category:       pkg
>Synopsis:       www/mozilla: fails to build on -current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Aug 07 11:50:00 +0000 2006
>Originator:     Auster
>Release:        NetBSD 3.99.24
>Organization:
>Environment:
System: NetBSD lrou.x.ua 3.99.24 NetBSD 3.99.24 (lrou-1.771) #0: Sun Aug 6 
12:46:42 EEST 2006 yx%lrou.x.ua@localhost:/sys/arch/i386/compile/lrou i386
Architecture: i386
Machine: i386
>Description:

        www/mozilla: fails to build on -current (3.99.24)


>How-To-Repeat:

# cd /usr/pkgsrc/www/mozilla
# make
[snip]
c++ -o mimemult.o -c -DENABLE_SMIME -DOSTYPE=\"NetBSD3.99\" -DOSARCH=\"NetBSD\" 
 -I../../../dist/include/xpcom -I../../../dist/include/xpcom_obsolete 
-I../../../dist/include/string -I../../../dist/include/msgbase 
-I../../../dist/include/msgbaseutil -I../../../dist/include/pref 
-I../../../dist/include/js -I../../../dist/include/necko 
-I../../../dist/include/uconv -I../../../dist/include/unicharutil 
-I../../../dist/include/msgcompose -I../../../dist/include/dom 
-I../../../dist/include/intl -I../../../dist/include/msgimap 
-I../../../dist/include/exthandler -I../../../dist/include/mailnews 
-I../../../dist/include/msgdb -I../../../dist/include/chardet 
-I../../../dist/include/caps -I../../../dist/include/mimetype 
-I../../../dist/include/uriloader -I../../../dist/include/xpconnect 
-I../../../dist/include/nkcache -I../../../dist/include/pipnss 
-I../../../dist/include/imglib2 -I../../../dist/include/content 
-I../../../dist/include/htmlparser -I../../../dist/include/layout -I../../../!
 dist/include/msgsmime -I../../../dist/include/mime -I../../../dist/include 
-I/usr/obj/www/mozilla.orig/work/mozilla/dist/include/nspr  -I/usr/pkg/include 
-I/usr/pkg/include  -I/usr/pkg/xorg/include   -fPIC -DPIC  -I/usr/pkg/include 
-I/usr/pkg/include/gdk-pixbuf-1.0 -I/usr/include -I/usr/pkg/include/freetype2  
-I/usr/pkg/xorg/include -fno-rtti -fno-exceptions -Wall -Wconversion 
-Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth 
-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wno-long-long -O2 -march=pentium4 
-finline-functions -ffast-math -I/usr/pkg/include 
-I/usr/pkg/include/gdk-pixbuf-1.0 -I/usr/include -I/usr/pkg/include/freetype2 
-march=pentium4 -finline-functions -ffast-math -Dunix -fshort-wchar -pthread 
-pipe  -DNDEBUG -DTRIMMED -O2  -I/usr/pkg/include 
-I/usr/pkg/include/gdk-pixbuf-1.0 -I/usr/include -I/usr/pkg/include/freetype2  
-I/usr/pkg/xorg/include -DMOZILLA_CLIENT -include ../../../mozilla-config.h 
-Wp,-MD,.deps/mimemult.pp mimemult.cpp
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
make[4]: *** [mimemult.o] Error 1
make[4]: Leaving directory `/usr/obj/www/mozilla/work/mozilla/mailnews/mime/src'
make[3]: *** [libs] Error 2
make[3]: Leaving directory `/usr/obj/www/mozilla/work/mozilla/mailnews/mime'
make[2]: *** [libs] Error 2
make[2]: Leaving directory `/usr/obj/www/mozilla/work/mozilla/mailnews'
make[1]: *** [tier_97] Error 2
make[1]: Leaving directory `/usr/obj/www/mozilla/work/mozilla'
gmake: *** [default] Error 2
*** Error code 2

Stop.
make: stopped in /usr/pkgsrc/www/mozilla
*** Error code 1
[snip]


>Fix:
% diff -ruN www/mozilla.orig www/mozilla
diff -ruN www/mozilla.orig/distinfo www/mozilla/distinfo
--- www/mozilla.orig/distinfo   2006-08-07 11:37:11.000000000 +0300
+++ www/mozilla/distinfo        2006-08-06 20:35:52.000000000 +0300
@@ -47,3 +47,4 @@
 SHA1 (patch-cm) = 2a347bcf5814816539835caf65dd888f71ceea20
 SHA1 (patch-cn) = e9cb26ee724c044491cc1b02d6eeb59b50769edf
 SHA1 (patch-co) = 2d0c80d7f6df59c5c12f559f1c409a82e057959d
+SHA1 (patch-cp) = 07f66a5222c5e03042aafc402207e3c1f0354865
diff -ruN www/mozilla.orig/patches/patch-cp www/mozilla/patches/patch-cp
--- www/mozilla.orig/patches/patch-cp   1970-01-01 03:00:00.000000000 +0300
+++ www/mozilla/patches/patch-cp        2006-08-06 20:34:47.000000000 +0300
@@ -0,0 +1,11 @@
+--- mailnews/mime/src/mimemult.cpp.orig        2006-08-06 20:32:09.000000000 
+0300
++++ mailnews/mime/src/mimemult.cpp
+@@ -73,7 +73,7 @@
+ extern "C" MimeObjectClass mimeMultipartRelatedClass;
+ extern "C" MimeObjectClass mimeMultipartSignedClass;
+ extern "C" MimeObjectClass mimeInlineTextVCardClass;
+-extern "C" MimeExternalObjectClass mimeExternalObjectClass;
++/* extern "C" MimeExternalObjectClass mimeExternalObjectClass; */
+ 
+ #if defined(DEBUG) && defined(XP_UNIX)
+ static int MimeMultipart_debug_print (MimeObject *, PRFileDesc *, PRInt32);