# HG changeset patch
# User t_mrc-ct@sourceforge.jp
# Date 1349258769 -32400
# Branch GECKO3110_2014082819_RELBRANCH
# Node ID 5b7f87e3dd777ffc561977aa37a1417051566843
# Parent  6aacccd9f290d5b8051653bf00fb56e706460f4d
fix build errors (disable webrtc etc...)

diff --git a/DEBUG.mozcfg b/DEBUG.mozcfg
--- a/DEBUG.mozcfg
+++ b/DEBUG.mozcfg
@@ -6,17 +6,19 @@
 
 CC="gcc-4.0 -arch ppc"
 CXX="g++-4.0 -arch ppc"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
 ac_add_options --disable-tests
 ac_add_options --disable-static
 ac_add_options --disable-crashreporter
+ac_add_options --disable-webrtc
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --enable-debug
 ac_add_options --enable-printing
 ac_add_options --enable-prebinding
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --enable-debug-symbols=-gdwarf-2
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
+ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
diff --git a/G3.mozcfg b/G3.mozcfg
--- a/G3.mozcfg
+++ b/G3.mozcfg
@@ -1,22 +1,24 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-crypto
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-g3
 
-CC="gcc-4.0 -arch ppc -O3 -mcpu=G3 -mtune=G3"
-CXX="g++-4.0 -arch ppc -O3 -mcpu=G3 -mtune=G3"
+export CC="/usr/bin/gcc-4.0 -arch ppc -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
+export CXX="/usr/bin/g++-4.0 -arch ppc -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
 ac_add_options --disable-tests
 ac_add_options --disable-static
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-debug
 ac_add_options --disable-crashreporter
 ac_add_options --enable-printing
 ac_add_options --enable-prebinding
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
+ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
+ac_add_options --disable-webrtc
diff --git a/G4-7400.mozcfg b/G4-7400.mozcfg
--- a/G4-7400.mozcfg
+++ b/G4-7400.mozcfg
@@ -1,15 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-crypto
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-7400
 
-CC="gcc-4.0 -arch ppc7400 -O3 -mcpu=7400 -mtune=7400 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress"
-CXX="g++-4.0 -arch ppc7400 -O3 -mcpu=7400 -mtune=7400 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress"
+CC="/usr/bin/gcc-4.0 -arch ppc7400 -O3 -mcpu=7400 -mtune=7400 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress -mdynamic-no-pic"
+CXX="/usr/bin/g++-4.0 -arch ppc7400 -O3 -mcpu=7400 -mtune=7400 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress -mdynamic-no-pic"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
 ac_add_options --disable-tests
 ac_add_options --disable-static
 ac_add_options --disable-crashreporter
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-debug
@@ -17,9 +17,11 @@
 ac_add_options --enable-prebinding
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
 ac_add_options --enable-tenfourfox-vmx
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
 ac_add_options --with-system-jpeg
+ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
+ac_add_options --disable-webrtc
 
diff --git a/G4-7450.mozcfg b/G4-7450.mozcfg
--- a/G4-7450.mozcfg
+++ b/G4-7450.mozcfg
@@ -1,15 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-crypto
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-7450
 
-CC="gcc-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=7450 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -read_only_relocs suppress"
-CXX="g++-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=7450 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -read_only_relocs suppress"
+CC="/usr/bin/gcc-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=7450 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -read_only_relocs suppress -mdynamic-no-pic"
+CXX="/usr/bin/g++-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=7450 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -read_only_relocs suppress -mdynamic-no-pic"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
 ac_add_options --disable-tests
 ac_add_options --disable-static
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-debug
 ac_add_options --disable-crashreporter
@@ -17,9 +17,10 @@
 ac_add_options --enable-prebinding
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
 ac_add_options --enable-tenfourfox-vmx
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
 ac_add_options --with-system-jpeg
-
+ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
+ac_add_options --disable-webrtc
diff --git a/G5.mozcfg b/G5.mozcfg
--- a/G5.mozcfg
+++ b/G5.mozcfg
@@ -1,15 +1,15 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-crypto
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-g5
 
-CC="gcc-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=G5 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -mmfcrf -mpowerpc-gpopt -read_only_relocs suppress -force_cpusubtype_ALL -D_PPC970_"
-CXX="g++-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=G5 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -mmfcrf -mpowerpc-gpopt -read_only_relocs suppress -force_cpusubtype_ALL -D_PPC970_"
+CC="/usr/bin/gcc-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=G5 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -mmfcrf -mpowerpc-gpopt -read_only_relocs suppress -force_cpusubtype_ALL -mdynamic-no-pic -D_PPC970_"
+CXX="/usr/bin/g++-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=G5 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -mmfcrf -mpowerpc-gpopt -read_only_relocs suppress -force_cpusubtype_ALL -mdynamic-no-pic -D_PPC970_"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
 ac_add_options --disable-tests
 ac_add_options --disable-static
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-debug
 ac_add_options --disable-crashreporter
@@ -18,9 +18,10 @@
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
 ac_add_options --enable-tenfourfox-vmx
 ac_add_options --enable-tenfourfox-g5
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
 ac_add_options --with-system-jpeg
-
+ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
+ac_add_options --disable-webrtc
diff --git a/mailnews/base/src/nsMessengerOSXIntegration.mm b/mailnews/base/src/nsMessengerOSXIntegration.mm
--- a/mailnews/base/src/nsMessengerOSXIntegration.mm
+++ b/mailnews/base/src/nsMessengerOSXIntegration.mm
@@ -641,17 +641,17 @@
                  &fontSize, &fontStyle);
 
   FMFontFamily family = ::FMGetFontFamilyFromName(fontName);
   FMFont fmFont;
 
   if (::FMGetFontFromFontFamilyInstance(family,
                                         fontStyle,
                                         &fmFont,
-                                        nsnull) != noErr)
+                                        nullptr) != noErr)
   {
     NS_WARNING("FMGetFontFromFontFamilyInstance failed");
     ::EndCGContextForApplicationDockTile(context);
     return NS_ERROR_FAILURE;
   }
 
   ATSUStyle style;
   if (::ATSUCreateStyle(&style) != noErr)
