cmcfixes74: merge with DEV300 m79

moz/makefile.mk

@@ -85,7 +85,12 @@ PATCH_FILES = \
     seamonkey-source-$(MOZILLA_VERSION).patch \
     patches/dtoa.patch \
     patches/respect_disable_pango.patch \
-    patches/arm_build_fix.patch
+    patches/arm_build_fix.patch \
+    patches/link_fontconfig.patch
+
+.IF "$(OUTPATH)"=="unxlngi6"
+PATCH_FILES += patches/linux_libc2.5.patch
+.ENDIF
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)

moz/patches/link_fontconfig.patch

+--- misc/mozilla/gfx/src/gtk/Makefile.in	2010-03-16 14:44:44.000000000 +0000
++++ misc/build/mozilla/gfx/src/gtk/Makefile.in	2010-03-16 14:45:08.000000000 +0000
+@@ -183,7 +183,7 @@
+ endif
+ 
+ ifdef MOZ_ENABLE_XFT
+-EXTRA_DSO_LDOPTS += $(FT2_LIBS)
++EXTRA_DSO_LDOPTS += $(FT2_LIBS) -lfontconfig
+ 
+ libs:: fontEncoding.properties pangoFontEncoding.properties
+ 	$(INSTALL) $^ $(DIST)/bin/res/fonts

moz/patches/linux_libc2.5.patch

+--- misc/mozilla/configure	2010-04-14 18:08:55.402759185 +0200
++++ misc/build/mozilla/configure	2010-04-14 18:07:13.036410334 +0200
+@@ -11886,7 +11886,7 @@
+         $(DIST)/lib/$(LIB_PREFIX)nss'$NSS_VERSION'.$(IMPORT_LIB_SUFFIX) \\\
+         $(DIST)/lib/$(LIB_PREFIX)softokn'$NSS_VERSION'.$(IMPORT_LIB_SUFFIX)'
+    else
+-       NSS_LIBS='-L$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lsoftokn$NSS_VERSION"
++       NSS_LIBS='-L$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lnssutil$NSS_VERSION -lsoftokn$NSS_VERSION"
+    fi
+ fi
+