# HG changeset patch
# User t_mrc-ct@sourceforge.jp
# Date 1349258769 -32400
# Branch GECKO1708_2013080114_RELBRANCH
# Node ID 6ab1dae9e80c11d8ec80c70518fec3b113a9c800
# Parent  0efb9360fab96c2e0493aa79b47def5af7809e84
fix build errors (disable webrtc etc...)

diff --git a/DEBUG.mozcfg b/DEBUG.mozcfg
--- a/DEBUG.mozcfg
+++ b/DEBUG.mozcfg
@@ -11,6 +11,7 @@
 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
@@ -20,3 +21,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
@@ -3,8 +3,8 @@
 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
@@ -20,3 +20,5 @@
 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
@@ -3,8 +3,8 @@
 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
@@ -22,4 +22,6 @@
 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
@@ -3,8 +3,8 @@
 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
@@ -22,4 +22,5 @@
 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
@@ -3,8 +3,8 @@
 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
@@ -23,4 +23,5 @@
 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
@@ -664,7 +664,7 @@
   if (::FMGetFontFromFontFamilyInstance(family,
                                         fontStyle,
                                         &fmFont,
-                                        nsnull) != noErr)
+                                        nullptr) != noErr)
   {
     NS_WARNING("FMGetFontFromFontFamilyInstance failed");
     ::EndCGContextForApplicationDockTile(context);
