convert moz to gbuild and add to tail_build

Change-Id: I2d3f5d127f831ee9abc020d46558f7cfbe8c9380
Reviewed-on: https://gerrit.libreoffice.org/2349
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>

19 files changed, 0 insertions, 1200 deletions

diff --git a/moz/patches/aix_build_fix.patch b/moz/patches/aix_build_fix.patch
deleted file mode 100644
index d778532eeb44..000000000000
--- a/moz/patches/aix_build_fix.patch
+++ /dev/null
@@ -1,203 +0,0 @@
---- misc/mozilla/nsprpub/configure	2010-08-19 07:05:19.000000000 -0500
-+++ misc/build/mozilla/nsprpub/configure	2010-08-19 07:34:33.000000000 -0500
-@@ -2938,7 +2938,8 @@
- #define SYSV 1
- EOF
- 
--    DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
-+    MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
-+    DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
-     ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
- echo "configure:2944: checking for sys/atomic_op.h" >&5
-@@ -3067,7 +3068,6 @@
-         AIX_LINK_OPTS='-brtl -bnso -berok'
-         ;;
-     esac
--    CFLAGS="$CFLAGS -qro -qroconst"
-     AIX_WRAP='$(DIST)/lib/aixwrap.o'
-     AIX_TMP='./_aix_tmp.o'
-     if test -n "$USE_64"; then
---- misc/mozilla/nsprpub/configure.in	2010-08-19 07:05:19.000000000 -0500
-+++ misc/build/mozilla/nsprpub/configure.in	2010-08-19 07:35:35.000000000 -0500
-@@ -811,7 +811,8 @@
-     AC_DEFINE(XP_UNIX)
-     AC_DEFINE(AIX)
-     AC_DEFINE(SYSV)
--    DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
-+    MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
-+    DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
-     AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
-     case "${target_os}" in
-     aix3.2*)
-@@ -854,7 +855,6 @@
-         AIX_LINK_OPTS='-brtl -bnso -berok'
-         ;;
-     esac
--    CFLAGS="$CFLAGS -qro -qroconst"
-     AIX_WRAP='$(DIST)/lib/aixwrap.o'
-     AIX_TMP='./_aix_tmp.o'
-     if test -n "$USE_64"; then
---- misc/mozilla/security/coreconf/AIX.mk	2010-08-19 07:04:11.000000000 -0500
-+++ misc/build/mozilla/security/coreconf/AIX.mk	2010-08-19 07:38:42.000000000 -0500
-@@ -62,35 +62,30 @@
- 
- DEFAULT_COMPILER = xlc_r
- 
--CC		= xlc_r
--CCC		= xlC_r
-+CCC		= $(CXX)
- 
- CPU_ARCH	= rs6000
- 
- RANLIB		= ranlib
- 
- OS_CFLAGS	= -DAIX -DSYSV
--OS_LIBS 	+= -blibpath:/usr/lib:/lib -lc -lm
-+OS_LIBS 	+= -Wl,-blibpath:/usr/lib:/lib -lc -lm
- 
--DSO_LDOPTS	= -brtl -bnortllib -bM:SRE -bnoentry
--MKSHLIB 	= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
-+DSO_LDOPTS	= -Wl,-brtl -Wl,-bnortllib
-+MKSHLIB 	= $(CC) --shared $(DSO_LDOPTS) -Wl,-blibpath:/usr/lib:/lib -lc -lm
- 
- AIX_WRAP	= $(DIST)/lib/aixwrap.o
- AIX_TMP		= $(OBJDIR)/_aix_tmp.o
- 
- ifdef MAPFILE
--DSO_LDOPTS	+= -bexport:$(MAPFILE)
-+DSO_LDOPTS	+= -Wl,-bexport:$(MAPFILE)
- else
--DSO_LDOPTS	+= -bexpall
-+DSO_LDOPTS	+= -Wl,-bexpall
- endif
- 
- PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
-                 sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@
- 
--ifdef BUILD_OPT
--	OPTIMIZER += -qmaxmem=-1
--endif
--
- ifeq ($(USE_64), 1)
- 	OS_CFLAGS	+= -DAIX_64BIT
- 	OBJECT_MODE=64
---- misc/mozilla/security/nss/cmd/platlibs.mk	2010-08-19 07:03:52.000000000 -0500
-+++ misc/build/mozilla/security/nss/cmd/platlibs.mk	2010-08-19 07:39:10.000000000 -0500
-@@ -154,7 +154,7 @@
- 	$(NULL)
- 
- ifeq ($(OS_ARCH), AIX) 
--EXTRA_SHARED_LIBS += -brtl 
-+EXTRA_SHARED_LIBS += -Wl,-brtl 
- endif
- 
- # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
-@@ -207,7 +207,7 @@
- 	$(NULL)
- 
- ifeq ($(OS_ARCH), AIX) 
--EXTRA_SHARED_LIBS += -brtl 
-+EXTRA_SHARED_LIBS += -Wl,-brtl 
- endif
- 
- # If GNU ld is used, we must use the -rpath-link option to tell
---- misc/mozilla/security/nss/cmd/shlibsign/Makefile	2010-08-19 07:03:57.000000000 -0500
-+++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile	2010-08-19 07:42:30.000000000 -0500
-@@ -74,6 +74,10 @@
- 
- include $(CORE_DEPTH)/coreconf/rules.mk
- 
-+ifeq ($(OS), AIX)
-+EXTRA_SHARED_LIBS += -lpthreads
-+endif
-+
- #######################################################################
- # (6) Execute "component" rules. (OPTIONAL)                           #
- #######################################################################
---- misc/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2010-08-19 07:03:57.000000000 -0500
-+++ misc/build/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2010-08-19 07:41:51.000000000 -0500
-@@ -74,6 +74,8 @@
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
-+ifeq ($(OS), AIX)
-+EXTRA_SHARED_LIBS += -lpthreads
-+endif
- 
- include ../../platrules.mk
--
---- misc/mozilla/dbm/include/mcom_db.h	2010-08-19 08:39:18.000000000 -0500
-+++ misc/build/mozilla/dbm/include/mcom_db.h	2010-08-19 08:39:45.000000000 -0500
-@@ -88,7 +88,7 @@
- 
- #ifdef __DBINTERFACE_PRIVATE
- 
--#ifdef HAVE_SYS_CDEFS_H
-+#if defined(HAVE_SYS_CDEFS_H) && !defined(_AIX)
- #include <sys/cdefs.h>
- #else
- #include "cdefs.h"
---- misc/mozilla/configure	2010-08-19 09:18:07.000000000 -0500
-+++ misc/build/mozilla/configure	2010-08-19 09:11:35.000000000 -0500
-@@ -5884,6 +5884,9 @@
-             CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
-             CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
-         fi
-+    else
-+        MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-     fi
-     case "${target_os}" in
-     aix4.1*)
---- misc/mozilla/configure.in	2010-08-19 09:18:07.000000000 -0500
-+++ misc/build/mozilla/configure.in	2010-08-19 09:10:46.000000000 -0500
-@@ -1489,6 +1489,9 @@
-             CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
-             CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
-         fi
-+    else
-+        MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-     fi
-     case "${target_os}" in
-     aix4.1*)
---- misc/mozilla/configure	2010-08-19 11:03:27.000000000 -0500
-+++ misc/build/mozilla/configure	2010-08-19 11:05:38.000000000 -0500
-@@ -5887,6 +5887,8 @@
-     else
-         MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-+        MOZ_FIX_LINK_PATHS=
-+        DSO_LDOPTS="$DSO_LDOPTS -Wl,-brtl"
-     fi
-     case "${target_os}" in
-     aix4.1*)
---- misc/mozilla/configure.in	2010-08-19 11:03:36.000000000 -0500
-+++ misc/build/mozilla/configure.in	2010-08-19 11:04:33.000000000 -0500
-@@ -1492,6 +1492,9 @@
-     else
-         MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-+        AC_MSG_WARN([Clearing MOZ_FIX_LINK_PATHS till we can fix bug 332075.])
-+        MOZ_FIX_LINK_PATHS=
-+        DSO_LDOPTS="$DSO_LDOPTS -Wl,-brtl"
-     fi
-     case "${target_os}" in
-     aix4.1*)
---- misc/mozilla/config/rules.mk	2010-08-20 04:09:51.000000000 -0500
-+++ misc/build/mozilla/config/rules.mk	2010-08-20 05:02:37.000000000 -0500
-@@ -488,8 +488,13 @@
- ifeq ($(OS_ARCH),AIX)
- ifdef IS_COMPONENT
- ifneq ($(HAS_EXTRAEXPORTS),1)
-+ifdef GNU_CC
-+MKSHLIB += -Wl,-bE:$(MOZILLA_DIR)/build/unix/aix.exp -Wl,-bnoexpall
-+MKCSHLIB += -Wl,-bE:$(MOZILLA_DIR)/build/unix/aix.exp -Wl,-bnoexpall
-+else
- MKSHLIB += -bE:$(MOZILLA_DIR)/build/unix/aix.exp -bnoexpall
- MKCSHLIB += -bE:$(MOZILLA_DIR)/build/unix/aix.exp -bnoexpall
-+endif # GNU_CXX
- endif # HAS_EXTRAEXPORTS
- endif # IS_COMPONENT
- endif # AIX
diff --git a/moz/patches/arm_build_fix.patch b/moz/patches/arm_build_fix.patch
deleted file mode 100644
index 79368e5fe6db..000000000000
--- a/moz/patches/arm_build_fix.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- misc/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	2010-01-29 08:39:01.000000000 +0000
-+++ misc/build/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	2010-01-29 08:41:01.000000000 +0000
-@@ -44,8 +44,21 @@
- #error "This code is for Linux ARM only. Please check if it works for you, too.\nDepends strongly on gcc behaviour."
- #endif
- 
-+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
-+/* This tells gcc3.4+ not to optimize away symbols.
-+ *  * @see http://gcc.gnu.org/gcc-3.4/changes.html
-+ *   */
-+#define DONT_DROP_OR_WARN __attribute__((used))
-+#else
-+/* This tells older gccs not to warn about unused vairables.
-+ *  * @see http://docs.freebsd.org/info/gcc/gcc.info.Variable_Attributes.html
-+ *   */
-+#define DONT_DROP_OR_WARN __attribute__((unused))
-+#endif
-+
- /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
--static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
-+static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch")
-+DONT_DROP_OR_WARN;
- 
- static nsresult
- PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
---- misc/mozilla/security/nss/cmd/shlibsign/Makefile	2010-02-05 13:13:56.000000000 +0000
-+++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile	2010-02-05 13:14:16.000000000 +0000
-@@ -124,5 +124,5 @@
- endif
- endif
- 
--libs install :: $(CHECKLOC)
-+libs install ::
- 
---- misc/mozilla/security/manager/Makefile.in	2010-02-05 13:27:25.000000000 +0000
-+++ misc/build/mozilla/security/manager/Makefile.in	2010-02-05 13:28:00.000000000 +0000
-@@ -53,7 +53,6 @@
- 	SMIME3_LIB \
- 	SSL3_LIB \
- 	SOFTOKEN3_LIB \
--	SOFTOKEN3_CHK \
- 	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_LIBS \
- 	HAVE_FREEBL_LIBS_32 \
-@@ -68,7 +67,6 @@
- SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
- SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
- SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
- 
- # Default
- HAVE_FREEBL_LIBS = 1
-@@ -99,23 +97,17 @@
- 
- ifdef HAVE_FREEBL_LIBS
- FREEBL_LIB = $(DLL_PREFIX)freebl3$(DLL_SUFFIX)
--FREEBL_CHK = $(DLL_PREFIX)freebl3.chk
- endif
- ifdef HAVE_FREEBL_LIBS_32
- FREEBL_32INT_LIB = libfreebl_32int_3$(DLL_SUFFIX)
--FREEBL_32INT_CHK = libfreebl_32int_3.chk
- FREEBL_32FPU_LIB = libfreebl_32fpu_3$(DLL_SUFFIX)
--FREEBL_32FPU_CHK = libfreebl_32fpu_3.chk
- endif
- ifdef HAVE_FREEBL_LIBS_32INT64
- FREEBL_32INT64_LIB = libfreebl_32int64_3$(DLL_SUFFIX)
--FREEBL_32INT64_CHK = libfreebl_32int64_3.chk
- endif
- ifdef HAVE_FREEBL_LIBS_64
- FREEBL_64INT_LIB = libfreebl_64int_3$(DLL_SUFFIX)
--FREEBL_64INT_CHK = libfreebl_64int_3.chk
- FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX)
--FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk
- endif
-  
- ABS_DIST := $(shell cd $(DIST) && pwd)
-@@ -210,7 +202,6 @@
- 	OS_ARCH="$(OS_ARCH)" \
- 	CPU_ARCH="$(TARGET_CPU)" \
- 	$(NULL)
--SKIP_CHK=1
- endif
- SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile
- 
-@@ -223,10 +214,6 @@
- ifndef MOZ_NATIVE_NSS
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 	touch $@
- endif
- 
-@@ -262,43 +249,22 @@
- 	# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
- 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
- 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
- 	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
- 	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
- 	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
- 	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
- 	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
- ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
--endif
- 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
- endif
- ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
--endif
- 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
- 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
- endif
- ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
--endif
- 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
- endif
- ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
--endif
- 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
- 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
- endif
-@@ -313,38 +279,21 @@
- install::
- ifndef MOZ_NATIVE_NSS
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
--endif
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
- ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
--endif
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
- endif
- ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
- endif
- ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
--endif
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
- endif
- ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
- 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
- endif
-@@ -366,10 +315,6 @@
- ifndef MOZ_NATIVE_NSS
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- endif
- 
- echo-requires-recursive::
diff --git a/moz/patches/brokenmakefile.patch b/moz/patches/brokenmakefile.patch
deleted file mode 100644
index 20d88014b932..000000000000
--- a/moz/patches/brokenmakefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/mozilla/mailnews/extensions/smime/build/Makefile.in	2010-09-04 16:00:38.000000000 +0100
-+++ misc/build/mozilla/mailnews/extensions/smime/build/Makefile.in	2010-09-04 16:02:24.000000000 +0100
-@@ -79,10 +79,6 @@
- 		$(DIST)/lib/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \
- 		$(NULL)
- 
--ifndef MOZ_STATIC_MAIL_BUILD
--SHARED_LIBRARY_LIBS + = $(DIST)/lib/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
--endif
--
- EXTRA_DSO_LDOPTS = \
- 		$(LIBS_DIR) \
- 		$(EXTRA_DSO_LIBS) \
diff --git a/moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch b/moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch
deleted file mode 100644
index c2ff5d2cf461..000000000000
--- a/moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/mozilla/intl/unicharutil/util/nsUnicharUtils.h	2008-08-30 00:14:52.000000000 +0100
-+++ misc/build/mozilla/intl/unicharutil/util/nsUnicharUtils.h	2012-02-18 20:12:51.590109117 +0000
-@@ -64,6 +64,7 @@
-     : public nsStringComparator
-   {
-     public:
-+      nsCaseInsensitiveStringComparator(){};
-       virtual int operator()( const PRUnichar*, const PRUnichar*, PRUint32 aLength ) const;
-       virtual int operator()( PRUnichar, PRUnichar ) const;
-   };
diff --git a/moz/patches/clang_missing_this_pointers.patch b/moz/patches/clang_missing_this_pointers.patch
deleted file mode 100644
index d92434fe074f..000000000000
--- a/moz/patches/clang_missing_this_pointers.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- misc/mozilla/xpcom/glue/nsBaseHashtable.h	2005-09-27 16:44:20.000000000 +0100
-+++ misc/build/mozilla/xpcom/glue/nsBaseHashtable.h	2012-02-18 18:43:55.386109066 +0000
-@@ -123,7 +123,7 @@
-    */
-   PRBool Get(KeyType aKey, UserDataType* pData) const
-   {
--    EntryType* ent = GetEntry(aKey);
-+    EntryType* ent = this->GetEntry(aKey);
- 
-     if (!ent)
-       return PR_FALSE;
-@@ -142,7 +142,7 @@
-    */
-   PRBool Put(KeyType aKey, UserDataType aData)
-   {
--    EntryType* ent = PutEntry(aKey);
-+    EntryType* ent = this->PutEntry(aKey);
- 
-     if (!ent)
-       return PR_FALSE;
-@@ -156,7 +156,7 @@
-    * remove the data for the associated key
-    * @param aKey the key to remove from the hashtable
-    */
--  void Remove(KeyType aKey) { RemoveEntry(aKey); }
-+  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
- 
-   /**
-    * function type provided by the application for enumeration.
---- misc/mozilla/xpcom/glue/nsClassHashtable.h	2005-08-11 20:42:37.000000000 +0100
-+++ misc/build/mozilla/xpcom/glue/nsClassHashtable.h	2012-02-18 18:40:32.810109050 +0000
-@@ -98,7 +98,7 @@
- nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
- {
-   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
---- misc/mozilla/xpcom/glue/nsInterfaceHashtable.h	2005-08-11 20:42:48.000000000 +0100
-+++ misc/build/mozilla/xpcom/glue/nsInterfaceHashtable.h	2012-02-18 18:43:01.794109091 +0000
-@@ -111,7 +111,7 @@
-   (KeyType aKey, UserDataType* pInterface) const
- {
-   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -139,7 +139,7 @@
-   (KeyType aKey, PRBool* aFound) const
- {
-   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
---- misc/mozilla/xpcom/glue/nsRefPtrHashtable.h	2005-08-11 20:42:51.000000000 +0100
-+++ misc/build/mozilla/xpcom/glue/nsRefPtrHashtable.h	2012-02-18 19:02:20.634109082 +0000
-@@ -140,7 +140,7 @@
-   (KeyType aKey, PRBool* aFound) const
- {
-   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
diff --git a/moz/patches/consecutive_ldap_queries.patch b/moz/patches/consecutive_ldap_queries.patch
deleted file mode 100644
index d82d594bce09..000000000000
--- a/moz/patches/consecutive_ldap_queries.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp	2009-02-02 09:39:32.054968600 +0100
-+++ mozilla.patched/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp	2009-02-02 09:35:35.633832119 +0100
-@@ -833,6 +833,10 @@
-       if (msgListener)
-       {
-         msgListener->mUrl = url;
-+        msgListener->mQueryListener = listener;
-+        msgListener->mResultLimit = resultLimit;
-+        msgListener->mTimeOut = timeOut;
-+        msgListener->mQueryArguments = arguments;
-         return msgListener->DoSearch();
-       }
-     }
diff --git a/moz/patches/cygwin_paths_in_ldap_sdk.patch b/moz/patches/cygwin_paths_in_ldap_sdk.patch
deleted file mode 100644
index e0983aecbe74..000000000000
--- a/moz/patches/cygwin_paths_in_ldap_sdk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla.org/directory/c-sdk/ldap/include/Makefile.in	2006-02-03 15:44:33.000000000 +0100
-+++ mozilla/directory/c-sdk/ldap/include/Makefile.in	2008-10-31 23:34:41.695625000 +0100
-@@ -85,6 +85,9 @@
- 
- ###########################################################################
- 
-+INCLUDEDIR:=$(shell cygpath -u $(INCLUDEDIR))
-+GENHEADERS:=$(shell cygpath -u $(GENHEADERS))
-+
- all export::	$(INCLUDEDIR) $(GENHEADERS)
- 	$(NSINSTALL) -D $(PRIVATEINCDIR)
- 	$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR)
diff --git a/moz/patches/dtoa.patch b/moz/patches/dtoa.patch
deleted file mode 100644
index fce3be38b10b..000000000000
--- a/moz/patches/dtoa.patch
+++ /dev/null
@@ -1,237 +0,0 @@
---- misc/mozilla/nsprpub/pr/src/misc/prdtoa.c	20 Mar 2009 03:41:21 -0000	4.7
-+++ misc/build/mozilla/nsprpub/pr/src/misc/prdtoa.c	15 Sep 2009 00:10:20 -0000
-@@ -169,17 +169,22 @@ void _PR_CleanupDtoa(void)
-  *	Llong, #define #ULLong to be the corresponding unsigned type.
-  * #define KR_headers for old-style C function headers.
-  * #define Bad_float_h if your system lacks a float.h or if it does not
-  *	define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
-  *	FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
-  * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)
-  *	if memory is available and otherwise does something you deem
-  *	appropriate.  If MALLOC is undefined, malloc will be invoked
-- *	directly -- and assumed always to succeed.
-+ *	directly -- and assumed always to succeed.  Similarly, if you
-+ *	want something other than the system's free() to be called to
-+ *	recycle memory acquired from MALLOC, #define FREE to be the
-+ *	name of the alternate routine.  (FREE or free is only called in
-+ *	pathological cases, e.g., in a dtoa call after a dtoa return in
-+ *	mode 3 with thousands of digits requested.)
-  * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making
-  *	memory allocations from a private pool of memory when possible.
-  *	When used, the private pool is PRIVATE_MEM bytes long:  2304 bytes,
-  *	unless #defined to be a different length.  This default length
-  *	suffices to get rid of MALLOC calls except for unusual cases,
-  *	such as decimal-to-binary conversion of a very long string of
-  *	digits.  The longest string dtoa can return is about 751 bytes
-  *	long.  For conversions by strtod of strings of 800 digits and
-@@ -553,17 +558,17 @@ extern double rnd_prod(double, double), 
- #endif
- #endif /* NO_LONG_LONG */
- 
- #ifndef MULTIPLE_THREADS
- #define ACQUIRE_DTOA_LOCK(n)	/*nothing*/
- #define FREE_DTOA_LOCK(n)	/*nothing*/
- #endif
- 
--#define Kmax 15
-+#define Kmax 7
- 
-  struct
- Bigint {
- 	struct Bigint *next;
- 	int k, maxwds, sign, wds;
- 	ULong x[1];
- 	};
- 
-@@ -581,27 +586,28 @@ Balloc
- {
- 	int x;
- 	Bigint *rv;
- #ifndef Omit_Private_Memory
- 	unsigned int len;
- #endif
- 
- 	ACQUIRE_DTOA_LOCK(0);
--	if (rv = freelist[k]) {
-+	/* The k > Kmax case does not need ACQUIRE_DTOA_LOCK(0), */
-+	/* but this case seems very unlikely. */
-+	if (k <= Kmax && (rv = freelist[k]))
- 		freelist[k] = rv->next;
--		}
- 	else {
- 		x = 1 << k;
- #ifdef Omit_Private_Memory
- 		rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
- #else
- 		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
- 			/sizeof(double);
--		if (pmem_next - private_mem + len <= PRIVATE_mem) {
-+		if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) {
- 			rv = (Bigint*)pmem_next;
- 			pmem_next += len;
- 			}
- 		else
- 			rv = (Bigint*)MALLOC(len*sizeof(double));
- #endif
- 		rv->k = k;
- 		rv->maxwds = x;
-@@ -615,20 +621,28 @@ Balloc
- Bfree
- #ifdef KR_headers
- 	(v) Bigint *v;
- #else
- 	(Bigint *v)
- #endif
- {
- 	if (v) {
--		ACQUIRE_DTOA_LOCK(0);
--		v->next = freelist[v->k];
--		freelist[v->k] = v;
--		FREE_DTOA_LOCK(0);
-+		if (v->k > Kmax)
-+#ifdef FREE
-+			FREE((void*)v);
-+#else
-+			free((void*)v);
-+#endif
-+		else {
-+			ACQUIRE_DTOA_LOCK(0);
-+			v->next = freelist[v->k];
-+			freelist[v->k] = v;
-+			FREE_DTOA_LOCK(0);
-+			}
- 		}
- 	}
- 
- #define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
- y->wds*sizeof(Long) + 2*sizeof(int))
- 
-  static Bigint *
- multadd
---- misc/mozilla/js/src/jsdtoa.c	2 Sep 2007 22:20:41 -0000	3.41
-+++ misc/build/mozilla/js/src/jsdtoa.c	18 Sep 2009 16:15:13 -0000
-@@ -145,17 +145,22 @@
-  *  and if "unsigned Llong" does not work as an unsigned version of
-  *  Llong, #define #ULLong to be the corresponding unsigned type.
-  * #define Bad_float_h if your system lacks a float.h or if it does not
-  *  define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
-  *  FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
-  * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)
-  *  if memory is available and otherwise does something you deem
-  *  appropriate.  If MALLOC is undefined, malloc will be invoked
-- *  directly -- and assumed always to succeed.
-+ *  directly -- and assumed always to succeed.  Similarly, if you
-+ *  want something other than the system's free() to be called to
-+ *  recycle memory acquired from MALLOC, #define FREE to be the
-+ *  name of the alternate routine.  (FREE or free is only called in
-+ *  pathological cases, e.g., in a dtoa call after a dtoa return in
-+ *  mode 3 with thousands of digits requested.)
-  * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making
-  *  memory allocations from a private pool of memory when possible.
-  *  When used, the private pool is PRIVATE_MEM bytes long: 2000 bytes,
-  *  unless #defined to be a different length.  This default length
-  *  suffices to get rid of MALLOC calls except for unusual cases,
-  *  such as decimal-to-binary conversion of a very long string of
-  *  digits.
-  * #define INFNAN_CHECK on IEEE systems to cause strtod to check for
-@@ -320,17 +325,17 @@ static PRLock *freelist_lock;
-     JS_END_MACRO
- #define RELEASE_DTOA_LOCK() PR_Unlock(freelist_lock)
- #else
- #undef MULTIPLE_THREADS
- #define ACQUIRE_DTOA_LOCK()   /*nothing*/
- #define RELEASE_DTOA_LOCK()   /*nothing*/
- #endif
- 
--#define Kmax 15
-+#define Kmax 7
- 
- struct Bigint {
-     struct Bigint *next;  /* Free list link */
-     int32 k;              /* lg2(maxwds) */
-     int32 maxwds;         /* Number of words allocated for x */
-     int32 sign;           /* Zero if positive, 1 if negative.  Ignored by most Bigint routines! */
-     int32 wds;            /* Actual number of words.  If value is nonzero, the most significant word must be nonzero. */
-     ULong x[1];           /* wds words of number in little endian order */
-@@ -400,26 +405,26 @@ static Bigint *Balloc(int32 k)
- 
- #ifdef ENABLE_OOM_TESTING
-     if (++allocationNum == desiredFailure) {
-         printf("Forced Failing Allocation number %d\n", allocationNum);
-         return NULL;
-     }
- #endif
- 
--    if ((rv = freelist[k]) != NULL)
-+    if (k <= Kmax && (rv = freelist[k]) != NULL)
-         freelist[k] = rv->next;
-     if (rv == NULL) {
-         x = 1 << k;
- #ifdef Omit_Private_Memory
-         rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
- #else
-         len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
-             /sizeof(double);
--        if (pmem_next - private_mem + len <= PRIVATE_mem) {
-+        if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) {
-             rv = (Bigint*)pmem_next;
-             pmem_next += len;
-             }
-         else
-             rv = (Bigint*)MALLOC(len*sizeof(double));
- #endif
-         if (!rv)
-             return NULL;
-@@ -428,18 +433,26 @@ static Bigint *Balloc(int32 k)
-     }
-     rv->sign = rv->wds = 0;
-     return rv;
- }
- 
- static void Bfree(Bigint *v)
- {
-     if (v) {
--        v->next = freelist[v->k];
--        freelist[v->k] = v;
-+        if (v->k > Kmax)
-+#ifdef FREE
-+                FREE((void*)v);
-+#else
-+                free((void*)v);
-+#endif
-+        else {
-+                v->next = freelist[v->k];
-+                freelist[v->k] = v;
-+        }
-     }
- }
- 
- #define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
-                           y->wds*sizeof(Long) + 2*sizeof(int32))
- 
- /* Return b*m + a.  Deallocate the old b.  Both a and m must be between 0 and
-  * 65535 inclusive.  NOTE: old b is deallocated on memory failure.
---- misc/mozilla/js/src/jsdtoa.c	22 Sep 2009 06:16:27 -0000	3.42
-+++ misc/build/mozilla/js/src/jsdtoa.c	15 Oct 2009 10:34:38 -0000
-@@ -405,19 +405,19 @@ static Bigint *Balloc(int32 k)
- 
- #ifdef ENABLE_OOM_TESTING
-     if (++allocationNum == desiredFailure) {
-         printf("Forced Failing Allocation number %d\n", allocationNum);
-         return NULL;
-     }
- #endif
- 
--    if (k <= Kmax && (rv = freelist[k]) != NULL)
-+    if (k <= Kmax && (rv = freelist[k]))
-         freelist[k] = rv->next;
--    if (rv == NULL) {
-+    else {
-         x = 1 << k;
- #ifdef Omit_Private_Memory
-         rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
- #else
-         len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
-             /sizeof(double);
-         if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) {
-             rv = (Bigint*)pmem_next;
diff --git a/moz/patches/embed_manifest.patch b/moz/patches/embed_manifest.patch
deleted file mode 100644
index 3b0e80b3ab81..000000000000
--- a/moz/patches/embed_manifest.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- mozilla.pure/configure	2008-06-16 00:25:31.000000000 +0200
-+++ mozilla/configure	2008-11-09 23:59:19.984375000 +0100
-@@ -1068,6 +1068,8 @@
- GCONF_VERSION=1.2.1
- LIBGNOME_VERSION=2.0
- 
-+MSMANIFEST_TOOL=
-+
- MISSING_X=
- for ac_prog in gawk mawk nawk awk
- do
-@@ -3025,6 +3027,22 @@
-         else
-             { echo "configure: error: This version of the MSVC compiler, $CC_VERSION , is unsupported." 1>&2; exit 1; }
-         fi
-+	
-+	# bug #249782
-+	# ensure that mt.exe is Microsoft (R) Manifest Tool and not magnetic tape manipulation utility (or something else)
-+	if test "$_CC_SUITE" -ge "8"; then
-+		MSMT_TOOL=`mt 2>&1|grep 'Microsoft (R) Manifest Tool'`
-+		if test -n "MSMT_TOOL"; then
-+			MSMANIFEST_TOOL_VERSION=`echo ${MSMANIFEST_TOOL}|grep -Po "(^|\s)[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?(\s|$)"`
-+			if test -z "MSMANIFEST_TOOL_VERSION"; then
-+				echo "configure: warning: Unknown version of the Microsoft (R) Manifest Tool." 1>&2
-+			fi
-+			MSMANIFEST_TOOL=1
-+			unset MSMT_TOOL
-+		else
-+			{ echo "Microsoft (R) Manifest Tool must be in your \$PATH." 1>&2; exit 1; }
-+		fi
-+	fi
- 
-         # Check linker version
-         _LD_FULL_VERSION=`"${LD}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"`
---- mozilla.pure/configure.in	2008-06-16 00:25:32.000000000 +0200
-+++ mozilla/configure.in	2008-11-09 23:59:20.000000000 +0100
-@@ -126,6 +126,8 @@
- GCONF_VERSION=1.2.1
- LIBGNOME_VERSION=2.0
- 
-+MSMANIFEST_TOOL=
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -428,6 +430,22 @@
-         else
-             AC_MSG_ERROR([This version of the MSVC compiler, $CC_VERSION , is unsupported.])
-         fi
-+	
-+	# bug #249782
-+	# ensure that mt.exe is Microsoft (R) Manifest Tool and not magnetic tape manipulation utility (or something else)
-+	if test "$_CC_SUITE" -ge "8"; then
-+		MSMT_TOOL=`mt 2>&1|grep 'Microsoft (R) Manifest Tool'`
-+		if test -n "MSMT_TOOL"; then
-+			MSMANIFEST_TOOL_VERSION=`echo ${MSMANIFEST_TOOL}|grep -Po "(^|\s)[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?(\s|$)"`
-+			if test -z "MSMANIFEST_TOOL_VERSION"; then
-+				AC_MSG_WARN([Unknown version of the Microsoft (R) Manifest Tool.])
-+			fi
-+			MSMANIFEST_TOOL=1
-+			unset MSMT_TOOL
-+		else
-+			AC_MSG_ERROR([Microsoft (R) Manifest Tool must be in your \$PATH.])
-+		fi
-+	fi
- 
-         # Check linker version
-         _LD_FULL_VERSION=`"${LD}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"`
-@@ -7319,6 +7339,7 @@
- AC_SUBST(USE_N32)
- AC_SUBST(CC_VERSION)
- AC_SUBST(CXX_VERSION)
-+AC_SUBST(MSMANIFEST_TOOL)
- 
- if test "$USING_HCC"; then
-    CC='${topsrcdir}/build/hcc'
---- mozilla.pure/config/rules.mk	2008-01-29 20:30:22.000000000 +0100
-+++ mozilla/config/rules.mk	2008-11-09 23:59:19.968750000 +0100
-@@ -811,6 +812,12 @@
- 
- ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
- 	$(LD) -NOLOGO -OUT:$@ -PDB:$(PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
-+ifdef MSMANIFEST_TOOL
-+	@if test -f $@.manifest; then \
-+		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
-+		rm -f $@.manifest; \
-+	fi
-+endif	# MSVC with manifest tool
- else
- ifeq ($(CPP_PROG_LINK),1)
- 	$(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(EXE_DEF_FILE)
-@@ -843,6 +850,12 @@
- else
- ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH))
- 	$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
-+ifdef MSMANIFEST_TOOL
-+	@if test -f $@.manifest; then \
-+		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
-+		rm -f $@.manifest; \
-+	fi
-+endif	# MSVC with manifest tool
- else
- 	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
- endif
-@@ -866,6 +879,12 @@
- else
- ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
- 	$(LD) -nologo -out:$@ -pdb:$(PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
-+ifdef MSMANIFEST_TOOL
-+	@if test -f $@.manifest; then \
-+		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
-+		rm -f $@.manifest; \
-+	fi
-+endif	# MSVC with manifest tool
- else
- ifeq ($(CPP_PROG_LINK),1)
- 	$(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
-@@ -1019,6 +1038,14 @@
- endif # SHARED_LIBRARY_LIBS
- endif # NO_LD_ARCHIVE_FLAGS
- 	$(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
-+ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
-+ifdef MSMANIFEST_TOOL
-+	@if test -f $@.manifest; then \
-+		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \
-+		rm -f $@.manifest; \
-+	fi
-+endif	# MSVC with manifest tool
-+endif	# WINNT && !GCC
- 	@rm -f foodummyfilefoo $(SUB_SHLOBJS) $(DELETE_AFTER_LINK)
- else # os2 vacpp
- 	$(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
---- mozilla.pure/config/autoconf.mk.in	2006-09-14 20:07:03.000000000 +0200
-+++ mozilla/config/autoconf.mk.in	2008-11-09 23:59:19.953125000 +0100
-@@ -543,6 +543,7 @@
- MOZ_TOOLS_DIR	= @MOZ_TOOLS_DIR@
- MOZ_DEBUG_SYMBOLS = @MOZ_DEBUG_SYMBOLS@
- MOZ_QUANTIFY	= @MOZ_QUANTIFY@
-+MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
- 
- #python options
- PYTHON = @MOZ_PYTHON@
diff --git a/moz/patches/index.txt b/moz/patches/index.txt
deleted file mode 100644
index 8eb067718bc8..000000000000
--- a/moz/patches/index.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-====================================================================================

-File name

----------

-  embed_manifest.patch

-

-Description

------------

-  When building Mozilla with MSVC2005, generated libraries and applications

-  require the manifest file (name.dll.manifest) to reside beside the file

-  itself, or to be embedded.

-

-  The patch does the latter: embedding the manifest file into the

-  library/application itself, using the Manifest Tool from the Platform SDK

-  resp. MSVC installation.

-

-  The patch is effectively the patch as was committed to the Mozilla trunk,

-  taken from here: https://bugzilla.mozilla.org/show_bug.cgi?id=249782#c81.

-

-====================================================================================

-File name

----------

-  wchart_on_msvc8.patch

-

-Description

------------

-  For compiling with MSVC2005: See https://bugzilla.mozilla.org/show_bug.cgi?id=324842.

-

-====================================================================================

-File name

----------

-  cygwin_paths_in_ldap_sdk.patch

-

-Description

------------

-  make 1.81, as currently part of cygwin, does not support Windows paths anymore.

-  So, targets, and target dependencies, in makefile may need to be converted to cygwin

-  notation. This patch does this for directory/c-sdk/ldap/include, other occurances are

-  not known, yet.

-

-====================================================================================

-File name

----------

-  no_core_abspath_in_nss.patch

-

-Description

------------

-  On various platforms, building security/nss/cmd/shlibsign fails. In all cases, the

-  error messages indicate the core_abspath macro used in the Makefile is not resolved

-  properly.

-  This patch replaces the usage of core_abspath with platform-specific constructs.

-

-====================================================================================

-File name

----------

-  consecutive_ldap_queries.patch

-

-Description

------------

-  Consecutive LDAP address book queries (using the same instance of nsAbLDAPDirectoryQuery,

-  but different parameters to the DoQuery method) do not work in OOo. The reason is that

-  the second call to DoQuery ignores most of its arguments, including the listener which

-  is to be notified about the query results, and re-uses the arguments from the first

-  call.

-  The patch changes the DoQuery behavior to respect the arguments of the second call.

-

-====================================================================================

-File name

----------

-  macosx_build_fix.patch.patch

-

-Description

------------

-  For one, recently introduced --with-system-nspr/--with-nspr-prefix in

-  moz/makefile.mk reveals that directory/c-sdk/build.mk/build.mk uses just a

-  hard-coded list of nspr libraries, lacking a proper -L switch (as provided by

-  nspr-config).

-  For another, disabling the routine use of MOZ_ARCH and resulting

-  MOZ_CROSS_COMPILE for Mac OS X in moz/makefile.mk reveals that

-  xpcom/build/Makefile.in wants to link against a macmorefiles_s library

-  without a proper -L switch.

diff --git a/moz/patches/libpr0n_build_fix.patch b/moz/patches/libpr0n_build_fix.patch
deleted file mode 100644
index 083e493fe782..000000000000
--- a/moz/patches/libpr0n_build_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- misc/mozilla/modules/libpr0n/build/Makefile.in	2006-05-20 19:20:48.000000000 +0200
-+++ misc/build/mozilla/modules/libpr0n/build/Makefile.in	2011-01-19 05:18:01.318000024 +0100
-@@ -106,9 +106,9 @@
- export::
- 	@{ \
- 	$(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
--		echo "#define IMG_BUILD_DECODER_${d}";) \
-+		echo "#define IMG_BUILD_DECODER_${d}" ; ) \
- 	$(foreach d,$(MOZ_IMG_ENCODERS), \
--		echo "#define IMG_BUILD_ENCODER_${d}";) \
-+		echo "#define IMG_BUILD_ENCODER_${d}" ; ) \
- 	} > nsImgBuildDefines.tmp
- 	@if `cmp -s nsImgBuildDefines.h nsImgBuildDefines.tmp`; then \
- 		rm -f nsImgBuildDefines.tmp; \
diff --git a/moz/patches/link_fontconfig.patch b/moz/patches/link_fontconfig.patch
deleted file mode 100644
index 66e82fa63e52..000000000000
--- a/moz/patches/link_fontconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/moz/patches/macosx_build_fix.patch b/moz/patches/macosx_build_fix.patch
deleted file mode 100644
index e79f58207fa7..000000000000
--- a/moz/patches/macosx_build_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- misc/mozilla/directory/c-sdk/build.mk	2011-09-27 14:45:02.000000000 +0200
-+++ misc/build/mozilla/directory/c-sdk/build.mk	2011-09-27 14:44:18.000000000 +0200
-@@ -157,8 +157,8 @@
- PLDSBASE=plds$(NSPR_LIBVERSION)
- NSPRBASE=nspr$(NSPR_LIBVERSION)
- 
--DYNAMICNSPR = -l$(PLCBASE) -l$(PLDSBASE) -l$(NSPRBASE)
-+DYNAMICNSPR = $(NSPR_LIBS)
- 
- PLC_LIBNAME=plc$(NSPR_LIBVERSION)
- PLDS_LIBNAME=plds$(NSPR_LIBVERSION)
- ifeq ($(OS_ARCH), WINNT)
---- misc/mozilla/xpcom/build/Makefile.in	2008-06-16 00:26:11.000000000 +0200
-+++ misc/build/mozilla/xpcom/build/Makefile.in	2011-09-28 10:41:02.000000000 +0200
-@@ -135,7 +135,7 @@
- # pull in MoreFiles for MacOSX
- ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
- EXTRA_DSO_LIBS = macmorefiles_s
--EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += -L$(DIST)/lib $(EXTRA_DSO_LIBS)
- EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
- endif
- 
diff --git a/moz/patches/no_core_abspath_in_nss.patch b/moz/patches/no_core_abspath_in_nss.patch
deleted file mode 100644
index 026cc7e3eb92..000000000000
--- a/moz/patches/no_core_abspath_in_nss.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- mozilla.pure/security/nss/cmd/shlibsign/Makefile	2007-02-16 03:16:24.000000000 +0100
-+++ mozilla/security/nss/cmd/shlibsign/Makefile	2008-11-05 14:04:54.798875000 +0100
-@@ -86,18 +86,47 @@
- 
- include ../platrules.mk
- 
--SRCDIR = $(call core_abspath,.)
--
-+ifeq ($(OS_TARGET), Darwin)
-+	SRCDIR = .
-+else
-+ifeq ($(OS_TARGET), Linux)
-+	SRCDIR = .
-+else
-+ifeq ($(OS_TARGET), WIN95)
-+	SRCDIR = $(shell cygpath -d $(SRCDIR))
-+else
-+	SRCDIR = $(call core_abspath,.)
-+endif
-+endif
-+endif
- %.chk: %.$(DLL_SUFFIX) 
- ifeq ($(OS_TARGET), OS2)
- 	cd $(OBJDIR) ; cmd.exe /c $(SRCDIR)/sign.cmd $(DIST) \
- 	$(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
- 	$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
- else
-+ifeq ($(OS_TARGET), WIN95)
-+	sh $(CYGWIN_WRAPPER) ./sign.sh $(shell cygpath -d -a $(DIST)) \
-+	$(shell cygpath -d -a $(OBJDIR)) $(OS_TARGET) \
-+	$(shell cygpath -d -a $(NSPR_LIB_DIR)) $(shell cygpath -d -a $<)
-+else
-+ifeq ($(OS_TARGET), Darwin)
-+	cd $(SRCDIR) ; sh ./sign.sh $(DIST) \
-+	$(OBJDIR) $(OS_TARGET) \
-+	$(NSPR_LIB_DIR) $<
-+else
-+ifeq ($(OS_TARGET), Linux)
-+	cd $(SRCDIR) ; sh ./sign.sh $(DIST) \
-+	$(OBJDIR) $(OS_TARGET) \
-+	$(NSPR_LIB_DIR) $<
-+else
- 	cd $(OBJDIR) ; sh $(SRCDIR)/sign.sh $(call core_abspath,$(DIST)) \
- 	$(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
- 	$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
- endif
-+endif
-+endif
-+endif
- 
- libs install :: $(CHECKLOC)
- 
diff --git a/moz/patches/nss-linux3.patch b/moz/patches/nss-linux3.patch
deleted file mode 100644
index b73566932323..000000000000
--- a/moz/patches/nss-linux3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/mozilla/security/coreconf/arch.mk	2011-10-06 19:58:31.808695724 +0200
-+++ misc/build/mozilla/security/coreconf/arch.mk	2011-10-06 19:58:00.074648943 +0200
-@@ -152,6 +152,10 @@
- 
- ifeq ($(OS_ARCH),Linux)
-     OS_RELEASE := $(subst ., ,$(OS_RELEASE))
-+    # force Linux 3.x to 2.6
-+    ifeq ($(word 1,$(OS_RELEASE)),3)
-+	OS_RELEASE := 2 6
-+    endif
-     ifneq ($(words $(OS_RELEASE)),1)
- 	OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
-     endif
diff --git a/moz/patches/respect_disable_pango.patch b/moz/patches/respect_disable_pango.patch
deleted file mode 100644
index 07a83e9dd40a..000000000000
--- a/moz/patches/respect_disable_pango.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- misc/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp	2006-02-28 15:55:35.000000000 +0100
-+++ misc/build/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp	2009-11-13 15:12:24.000000000 +0100
-@@ -66,10 +66,12 @@
- #endif /* MOZ_WIDGET_GTK */
- 
- #ifdef MOZ_WIDGET_GTK2
-+#ifdef MOZ_ENABLE_PANGO
- #include <pango/pango.h>
- #include <pango/pangox.h>
- #include <pango/pango-fontmap.h>
- #endif
-+#endif
- 
- #ifdef MOZ_ENABLE_XFT
- #include "nsFontMetricsUtils.h"
-@@ -963,9 +965,11 @@
- #ifdef MOZ_WIDGET_GTK2
- 
- #ifdef MOZ_ENABLE_COREXFONTS
-+#ifdef MOZ_ENABLE_PANGO
- static void xlfd_from_pango_font_description(GtkWidget *aWidget,
-                                              const PangoFontDescription *aFontDesc,
-                                              nsString& aFontName);
-+#endif
- #endif /* MOZ_ENABLE_COREXFONTS */
- 
- nsresult
-@@ -997,10 +1001,12 @@
- #endif /* MOZ_ENABLE_XFT */
- 
- #ifdef MOZ_ENABLE_COREXFONTS
-+#ifdef MOZ_ENABLE_PANGO
-   // if name already set by Xft, do nothing
-   if (!aFont->name.Length()) {
-     xlfd_from_pango_font_description(aWidget, desc, aFont->name);
-   }
-+#endif /* MOZ_ENABLE_PANGO */
- #endif /* MOZ_ENABLE_COREXFONTS */
-   aFont->weight = pango_font_description_get_weight(desc);
- 
-@@ -1104,6 +1110,7 @@
- #endif /* MOZ_ENABLE_XFT */
- 
- #if defined(MOZ_WIDGET_GTK2) && defined(MOZ_ENABLE_COREXFONTS)
-+#ifdef MOZ_ENABLE_PANGO
- // xlfd_from_pango_font_description copied from vte, which was
- // written by nalin@redhat.com, and added some codes.
- static void
-@@ -1226,4 +1233,5 @@
-   g_free(spec);
-   g_object_unref(font);
- }
-+#endif
- #endif /* MOZ_WIDGET_GTK2 && MOZ_ENABLE_COREXFONTS */
diff --git a/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch b/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch
deleted file mode 100644
index e74c4e46c381..000000000000
--- a/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- misc/mozilla/widget/src/mac/Makefile.in	2006-08-04 20:52:25.000000000 +0200
-+++ misc/build/mozilla/widget/src/mac/Makefile.in	2012-06-04 23:26:18.000000000 +0200
-@@ -130,7 +130,7 @@
- RES_SRC = $(srcdir)/nsMacWidget.r
- 
- $(RES_DEST): $(RES_SRC)
--	/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $(RES_SRC) -o $(RES_DEST)
-+	Rez -i $(MACOS_SDK_DIR)/Developer/Headers/FlatCarbon -useDF $(RES_SRC) -o $(RES_DEST)
- 
- libs:: $(RES_DEST)
- 
---- misc/mozilla/widget/src/mac/nsMacWindow.cpp	2007-11-19 21:40:08.000000000 +0100
-+++ misc/build/mozilla/widget/src/mac/nsMacWindow.cpp	2012-06-04 22:26:29.000000000 +0200
-@@ -1209,7 +1209,7 @@
-           if (!sChecked) {
-             sChecked = PR_TRUE;
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_3
--            transitionFunc = ::TransitionWindowWithOptions;
-+            transitionFunc = (TransitionWindowWithOptions_type) ::TransitionWindowWithOptions; // last TransitionWindowOptions* param is const* in 10.6
- #else
-             CFBundleRef carbonBundle =
-              ::CFBundleGetBundleWithIdentifier(CFSTR("com.apple.Carbon"));
---- misc/mozilla/xpfe/bootstrap/appleevents/Makefile.in	2006-01-05 17:41:23.000000000 +0100
-+++ misc/build/mozilla/xpfe/bootstrap/appleevents/Makefile.in	2012-06-04 23:35:22.000000000 +0200
-@@ -112,7 +112,7 @@
- 
- # convert AppleScript dictionary .sdef file into .r format, and thence to .rsrc
- SDP_TOOL = $(SDP)
--REZ_TOOL = /Developer/Tools/Rez
-+REZ_TOOL = Rez
- SDEF_SRC = $(srcdir)/mozilla.sdef
- RES_DEST = mozillaSuite.r
- RSRC_DEST = mozillaSuite.rsrc
diff --git a/moz/patches/ssl-linux-no_as_needed_linker_option.patch b/moz/patches/ssl-linux-no_as_needed_linker_option.patch
deleted file mode 100644
index 3abce6da055f..000000000000
--- a/moz/patches/ssl-linux-no_as_needed_linker_option.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/mozilla/security/manager/ssl/src/Makefile.in	2012-06-30 19:47:42.190501730 +0200
-+++ misc/build/mozilla/security/manager/ssl/src/Makefile.in	2012-06-30 19:44:08.654510143 +0200
-@@ -137,6 +137,7 @@
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
-+		$(LDFLAG_NO_AS_NEEDED) \
- 		$(NSS_LIBS) \
- 		$(NULL)
- 
diff --git a/moz/patches/wchart_on_msvc8.patch b/moz/patches/wchart_on_msvc8.patch
deleted file mode 100644
index a8f31cd4c3e3..000000000000
--- a/moz/patches/wchart_on_msvc8.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla.pure/configure.in	2008-06-16 00:25:32.000000000 +0200
-+++ mozilla/configure.in	2008-11-10 16:15:36.859375000 +0100
-@@ -425,6 +425,7 @@
-             _CC_SUITE=7
-         elif test "$_CC_MAJOR_VERSION" = "14"; then
-             _CC_SUITE=8
-+            CXXFLAGS="$CXXFLAGS -Zc:wchar_t-"
-         else
-             AC_MSG_ERROR([This version of the MSVC compiler, $CC_VERSION , is unsupported.])
-         fi
---- mozilla.pure/configure	2008-06-16 00:25:31.000000000 +0200
-+++ mozilla/configure	2008-11-10 16:15:30.437500000 +0100
-@@ -3022,6 +3022,7 @@
-             _CC_SUITE=7
-         elif test "$_CC_MAJOR_VERSION" = "14"; then
-             _CC_SUITE=8
-+            CXXFLAGS="$CXXFLAGS -Zc:wchar_t-"
-         else
-             { echo "configure: error: This version of the MSVC compiler, $CC_VERSION , is unsupported." 1>&2; exit 1; }
-         fi