[Libreoffice-commits] core.git: configure.ac download.lst Makefile.fetch Makefile.in Module_tail_build.mk moz/CustomTarget_runtime.mk moz/ExternalPackage_moz_inc.mk moz/ExternalPackage_moz_lib.mk moz/extractfiles.mk moz/Makefile moz/makefile.mk moz/Module_moz.mk moz/Package_runtime.mk moz/patches moz/prj moz/seamonkey-source-1.1.14.patch moz/UnpackedTarball_moz_inc.mk moz/UnpackedTarball_moz_lib.mk moz/zipped openldap/ExternalProject_openldap.mk RepositoryExternal.mk RepositoryModule_ooo.mk solenv/gbuild tail_build/prj
Peter Foley
pefoley2 at verizon.net
Sun Feb 24 02:35:01 PST 2013
Makefile.fetch | 1
Makefile.in | 3
Module_tail_build.mk | 7
RepositoryExternal.mk | 42
RepositoryModule_ooo.mk | 2
configure.ac | 12
download.lst | 1
moz/CustomTarget_runtime.mk | 27
moz/ExternalPackage_moz_inc.mk | 18
moz/ExternalPackage_moz_lib.mk | 21
moz/Makefile | 7
moz/Module_moz.mk | 25
moz/Package_runtime.mk | 14
moz/UnpackedTarball_moz_inc.mk | 15
moz/UnpackedTarball_moz_lib.mk | 15
moz/extractfiles.mk | 187
moz/makefile.mk | 221
moz/patches/aix_build_fix.patch | 203
moz/patches/arm_build_fix.patch | 189
moz/patches/brokenmakefile.patch | 13
moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch | 10
moz/patches/clang_missing_this_pointers.patch | 71
moz/patches/consecutive_ldap_queries.patch | 13
moz/patches/cygwin_paths_in_ldap_sdk.patch | 12
moz/patches/dtoa.patch | 237
moz/patches/embed_manifest.patch | 142
moz/patches/index.txt | 80
moz/patches/libpr0n_build_fix.patch | 14
moz/patches/link_fontconfig.patch | 11
moz/patches/macosx_build_fix.patch | 23
moz/patches/no_core_abspath_in_nss.patch | 52
moz/patches/nss-linux3.patch | 13
moz/patches/respect_disable_pango.patch | 54
moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch | 33
moz/patches/ssl-linux-no_as_needed_linker_option.patch | 10
moz/patches/wchart_on_msvc8.patch | 20
moz/prj/build.lst | 2
moz/prj/d.lst | 242
moz/seamonkey-source-1.1.14.patch | 6502 ----------
moz/zipped/makefile.mk | 106
openldap/ExternalProject_openldap.mk | 2
solenv/gbuild/LinkTarget.mk | 3
solenv/gbuild/UnoApiTarget.mk | 2
tail_build/prj/build.lst | 2
44 files changed, 159 insertions(+), 8520 deletions(-)
New commits:
commit 61e7c592faa2d768d599936e57042eb22bcaa16f
Author: Peter Foley <pefoley2 at verizon.net>
Date: Fri Feb 22 21:33:23 2013 -0500
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 at gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky at gmx.de>
diff --git a/Makefile.fetch b/Makefile.fetch
index 961b4662..e7d406d 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -133,7 +133,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,LIBXSLT,$(LIBXSLT_TARBALL)) \
$(call fetch_Optional,LPSOLVE,$(LPSOLVE_TARBALL)) \
$(call fetch_Optional,MDDS,$(MDDS_TARBALL)) \
- $(call fetch_Optional,MOZ,$(MOZ_TARBALL)) \
$(call fetch_Optional,MYSQLCPPCONN,$(MYSQLCPPCONN_TARBALL)) \
$(call fetch_Optional,MYTHES,$(MYTHES_TARBALL)) \
$(call fetch_Optional,NEON,$(NEON_TARBALL)) \
diff --git a/Makefile.in b/Makefile.in
index 1fdeb86..c276b63 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,8 +67,7 @@ $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILD
echo "gbuild_modules:= tail_build \\" > $@
for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
echo >> $@
- echo -n "dmake_modules:= " >> $@
- for m in */prj/dmake; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
+ echo -n "dmake_modules:= helpcontent2 instsetoo_native" >> $@
echo >> $@
-include $(WORKDIR)/modules.mk
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 8d24929..c093d09 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -71,7 +71,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
embedserv \
$(call gb_Helper_optional,EPM,epm) \
eventattacher \
+ $(call gb_Helper_optional,EXPAT,expat) \
extensions \
+ external \
extras \
fileaccess \
filter \
@@ -125,12 +127,14 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
$(call gb_Helper_optional,MDDS,mdds) \
Mesa \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+ $(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MYSQLC,mysqlc) \
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,MYTHES,mythes) \
$(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
np_sdk \
+ $(call gb_Helper_optional,NSS,nss) \
o3tl \
$(call gb_Helper_optional,ODK,odk) \
offapi \
@@ -138,10 +142,12 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
oovbaapi \
oox \
$(call gb_Helper_optional,OPENLDAP,openldap) \
+ $(call gb_Helper_optional,OPENSSL,openssl) \
package \
padmin \
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
psprint_config \
+ $(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
readlicense_oo \
@@ -169,6 +175,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
shell \
slideshow \
smoketest \
+ soltools \
sot \
starmath \
stoc \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index aed173b..0298234 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1926,15 +1926,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
endif # SYSTEM_POSTGRESQL
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-ifeq ($(SYSTEM_MOZILLA),YES)
-
-# Nothing needed here ATM
-define gb_LinkTarget__use_mozilla
-
-endef
-
-else # !SYSTEM_MOZILLA
-
define gb_LinkTarget__use_mozilla
$(call gb_LinkTarget_add_defs,$(1),\
@@ -1943,8 +1934,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
- -I$(OUTDIR)/inc/mozilla/moz \
- -I$(OUTDIR)/inc/mozilla/nspr \
+ -I$(OUTDIR)/inc/mozilla \
)
$(call gb_LinkTarget_use_libraries,$(1),\
@@ -1958,8 +1948,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
mozreg_s \
)
-ifeq ($(OS),WNT)
-
$(call gb_LinkTarget_add_defs,$(1),\
-DMOZILLA_CLIENT \
-DMOZ_REFLOW_PERF \
@@ -2001,33 +1989,6 @@ $(call gb_LinkTarget_add_libs,$(1),\
endif # !GCC
-else
-
-$(call gb_LinkTarget_add_defs,$(1),\
- -DMOZILLA_CLIENT \
- -DXP_UNIX \
- $(if $(filter LINUX,$(OS)),-DOJI) \
- $(if $(filter LINUX MACOSX NETBSD,$(OS)),-DTRACING) \
-)
-
-$(call gb_LinkTarget_add_cflags,$(1),\
- $(if $(filter LINUX,$(OS)),-g) \
- $(if $(filter LINUX MACOSX NETBSD,$(OS)),-fPIC) \
-)
-
-$(call gb_LinkTarget_add_cxxflags,$(1),\
- -Wcast-align \
- -Wconversion \
- -Wno-long-long \
- -Woverloaded-virtual \
- -Wpointer-arith \
- -Wsynth \
- $(if $(filter LINUX,$(OS)),-pthread) \
- $(if $(filter MACOSX NETBSD,$(OS)),-Wno-deprecated) \
-)
-
-endif # UNX
-
endef
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
@@ -2040,7 +2001,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
mozreg_s \
))
-endif # SYSTEM_MOZILLA
endif # DESKTOP
ifeq ($(ENABLE_KDE),TRUE)
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index f7a145b..236c60a 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -133,12 +133,14 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
$(call gb_Helper_optional,MDDS,mdds) \
Mesa \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+ $(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MYSQLC,mysqlc) \
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,MYTHES,mythes) \
$(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
np_sdk \
+ $(call gb_Helper_optional,NSS,nss) \
o3tl \
$(call gb_Helper_optional,ODK,odk) \
offapi \
diff --git a/configure.ac b/configure.ac
index 29d38a9..ba1301c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -920,13 +920,6 @@ AC_ARG_ENABLE(telepathy,
[Determines whether to enable Telepathy for collaboration.]),
,enable_telepathy=no)
-AC_ARG_ENABLE(build-mozab,
- AS_HELP_STRING([--disable-build-mozab],
- [Use this option if you do not want to build the Mozilla address book
- components from the Mozilla source code but take precompiled zips.
- Meaningful only after --enable-win-mozab-driver.]),
-,)
-
AC_ARG_ENABLE(tde,
AS_HELP_STRING([--enable-tde],
[Determines whether to use TQt/TDE vclplug on platforms where TQt and
@@ -8283,10 +8276,6 @@ if test "$_os" = "WINNT"; then
if test "$enable_win_mozab_driver" = "yes" -a "$WITH_MINGW" != "YES" ; then
AC_MSG_RESULT([yes])
WITH_MOZAB4WIN=YES
- BUILD_MOZAB=YES
- if test "$enable_build_mozab" = "no" ; then
- BUILD_MOZAB=NO
- fi
AC_MSG_RESULT([yes, internal (old windows mozab driver)])
BUILD_TYPE="$BUILD_TYPE MOZ"
EXTMSV80=`cygpath -u "$SRC_ROOT/external/msvcp80"`
@@ -8323,7 +8312,6 @@ if test "$_os" = "WINNT"; then
fi
fi
AC_SUBST(WITH_MOZAB4WIN)
-AC_SUBST(BUILD_MOZAB)
AC_SUBST(MSVC80_DLL_DIR)
AC_SUBST(MSVC80_MNFST)
AC_SUBST(EXTMSV80)
diff --git a/download.lst b/download.lst
index 0224e1d..f4984e6 100644
--- a/download.lst
+++ b/download.lst
@@ -59,7 +59,6 @@ export LIBXML_TARBALL := 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
export LIBXSLT_TARBALL := e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MDDS_TARBALL := 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
-export MOZ_TARBALL := a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
diff --git a/moz/CustomTarget_runtime.mk b/moz/CustomTarget_runtime.mk
new file mode 100644
index 0000000..1296f2a
--- /dev/null
+++ b/moz/CustomTarget_runtime.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+MOZ_DEL_LIST := freebl3.dll \
+ nspr4.dll \
+ nss3.dll \
+ plc4.dll \
+ plds4.dll \
+ smime3.dll \
+ softokn3.dll \
+ ssl3.dll
+
+$(eval $(call gb_CustomTarget_CustomTarget,moz/runtime))
+
+$(eval $(call gb_CustomTarget_register_target,moz/runtime,mozruntime.zip))
+
+$(call gb_CustomTarget_get_workdir,moz/runtime)/mozruntime.zip: $(TARFILE_LOCATION)/$(MOZ_ZIP_RUNTIME)
+ cp $< $@
+ zip -qd $@ $(MOZ_DEL_LIST)
+
+# vim: set noet sw=4 ts=4:
diff --git a/moz/ExternalPackage_moz_inc.mk b/moz/ExternalPackage_moz_inc.mk
new file mode 100644
index 0000000..dd38f32
--- /dev/null
+++ b/moz/ExternalPackage_moz_inc.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,moz_inc,moz_inc))
+
+MOZ_INC = $(subst $(call gb_UnpackedTarball_get_dir,moz_inc),,$(shell find $(call gb_UnpackedTarball_get_dir,moz_inc) -type f 2>/dev/null))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,moz_inc,inc/mozilla,\
+ $(MOZ_INC) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/moz/ExternalPackage_moz_lib.mk b/moz/ExternalPackage_moz_lib.mk
new file mode 100755
index 0000000..85765d3
--- /dev/null
+++ b/moz/ExternalPackage_moz_lib.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,moz_lib,moz_lib))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,moz_lib,lib,\
+ embed_base_s.lib \
+ mozreg_s.lib \
+ nslber32v50.lib \
+ nsldap32v50.lib \
+ xpcom.lib \
+ xpcom_core.lib \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/moz/Makefile b/moz/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/moz/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/moz/Module_moz.mk b/moz/Module_moz.mk
new file mode 100644
index 0000000..4048324
--- /dev/null
+++ b/moz/Module_moz.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,moz))
+
+ifeq ($(WITH_MOZAB4WIN),YES)
+
+$(eval $(call gb_Module_add_targets,moz,\
+ ExternalPackage_moz_inc \
+ ExternalPackage_moz_lib \
+ CustomTarget_runtime \
+ Package_runtime \
+ UnpackedTarball_moz_inc \
+ UnpackedTarball_moz_lib \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/moz/Package_runtime.mk b/moz/Package_runtime.mk
new file mode 100644
index 0000000..59fb894
--- /dev/null
+++ b/moz/Package_runtime.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,moz/runtime,$(call gb_CustomTarget_get_workdir,moz/runtime)))
+
+$(eval $(call gb_Package_add_file,moz/runtime,bin/mozruntime.zip,mozruntime.zip))
+
+# vim: set noet sw=4 ts=4:
diff --git a/moz/UnpackedTarball_moz_inc.mk b/moz/UnpackedTarball_moz_inc.mk
new file mode 100644
index 0000000..94a1615
--- /dev/null
+++ b/moz/UnpackedTarball_moz_inc.mk
@@ -0,0 +1,15 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,moz_inc))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,moz_inc,$(MOZ_ZIP_INC),0))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/moz/UnpackedTarball_moz_lib.mk b/moz/UnpackedTarball_moz_lib.mk
new file mode 100755
index 0000000..8a324ad
--- /dev/null
+++ b/moz/UnpackedTarball_moz_lib.mk
@@ -0,0 +1,15 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,moz_lib))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,moz_lib,$(MOZ_ZIP_LIB),0))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
deleted file mode 100644
index 7c872a9..0000000
--- a/moz/extractfiles.mk
+++ /dev/null
@@ -1,187 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-MOZTARGET=$(OS)$(COM)$(CPU)
-MOZ_DIST_DIR=$(MISC)$/build$/mozilla$/$(BUILD_DIR)$/dist
-MOZ_BIN_DIR=$(MOZ_DIST_DIR)$/bin
-RUNTIME_DIR=$(MISC)$/$(MOZTARGET)runtime
-LIB_DIR=$(LB)
-INCLUDE_DIR=$(INCCOM)
-
-BIN_RUNTIMELIST= \
- xpcom \
- xpcom_core \
- xpcom_compat \
- js3250 \
- mozz \
- msgbsutl \
- nsldap32v50 \
- nsldappr32v50
-
-COMPONENT_RUNTIMELIST= \
- addrbook \
- mork \
- mozldap \
- necko \
- profile \
- xpcom_compat_c \
- rdf \
- uconv \
- vcard \
- i18n \
- pipnss \
- xppref32 \
- xpc3250
-
-COMREGISTRY_FILELIST= \
- necko_dns.xpt \
- xpcom_base.xpt \
- xpcom_obsolete.xpt \
- xpcom_components.xpt \
- xpcom_ds.xpt \
- xpcom_io.xpt \
- xpcom_xpti.xpt \
- addrbook.xpt \
- mozldap.xpt \
- pref.xpt \
- xpcom_thread.xpt
-
-DEFAULTS_RUNTIMELIST= \
- defaults$/pref$/browser-prefs.js \
- defaults$/pref$/mailnews.js \
- defaults$/pref$/mdn.js \
- defaults$/pref$/smime.js \
- defaults$/autoconfig$/platform.js \
- defaults$/autoconfig$/prefcalls.js \
- greprefs$/all.js \
- greprefs$/security-prefs.js
-
-
-LIBLIST= \
- embed_base_s.lib \
- mozreg_s.lib \
- nslber32v50.lib \
- nsldap32v50.lib \
- xpcom_core.lib \
- xpcom.lib
-
-INCLUDE_PATH=$(MOZ_DIST_DIR)$/include$/
-PUBLIC_PATH=$(MOZ_DIST_DIR)$/public$/
-
-
-REG_SUBFIX= .exe
-
-# --- Targets ------------------------------------------------------
-
-extract_mozab_files: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) \
- make_temp_dir \
- $(MISC)$/build$/so_moz_runtime_files \
- $(MISC)$/build$/so_moz_include_files \
- $(MISC)$/build$/so_moz_lib_files
-
-make_temp_dir:
- @@-$(MKDIRHIER) $(RUNTIME_DIR)
- @@-$(MKDIRHIER) $(RUNTIME_DIR)$/components
- @@-$(MKDIRHIER) $(RUNTIME_DIR)$/defaults
- @@-$(MKDIRHIER) $(RUNTIME_DIR)$/defaults$/pref
- @@-$(MKDIRHIER) $(LIB_DIR)
- @@-$(MKDIRHIER) $(INCLUDE_DIR)
-.IF "$(OS)"=="SOLARIS"
- @@-$(MKDIRHIER) $(RUNTIME_DIR)$/res
-.ENDIF
-
-$(OUT)$/bin$/mozruntime.zip: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- noop
-
-$(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip
-# copy files in BIN_RUNTIMELIST
- $(foreach,file,$(BIN_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$(file)$(DLLPOST) \
- $(RUNTIME_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
- echo >& $(NULLDEV)
-
-# copy files in COMPONENT_RUNTIMELIST
- $(foreach,file,$(COMPONENT_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/components$/$(DLLPRE)$(file)$(DLLPOST) \
- $(RUNTIME_DIR)$/components$/$(DLLPRE)$(file)$(DLLPOST) &&) \
- echo >& $(NULLDEV)
-
-# copy files in COMREGISTRY_FILELIST
- $(foreach,file,$(COMREGISTRY_FILELIST) $(COPY) $(MOZ_BIN_DIR)$/components$/$(file) \
- $(RUNTIME_DIR)$/components$/$(file) &&) \
- echo >& $(NULLDEV)
-
-# copy files in DEFAULTS_RUNTIMELIST
- @@-$(MKDIR) $(RUNTIME_DIR)$/defaults$/pref
- @@-$(MKDIR) $(RUNTIME_DIR)$/defaults$/autoconfig
- @@-$(MKDIR) $(RUNTIME_DIR)$/greprefs
- $(foreach,file,$(DEFAULTS_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(file) $(RUNTIME_DIR)$/$(file) &&) \
- echo >& $(NULLDEV)
-
-
-# zip runtime files to mozruntime.zip
- cd $(RUNTIME_DIR) && zip -r ..$/..$/bin$/mozruntime.zip *
-
- $(TOUCH) $@
-
-$(INCCOM)$/nsBuildID.h: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @-echo "You can delete $(INCCOM) to force it copy all include files again."
-
-
-$(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
- $(COPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
- $(COPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
- $(TOUCH) $@
-
-# On UNX the rules for so_moz_runtime_files copy files into the same directory
-# used here (LIB_DIR), and on MACOSX all those files together need to be
-# processed here, hence the dependency on so_moz_runtime_files:
-$(MISC)$/build$/so_moz_lib_files: $(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file)) $(MISC)$/build$/so_moz_runtime_files
- echo $(foreach,file,$(LIBLIST) $(MOZ_DIST_DIR)$/lib$/$(file))
- $(foreach,file,$(LIBLIST) $(COPY) $(MOZ_DIST_DIR)$/lib$/$(file) \
- $(LIB_DIR)$/$(file) &&) \
- echo >& $(NULLDEV)
- $(TOUCH) $@
-
-$(BIN_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @$(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$@$(DLLPOST) $(RUNTIME_DIR)$/$(DLLPRE)$@$(DLLPOST)
-
-$(COMPONENT_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @$(COPY) $(MOZ_BIN_DIR)$/components$/$(DLLPRE)$@$(DLLPOST) $(RUNTIME_DIR)$/components$/$(DLLPRE)$@$(DLLPOST)
-
-$(COMREGISTRY_FILELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @$(COPY) $(MOZ_BIN_DIR)$/components$/$@ $(RUNTIME_DIR)$/components$/$@
-
-$(DEFAULTS_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @$(COPY) $(MOZ_BIN_DIR)$/$@ $(RUNTIME_DIR)$/$@
-
-$(LIB_DIR)$/%: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- noop
-
-$(MISC)$/CREATETARBALL: extract_mozab_files
- @@-$(MKDIR) $(OUT)$/zipped
- $(COPY) $(BIN)$/mozruntime.zip $(OUT)$/zipped$/$(MOZTARGET)runtime.zip
- cd $(LB) && zip -r ..$/zipped$/$(MOZTARGET)lib.zip *
- cd $(INCCOM) && zip -r ..$/zipped$/$(MOZTARGET)inc.zip *
diff --git a/moz/makefile.mk b/moz/makefile.mk
deleted file mode 100644
index e7c8528..0000000
--- a/moz/makefile.mk
+++ /dev/null
@@ -1,221 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=ooo_mozab
-TARGET=ooo_mozab
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-# ----- pkg-config start -------
-.INCLUDE .IGNORE : pkgroot.mk
-.IF "$(PKGCONFIG_ROOT)"!=""
-PKG_CONFIG:=$(PKGCONFIG_ROOT)$/bin$/pkg-config
-PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/pkgconfig
-.IF "$(LD_LIBRARY_PATH)"=="" # assume empty implies unset
-LD_LIBRARY_PATH!:=$(PKGCONFIG_ROOT)$/lib
-.ELSE
-LD_LIBRARY_PATH!:=$(LD_LIBRARY_PATH)$(PATH_SEPERATOR)$(PKGCONFIG_ROOT)$/lib
-.ENDIF
-.EXPORT : PKG_CONFIG_PATH PKG_CONFIG LD_LIBRARY_PATH
-.ENDIF # "$(PKGCONFIG_ROOT)"!=""
-
-# reduce prerequisites by disabling mozilla binary
-DISABLE_MOZ_EXECUTABLE=TRUE
-.EXPORT : DISABLE_MOZ_EXECUTABLE
-
-
-# ----- pkg-config end -------
-
-MOZILLA_VERSION=1.1.14
-TARFILE_NAME=seamonkey-$(MOZILLA_VERSION).source
-TARFILE_MD5=a169ab152209200a7bad29a275cb0333
-
-TARFILE_ROOTDIR=mozilla
-PATCH_FILES = \
- seamonkey-source-$(MOZILLA_VERSION).patch \
- patches/dtoa.patch \
- patches/respect_disable_pango.patch \
- patches/link_fontconfig.patch \
- patches/brokenmakefile.patch \
- patches/libpr0n_build_fix.patch \
- patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
- patches/clang_missing_this_pointers.patch \
- patches/seamonkey-1.1.14.source-macosx10.6and7.patch \
-
-# This file is needed for the W32 build when BUILD_MOZAB is set
-# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
-MOZTOOLS_ZIPFILE_NAME*=vc8-moztools.zip
-
-ADDITIONAL_FILES=mailnews$/addrbook$/src$/nsAbMD5sum.cpp
-
-CONFIGURE_DIR=
-
-MOZILLA_CONFIGURE_FLAGS += --disable-tests \
- --enable-application=suite \
- --enable-ldap \
- --enable-crypto \
- --enable-optimize \
- --enable-strip \
- --disable-profilelocking \
- --disable-activex \
- --disable-activex-scripting \
- --disable-gnomevfs \
- --disable-debug \
- --disable-xprint \
- --disable-postscript \
- --without-system-zlib \
- --with-system-nss \
- --with-system-nspr \
- --disable-installer \
- --disable-accessibility \
- --disable-xpfe-components \
- --disable-mathml \
- --disable-oji \
- --disable-profilesharing \
- --disable-boehm \
- --disable-jsloader \
- --disable-canvas \
- --disable-freetype2 \
- --disable-gnomeui \
- --disable-image-encoders \
- --disable-plugins \
- --disable-printing \
- --disable-pango \
- --enable-extensions="pref"
-
-.IF "$(SYSTEM_NSS)"=="NO"
-
-MOZILLA_CONFIGURE_FLAGS += \
- --with-nss-prefix=$(OUTDIR) \
- --with-nspr-prefix=$(OUTDIR)
-.ENDIF
-
-#disable profilelocking to share profile with mozilla
-#disable activex and activex-scripting to remove the dependence of Microsoft_SDK\src\mfc\atlbase.h
-#disable gnomevfs to remove the needed of gnome develop files
-#disable others to save build times
-
-# create a objdir build = build files in a seperate directory, not in the sourcetree directly
-CONFIGURE_DIR=$(CPU)_objdir
-BUILD_DIR=$(CONFIGURE_DIR)
-MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch $(MOZ_ARCH)" AR=ar
-
-CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS)
-
-BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS)
-
-MOZDIR=$(MISC)$/build$/seamonkey
-MOZTARGET=$(OS)$(COM)$(CPU)
-
-# "Our" build environment uses "NO" for the environment variable that
-# indicate if system libraries should be used, the mozilla build uses
-# "" in this case. This conflicts (at least for W32) with mozilla (1.7b)
-# because it disables the library checks for msvc so that
-# --without-system-* is not evaluated. To build the included libraries
-# the affected variables have to be empty and not NO.
-.IF "$(SYSTEM_ZLIB)"=="NO"
-SYSTEM_ZLIB:=
-.EXPORT : SYSTEM_ZLIB
-.ENDIF
-.IF "$(SYSTEM_JPEG)"=="NO"
-SYSTEM_JPEG:=
-.EXPORT : SYSTEM_JPEG
-.ENDIF
-
-CC:=cl.exe
-CXX:=cl.exe
-
-# Variables to install/use our own wintools
-MOZTOOLS_EXTRACT:=$(MISC)$/build$/moztools
-MOZ_TOOLS_DOS:=$(shell @cygpath -ad "$(MISC)")\build\moztools\vc8-moztools
-PATH!:=$(shell @cygpath $(MOZ_TOOLS_DOS))/bin:$(PATH)
-
-MOZ_TOOLS:=$(subst,\,/ $(MOZ_TOOLS_DOS))
-
-.EXPORT : PATH MOZ_TOOLS
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(BUILD_MOZAB)"==""
-all:
- @echo "Never Build Mozilla but copy runtime files $(MSVC80_DLL_DIR) ."
- @echo "Never Build Mozilla but copy runtime files."
- @@-$(MKDIR) $(OUT)$/zipped
- $(COPY) $(TARFILE_LOCATION)$/$(MOZ_ZIP_INC) $(PRJ)$/zipped$/
- $(COPY) $(TARFILE_LOCATION)$/$(MOZ_ZIP_LIB) $(PRJ)$/zipped$/
- $(COPY) $(TARFILE_LOCATION)$/$(MOZ_ZIP_RUNTIME) $(PRJ)$/zipped$/
-.IF "$(EXTMSV80)"!=""
- $(COPY) $(MSVC80_MNFST) $(EXTMSV80)$/Microsoft.VC80.CRT.manifest
- $(COPY) $(MSVC80_DLL_DIR)$/msvcp80.dll $(EXTMSV80)$/
- $(COPY) $(MSVC80_DLL_DIR)$/msvcr80.dll $(EXTMSV80)$/
-.ENDIF
-.ENDIF
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-NEEDWINTOOLSFLAGFILE:=$(MISC)$/build$/moztools.complete
-
-ALLTAR: $(NEEDWINTOOLSFLAGFILE) \
- $(MISC)$/remove_build.flag \
- extract_mozab_files
-
-$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(MISC)$/remove_build.flag
-
-# Since you never know what will be in a patch (for example, it may already
-# patch at configure level), we remove the entire package directory if a patch
-# is newer.
-$(MISC)$/remove_build.flag : $(PATCH_FILES)
- $(REMOVE_PACKAGE_COMMAND)
- $(TOUCH) $(MISC)$/remove_build.flag
-
-# Unpack/setup Windows build tools
-$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(MISC)$/build$/moztools.complete
-
-$(MISC)$/build$/moztools.unpack : $(PRJ)$/download$/$(MOZTOOLS_ZIPFILE_NAME)
- -$(RENAME) $(MOZTOOLS_EXTRACT) $(MOZTOOLS_EXTRACT)_removeme
- -rm -rf $(MOZTOOLS_EXTRACT)_removeme
- @-$(MKDIRHIER) $(MOZTOOLS_EXTRACT)
- unzip $(PRJ)$/download$/$(MOZTOOLS_ZIPFILE_NAME) -d $(MOZTOOLS_EXTRACT)
-# chmod is also needed for W32-4nt build (when cygwin unzip is used)
- -chmod -R +x $(MOZTOOLS_EXTRACT)$/vc8-moztools$/bin
- $(TOUCH) $(MISC)$/build$/moztools.unpack
-
-$(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack
- $(TOUCH) $(MISC)$/build$/moztools.complete
-
-zip: \
- $(MISC)$/CREATETARBALL
-
-.INCLUDE : extractfiles.mk
diff --git a/moz/patches/aix_build_fix.patch b/moz/patches/aix_build_fix.patch
deleted file mode 100644
index d778532..0000000
--- 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 79368e5..0000000
--- 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 20d8801..0000000
--- 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 c2ff5d2..0000000
--- 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 d92434f..0000000
--- 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 d82d594..0000000
--- 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 e0983ae..0000000
--- 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 fce3be3..0000000
--- 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 3b0e80b..0000000
--- 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 8eb0677..0000000
--- 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 083e493..0000000
--- 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 66e82fa..0000000
--- 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 e79f582..0000000
--- 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 026cc7e..0000000
--- 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 b735669..0000000
--- 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 07a83e9..0000000
--- 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 at 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 e74c4e4..0000000
--- 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 3abce6da..0000000
--- 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 a8f31cd..0000000
--- 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
diff --git a/moz/prj/build.lst b/moz/prj/build.lst
index 02c1bae..0694876 100644
--- a/moz/prj/build.lst
+++ b/moz/prj/build.lst
@@ -1,4 +1,2 @@
moz moz : solenv NSS:nss NULL
-moz moz usr1 - all moz_mkout NULL
moz moz nmake - all moz_mozilla NULL
-moz moz\zipped nmake - all moz_zipped moz_mozilla NULL
diff --git a/moz/prj/d.lst b/moz/prj/d.lst
index caceae6..e69de29 100644
--- a/moz/prj/d.lst
+++ b/moz/prj/d.lst
@@ -1,242 +0,0 @@
-mkdir: %_DEST%\inc\mozilla
-mkdir: %COMMON_DEST%\inc\mozilla
-mkdir: %_DEST%\inc\mozilla\moz
-
-mkdir: %_DEST%\inc\mozilla\absync
-mkdir: %_DEST%\inc\mozilla\accessibility
-mkdir: %_DEST%\inc\mozilla\AcctIdl
-mkdir: %_DEST%\inc\mozilla\appcomps
-mkdir: %_DEST%\inc\mozilla\appshell
-mkdir: %_DEST%\inc\mozilla\appstartup
-mkdir: %_DEST%\inc\mozilla\bookmarks
-mkdir: %_DEST%\inc\mozilla\caps
-mkdir: %_DEST%\inc\mozilla\chardet
-mkdir: %_DEST%\inc\mozilla\content_xsl
-mkdir: %_DEST%\inc\mozilla\content_xul
-mkdir: %_DEST%\inc\mozilla\cookie
-mkdir: %_DEST%\inc\mozilla\docshell
-mkdir: %_DEST%\inc\mozilla\dom
-mkdir: %_DEST%\inc\mozilla\editor
-mkdir: %_DEST%\inc\mozilla\expat
-mkdir: %_DEST%\inc\mozilla\exthandler
-mkdir: %_DEST%\inc\mozilla\find
-mkdir: %_DEST%\inc\mozilla\gfx
-mkdir: %_DEST%\inc\mozilla\gfx2
-mkdir: %_DEST%\inc\mozilla\gfxwin
-mkdir: %_DEST%\inc\mozilla\gkplugin
-mkdir: %_DEST%\inc\mozilla\helperAppDlg
-mkdir: %_DEST%\inc\mozilla\history
-mkdir: %_DEST%\inc\mozilla\htmlparser
-mkdir: %_DEST%\inc\mozilla\imgicon
-mkdir: %_DEST%\inc\mozilla\imglib2
-mkdir: %_DEST%\inc\mozilla\import
-mkdir: %_DEST%\inc\mozilla\intlcmpt
-mkdir: %_DEST%\inc\mozilla\jar
-mkdir: %_DEST%\inc\mozilla\java
-mkdir: %_DEST%\inc\mozilla\jpeg
-mkdir: %_DEST%\inc\mozilla\js
-mkdir: %_DEST%\inc\mozilla\jsconsole
-mkdir: %_DEST%\inc\mozilla\jsurl
-mkdir: %_DEST%\inc\mozilla\layout
-mkdir: %_DEST%\inc\mozilla\layout_xul
-mkdir: %_DEST%\inc\mozilla\ldap
-mkdir: %_DEST%\inc\mozilla\ldap\ldap
-mkdir: %_DEST%\inc\mozilla\ldap-nspr
-mkdir: %_DEST%\inc\mozilla\lwbrk
-mkdir: %_DEST%\inc\mozilla\mailnews
-mkdir: %_DEST%\inc\mozilla\mimeemitter
-mkdir: %_DEST%\inc\mozilla\mimetype
-mkdir: %_DEST%\inc\mozilla\mng
-mkdir: %_DEST%\inc\mozilla\mork
-mkdir: %_DEST%\inc\mozilla\mozbrwsr
-mkdir: %_DEST%\inc\mozilla\mozreg
-mkdir: %_DEST%\inc\mozilla\mpfilelocprovider
-mkdir: %_DEST%\inc\mozilla\msgbaseutil
-mkdir: %_DEST%\inc\mozilla\msgcompo
-mkdir: %_DEST%\inc\mozilla\msgdb
-mkdir: %_DEST%\inc\mozilla\msgimap
-mkdir: %_DEST%\inc\mozilla\msglocal
-mkdir: %_DEST%\inc\mozilla\msgnews
-mkdir: %_DEST%\inc\mozilla\msgsearch
-mkdir: %_DEST%\inc\mozilla\necko2
-mkdir: %_DEST%\inc\mozilla\nkcache
-mkdir: %_DEST%\inc\mozilla\nspr
-mkdir: %_DEST%\inc\mozilla\nspr\obsolete
-mkdir: %_DEST%\inc\mozilla\nspr\private
-mkdir: %_DEST%\inc\mozilla\nsprefm
-mkdir: %_DEST%\inc\mozilla\nss
-mkdir: %_DEST%\inc\mozilla\oji
-mkdir: %_DEST%\inc\mozilla\obsolete
-mkdir: %_DEST%\inc\mozilla\plugin
-mkdir: %_DEST%\inc\mozilla\png
-mkdir: %_DEST%\inc\mozilla\prefmigr
-mkdir: %_DEST%\inc\mozilla\rdfutil
-mkdir: %_DEST%\inc\mozilla\regviewer
-mkdir: %_DEST%\inc\mozilla\related
-mkdir: %_DEST%\inc\mozilla\search
-mkdir: %_DEST%\inc\mozilla\setuprsc
-mkdir: %_DEST%\inc\mozilla\shistory
-mkdir: %_DEST%\inc\mozilla\sidebar
-mkdir: %_DEST%\inc\mozilla\signonviewer
-mkdir: %_DEST%\inc\mozilla\timer
-mkdir: %_DEST%\inc\mozilla\transformiix
-mkdir: %_DEST%\inc\mozilla\txmgr
-mkdir: %_DEST%\inc\mozilla\txtsvc
-mkdir: %_DEST%\inc\mozilla\unicharutil
-mkdir: %_DEST%\inc\mozilla\uninstall
-mkdir: %_DEST%\inc\mozilla\uriloader
-mkdir: %_DEST%\inc\mozilla\urlbarhistory
-mkdir: %_DEST%\inc\mozilla\util
-mkdir: %_DEST%\inc\mozilla\view
-mkdir: %_DEST%\inc\mozilla\wallet
-mkdir: %_DEST%\inc\mozilla\walleteditor
-mkdir: %_DEST%\inc\mozilla\walletpreview
-mkdir: %_DEST%\inc\mozilla\webBrowser_core
-mkdir: %_DEST%\inc\mozilla\webshell
-mkdir: %_DEST%\inc\mozilla\widget
-mkdir: %_DEST%\inc\mozilla\windowwatcher
-mkdir: %_DEST%\inc\mozilla\xml-rpc
-mkdir: %_DEST%\inc\mozilla\xmlextras
-mkdir: %_DEST%\inc\mozilla\xpconnect
-mkdir: %_DEST%\inc\mozilla\xpicleanup
-mkdir: %_DEST%\inc\mozilla\xpinstall
-mkdir: %_DEST%\inc\mozilla\xpnet
-mkdir: %_DEST%\inc\mozilla\zlib
-
-..\%__SRC%\inc\*.h %_DEST%\inc\mozilla
-..\%__SRC%\inc\absync\* %_DEST%\inc\mozilla\absync
-..\%__SRC%\inc\accessibility\* %_DEST%\inc\mozilla\accessibility
-..\%__SRC%\inc\AcctIdl\* %_DEST%\inc\mozilla\AcctIdl
-..\%__SRC%\inc\addrbook\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\appcomps\* %_DEST%\inc\mozilla\appcomps
-..\%__SRC%\inc\appshell\* %_DEST%\inc\mozilla\appshell
-..\%__SRC%\inc\appstartup\* %_DEST%\inc\mozilla\appstartup
-..\%__SRC%\inc\bookmarks\* %_DEST%\inc\mozilla\bookmarks
-..\%__SRC%\inc\caps\* %_DEST%\inc\mozilla\caps
-..\%__SRC%\inc\chardet\* %_DEST%\inc\mozilla\chardet
-..\%__SRC%\inc\chrome\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\content\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\content_xsl\* %_DEST%\inc\mozilla\content_xsl
-..\%__SRC%\inc\content_xul\* %_DEST%\inc\mozilla\content_xul
-..\%__SRC%\inc\cookie\* %_DEST%\inc\mozilla\cookie
-..\%__SRC%\inc\docshell\* %_DEST%\inc\mozilla\docshell
-..\%__SRC%\inc\dom\* %_DEST%\inc\mozilla\dom
-..\%__SRC%\inc\editor\* %_DEST%\inc\mozilla\editor
-..\%__SRC%\inc\embed_base\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\expat\* %_DEST%\inc\mozilla\expat
-..\%__SRC%\inc\exthandler\* %_DEST%\inc\mozilla\exthandler
-..\%__SRC%\inc\find\* %_DEST%\inc\mozilla\find
-..\%__SRC%\inc\gfx\* %_DEST%\inc\mozilla\gfx
-..\%__SRC%\inc\gfx2\* %_DEST%\inc\mozilla\gfx2
-..\%__SRC%\inc\gfxwin\* %_DEST%\inc\mozilla\gfxwin
-..\%__SRC%\inc\gkplugin\* %_DEST%\inc\mozilla\gkplugin
-..\%__SRC%\inc\helperAppDlg\* %_DEST%\inc\mozilla\helperAppDlg
-..\%__SRC%\inc\history\* %_DEST%\inc\mozilla\history
-..\%__SRC%\inc\htmlparser\* %_DEST%\inc\mozilla\htmlparser
-..\%__SRC%\inc\imgicon\* %_DEST%\inc\mozilla\imgicon
-..\%__SRC%\inc\imglib2\* %_DEST%\inc\mozilla\imglib2
-..\%__SRC%\inc\import\* %_DEST%\inc\mozilla\import
-..\%__SRC%\inc\intl\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\intlcmpt\* %_DEST%\inc\mozilla\intlcmpt
-..\%__SRC%\inc\jar\* %_DEST%\inc\mozilla\jar
-..\%__SRC%\inc\java\* %_DEST%\inc\mozilla\java
-..\%__SRC%\inc\jpeg\* %_DEST%\inc\mozilla\jpeg
-..\%__SRC%\inc\js\* %_DEST%\inc\mozilla\js
-..\%__SRC%\inc\jsconsole\* %_DEST%\inc\mozilla\jsconsole
-..\%__SRC%\inc\jsurl\* %_DEST%\inc\mozilla\jsurl
-..\%__SRC%\inc\layout\* %_DEST%\inc\mozilla\layout
-..\%__SRC%\inc\layout_xul\* %_DEST%\inc\mozilla\layout_xul
-..\%__SRC%\inc\ldap\* %_DEST%\inc\mozilla\ldap
-..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc\mozilla\ldap\ldap
-..\%__SRC%\inc\ldap-nspr\* %_DEST%\inc\mozilla\ldap-nspr
-..\%__SRC%\inc\locale\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\lwbrk\* %_DEST%\inc\mozilla\lwbrk
-..\%__SRC%\inc\mailnews\* %_DEST%\inc\mozilla\mailnews
-..\%__SRC%\inc\mime\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\mimeemitter\* %_DEST%\inc\mozilla\mimeemitter
-..\%__SRC%\inc\mimetype\* %_DEST%\inc\mozilla\mimetype
-..\%__SRC%\inc\mng\* %_DEST%\inc\mozilla\mng
-..\%__SRC%\inc\mork\* %_DEST%\inc\mozilla\mork
-..\%__SRC%\inc\mozbrwsr\* %_DEST%\inc\mozilla\mozbrwsr
-..\%__SRC%\inc\mozldap\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\mozreg\* %_DEST%\inc\mozilla\mozreg
-..\%__SRC%\inc\mpfilelocprovider\* %_DEST%\inc\mozilla\mpfilelocprovider
-..\%__SRC%\inc\msgbase\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\msgbaseutil\* %_DEST%\inc\mozilla\msgbaseutil
-..\%__SRC%\inc\msgcompo\* %_DEST%\inc\mozilla\msgcompo
-..\%__SRC%\inc\msgdb\* %_DEST%\inc\mozilla\msgdb
-..\%__SRC%\inc\msgimap\* %_DEST%\inc\mozilla\msgimap
-..\%__SRC%\inc\msglocal\* %_DEST%\inc\mozilla\msglocal
-..\%__SRC%\inc\msgnews\* %_DEST%\inc\mozilla\msgnews
-..\%__SRC%\inc\msgsearch\* %_DEST%\inc\mozilla\msgsearch
-..\%__SRC%\inc\necko\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\necko2\* %_DEST%\inc\mozilla\necko2
-..\%__SRC%\inc\nkcache\* %_DEST%\inc\mozilla\nkcache
-..\%__SRC%\inc\nspr\* %_DEST%\inc\mozilla\nspr
-..\%__SRC%\inc\nspr\obsolete\* %_DEST%\inc\mozilla\nspr\obsolete
-..\%__SRC%\inc\nspr\private\* %_DEST%\inc\mozilla\nspr\private
-..\%__SRC%\inc\nsprefm\* %_DEST%\inc\mozilla\nsprefm
-..\%__SRC%\inc\nss\* %_DEST%\inc\mozilla\nss
-..\%__SRC%\inc\oji\* %_DEST%\inc\mozilla\oji
-..\%__SRC%\inc\obsolete\* %_DEST%\inc\mozilla\obsolete
-..\%__SRC%\inc\plugin\* %_DEST%\inc\mozilla\plugin
-..\%__SRC%\inc\png\* %_DEST%\inc\mozilla\png
-..\%__SRC%\inc\pref\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\prefmigr\* %_DEST%\inc\mozilla\prefmigr
-..\%__SRC%\inc\profile\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\rdf\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\rdfutil\* %_DEST%\inc\mozilla\rdfutil
-..\%__SRC%\inc\regviewer\* %_DEST%\inc\mozilla\regviewer
-..\%__SRC%\inc\related\* %_DEST%\inc\mozilla\related
-..\%__SRC%\inc\search\* %_DEST%\inc\mozilla\search
-..\%__SRC%\inc\setuprsc\* %_DEST%\inc\mozilla\setuprsc
-..\%__SRC%\inc\shistory\* %_DEST%\inc\mozilla\shistory
-..\%__SRC%\inc\sidebar\* %_DEST%\inc\mozilla\sidebar
-..\%__SRC%\inc\signonviewer\* %_DEST%\inc\mozilla\signonviewer
-..\%__SRC%\inc\string\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\timer\* %_DEST%\inc\mozilla\timer
-..\%__SRC%\inc\transformiix\* %_DEST%\inc\mozilla\transformiix
-..\%__SRC%\inc\txmgr\* %_DEST%\inc\mozilla\txmgr
-..\%__SRC%\inc\txtsvc\* %_DEST%\inc\mozilla\txtsvc
-..\%__SRC%\inc\uconv\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\unicharutil\* %_DEST%\inc\mozilla\unicharutil
-..\%__SRC%\inc\uninstall\* %_DEST%\inc\mozilla\uninstall
-..\%__SRC%\inc\uriloader\* %_DEST%\inc\mozilla\uriloader
-..\%__SRC%\inc\urlbarhistory\* %_DEST%\inc\mozilla\urlbarhistory
-..\%__SRC%\inc\util\* %_DEST%\inc\mozilla\util
-..\%__SRC%\inc\view\* %_DEST%\inc\mozilla\view
-..\%__SRC%\inc\wallet\* %_DEST%\inc\mozilla\wallet
-..\%__SRC%\inc\walleteditor\* %_DEST%\inc\mozilla\walleteditor
-..\%__SRC%\inc\walletpreview\* %_DEST%\inc\mozilla\walletpreview
-..\%__SRC%\inc\webBrowser_core\* %_DEST%\inc\mozilla\webBrowser_core
-..\%__SRC%\inc\webshell\* %_DEST%\inc\mozilla\webshell
-..\%__SRC%\inc\widget\* %_DEST%\inc\mozilla\widget
-..\%__SRC%\inc\windowwatcher\* %_DEST%\inc\mozilla\windowwatcher
-..\%__SRC%\inc\xml-rpc\* %_DEST%\inc\mozilla\xml-rpc
-..\%__SRC%\inc\xmlextras\* %_DEST%\inc\mozilla\xmlextras
-..\%__SRC%\inc\xpcom\* %_DEST%\inc\mozilla\moz
-..\%__SRC%\inc\xpconnect\* %_DEST%\inc\mozilla\xpconnect
-..\%__SRC%\inc\xpicleanup\* %_DEST%\inc\mozilla\xpicleanup
-..\%__SRC%\inc\xpinstall\* %_DEST%\inc\mozilla\xpinstall
-..\%__SRC%\inc\xpnet\* %_DEST%\inc\mozilla\xpnet
-..\%__SRC%\inc\zlib\* %_DEST%\inc\mozilla\zlib
-..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc\mozilla\moz
-
-..\%__SRC%\lib\libldap50.* %_DEST%\lib
-..\%__SRC%\lib\libmozjs.* %_DEST%\lib
-..\%__SRC%\lib\libmozz.* %_DEST%\lib
-..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib
-..\%__SRC%\lib\libnssckbi.* %_DEST%\lib
-..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib
-..\%__SRC%\lib\libnssutil3.* %_DEST%\lib
-..\%__SRC%\lib\libprldap50.* %_DEST%\lib
-..\%__SRC%\lib\libxpcom.* %_DEST%\lib
-..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib
-..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib
-..\%__SRC%\lib\*.a %_DEST%\lib
-..\%__SRC%\lib\*.lib %_DEST%\lib
-
-mkdir: %_DEST%\lib\sqlite
-..\%__SRC%\lib\libsqlite3.* %_DEST%\lib\sqlite
-
-..\%__SRC%\bin\*.zip %_DEST%\bin
diff --git a/moz/prj/dmake b/moz/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch
deleted file mode 100644
index 1d0db1f..0000000
--- a/moz/seamonkey-source-1.1.14.patch
+++ /dev/null
@@ -1,6502 +0,0 @@
---- misc/mozilla/build/autoconf/mozconfig-find 2007-02-16 03:19:06.000000000 +0100
-+++ misc/build/mozilla/build/autoconf/mozconfig-find 2008-08-19 10:12:04.000000000 +0200
-@@ -51,10 +51,7 @@
- "$topsrcdir/.mozconfig" \
- "$topsrcdir/mozconfig" \
- "$topsrcdir/mozconfig.sh" \
-- "$topsrcdir/myconfig.sh" \
-- "$HOME/.mozconfig" \
-- "$HOME/.mozconfig.sh" \
-- "$HOME/.mozmyconfig.sh"
-+ "$topsrcdir/myconfig.sh"
- do
- if test -f "$_config"; then
- echo "$_config";
---- misc/mozilla/build/cygwin-wrapper 2004-08-19 01:18:55.000000000 +0200
-+++ misc/build/mozilla/build/cygwin-wrapper 2008-08-14 16:22:21.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # Stupid wrapper to avoid win32 dospath/cygdrive issues
- # Try not to spawn programs from within this file. If the stuff in here looks royally
-@@ -57,12 +57,36 @@
- i=-I${mountpoint}/${driveletter}/${pathname}
- fi
- else
-- eval 'leader=${i%%'${mountpoint}'/[a-zA-Z]/*}'
-- if ! test "${leader}" = "${i}"; then
-- eval 'pathname=${i#'${leader}${mountpoint}'/[a-zA-Z]/}'
-- eval 'no_mountpoint=${i#'${leader}${mountpoint}'/}'
-- driveletter=${no_mountpoint%%/*}
-- i=${leader}${driveletter}:/${pathname}
-+ # The original version missed mounted paths, the new version below
-+ # doesn't transform /para as this is most likely a parameter.
-+ eval 'notinpath=${i%%'${mountpoint}'/[a-zA-Z]/*}'
-+ if ! test "$notinpath" = "$i"; then
-+ # found $mountpoint
-+ eval 'restpath=${i#'${notinpath}${mountpoint}'/[a-zA-Z]/}'
-+ eval 'withdrive=${i#'${notinpath}${mountpoint}'/}'
-+ driveletter=${withdrive%%/*}
-+ i=${notinpath}${driveletter}:/${restpath}
-+ else
-+ # check for potential path. Precheck using shell methods
-+ doconvert=""
-+ # Shortcut -X<path> when path does not begin with '/'
-+ noswitch=${i#-[a-zA-Z]}
-+ if test "$noswitch" != "$i"; then
-+ test "${noswitch#/}" != "$noswitch" && doconvert="1"
-+ fi
-+ # Precheck for possible path. Consider only absolute paths that contain at least
-+ # a second / to prevent converting of /abc parameters.
-+ test -z "$doconvert" -a "${i#/[a-zA-Z0-9_.-]*/}" != "$i" && doconvert="1"
-+ if test -n "$doconvert"; then
-+ # Can be a path. If forking grep would be faster or we could require bash 3
-+ # this regexp would be all that's needed to find pathnames that need converting
-+ pathname=`echo $i | grep -oE '^(-[a-zA-Z])?/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_./-]+$'`
-+ eval 'notinpath=${i%'${pathname}'}'
-+ if test "$notinpath" != "$i" -a "$pathname" != "${pathname#/}"; then
-+ pathname=`cygpath -am "$pathname"`
-+ i=${notinpath}${pathname}
-+ fi
-+ fi
- fi
- fi
- fi
---- misc/mozilla/config/Makefile.in 2006-12-22 14:50:41.000000000 +0100
-+++ misc/build/mozilla/config/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -166,7 +166,7 @@
-
- ifdef MOZ_ENABLE_GTK2
- GLIB_CFLAGS = $(MOZ_GTK2_CFLAGS)
-- GLIB_LIBS = $(MOZ_GTK2_LIBS)
-+ GLIB_LIBS = $(filter -lglib% -L%,$(MOZ_GTK2_LIBS))
- endif
-
- build_number: FORCE
---- misc/mozilla/config/autoconf.mk.in 2006-09-14 20:07:03.000000000 +0200
-+++ misc/build/mozilla/config/autoconf.mk.in 2008-11-07 16:08:52.937500000 +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@
---- misc/mozilla/config/config.mk 2008-01-29 20:30:22.000000000 +0100
-+++ misc/build/mozilla/config/config.mk 2008-08-14 16:22:21.000000000 +0200
-@@ -758,6 +758,30 @@
- endif
-
- #
-+# Shared library RUNPATH linker option(s)
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
-+ifdef IS_COMPONENT
-+EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
-+endif # IS_COMPONENT
-+endif # FreeBSD
-+
-+ifeq ($(OS_ARCH),Linux)
-+EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
-+ifdef IS_COMPONENT
-+EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
-+endif # IS_COMPONENT
-+endif # Linux
-+
-+ifeq ($(OS_ARCH),SunOS)
-+EXTRA_DSO_LDOPTS += -R '$$ORIGIN'
-+ifdef IS_COMPONENT
-+EXTRA_DSO_LDOPTS += -R '$$ORIGIN/..'
-+endif # IS_COMPONENT
-+endif # SunOS
-+
-+#
- # Include any personal overrides the user might think are needed.
- #
- -include $(MY_CONFIG)
---- misc/mozilla/config/rules.mk 2008-01-29 20:30:22.000000000 +0100
-+++ misc/build/mozilla/config/rules.mk 2009-02-16 14:05:23.000000000 +0100
-@@ -529,8 +529,9 @@
- ifeq ($(OS_ARCH),WINNT)
- ifdef GNU_CC
- ifndef IS_COMPONENT
--DSO_LDOPTS += -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)
-+DSO_LDOPTS += -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)
- endif
-+DSO_LDOPTS += -Wl,--enable-runtime-pseudo-reloc -Wl,-Map -Wl,$(LIB_PREFIX)$(LIBRARY_NAME).map
- endif
- endif
-
-@@ -811,6 +810,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 +848,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 +877,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 +1036,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)
-@@ -1043,7 +1070,7 @@
- if test -d $(@D); then \
- echo "Building deps for $<"; \
- touch $(_MDDEPFILE) && \
-- $(MKDEPEND) -o'.$(OBJ_SUFFIX)' -f$(_MDDEPFILE) $(DEFINES) $(ACDEFINES) $(INCLUDES) $< >/dev/null 2>&1 && \
-+ $(MKDEPEND) -o'.$(OBJ_SUFFIX)' -f$(_MDDEPFILE) $(DEFINES) $(ACDEFINES) $(filter-out -I/so/env% ,$(INCLUDES)) $< >/dev/null 2>&1 && \
- mv $(_MDDEPFILE) $(_MDDEPFILE).old && \
- cat $(_MDDEPFILE).old | sed -e "s|^$(srcdir)/||" -e "s|^$(win_srcdir)/||" > $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \
- fi
-@@ -1053,7 +1080,7 @@
- if test -d $(@D); then \
- echo "Building deps for $<"; \
- touch $(_MDDEPFILE) && \
-- $(MKDEPEND) -o'.$(OBJ_SUFFIX)' -f$(_MDDEPFILE) $(DEFINES) $(ACDEFINES) $(INCLUDES) $< >/dev/null 2>&1 && \
-+ $(MKDEPEND) -o'.$(OBJ_SUFFIX)' -f$(_MDDEPFILE) $(DEFINES) $(ACDEFINES) $(filter-out -I/so/env% ,$(INCLUDES)) $< >/dev/null 2>&1 && \
- mv $(_MDDEPFILE) $(_MDDEPFILE).old && \
- cat $(_MDDEPFILE).old | sed -e "s|^$(<D)/||g" > $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \
- fi
-@@ -1696,14 +1724,14 @@
- define MAKE_DEPS_NOAUTO
- set -e ; \
- touch $@ && \
-- $(MKDEPEND) -w1024 -o'.$(OBJ_SUFFIX)' -f$@ $(DEFINES) $(ACDEFINES) $(INCLUDES) $(srcdir)/$(<F) >/dev/null 2>&1 && \
-+ $(MKDEPEND) -w1024 -o'.$(OBJ_SUFFIX)' -f$@ $(DEFINES) $(ACDEFINES) $(filter-out -I/so/env% ,$(INCLUDES)) $(srcdir)/$(<F) >/dev/null 2>&1 && \
- mv $@ $@.old && cat $@.old | sed "s|^$(srcdir)/||g" > $@ && rm -f $@.old
- endef
- else
- define MAKE_DEPS_NOAUTO
- set -e ; \
- touch $@ && \
-- $(MKDEPEND) -w1024 -o'.$(OBJ_SUFFIX)' -f$@ $(DEFINES) $(ACDEFINES) $(INCLUDES) $< >/dev/null 2>&1 && \
-+ $(MKDEPEND) -w1024 -o'.$(OBJ_SUFFIX)' -f$@ $(DEFINES) $(ACDEFINES) $(filter-out -I/so/env% ,$(INCLUDES)) $< >/dev/null 2>&1 && \
- mv $@ $@.old && cat $@.old | sed "s|^$(<D)/||g" > $@ && rm -f $@.old
- endef
- endif # WINNT
---- misc/mozilla/configure 2008-10-30 23:05:30.000000000 +0100
-+++ misc/build/mozilla/configure 2009-02-12 15:20:18.597579000 +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
-@@ -3022,9 +3024,26 @@
- _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
-+
-+ # 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list