CWS-TOOLING: integrate CWS moz2seamonkey01

2009-06-18 20:56:43 +0200 fs  r273133 : #i10000# corrected resolved of merge conflict
2009-06-18 20:55:34 +0200 fs  r273132 : #i10000# corrected resolved of merge conflict
2009-06-18 10:49:26 +0200 fs  r273105 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@272827 (milestone: DEV300:m50)
2009-06-17 20:48:35 +0200 fs  r273094 : #i84961# removed 'pointless and buggy' echo statement
2009-05-22 11:27:08 +0200 fs  r272176 : #i101763#
provided by tono@openoffice.org
make compile with mingw
2009-05-22 11:22:25 +0200 fs  r272175 : #i101763#
provided by tono@openoffice.org
allow compilation in with mingw
2009-04-15 12:09:28 +0200 fs  r270830 : unconditionally disable moz executables
2009-03-27 12:29:38 +0100 fs  r270149 : ignore some configure-related files
2009-03-27 11:47:35 +0100 fs  r270145 : SolarisSparc needs libfreebl_32fpu_3.so
2009-03-27 11:38:09 +0100 fs  r270141 : regxpcom call not needed nowadays / also pack libfreebl3 (needed for signature/encryption)
2009-03-26 21:40:17 +0100 fs  r270108 : superseded by 1.1.14 version
2009-03-24 13:07:21 +0100 fs  r269938 : xptitemp.dat seemingly not needed anymore
2009-03-23 12:56:29 +0100 fs  r269869 : files with : in their name break the build
2009-03-23 12:22:01 +0100 fs  r269866 : files with : in their name break the build
2009-03-21 23:12:06 +0100 fs  r269843 : manual resync: merge the changes which happened on TRUNK in mozilla-source-1.7.5.patch herein
2009-03-21 21:58:17 +0100 fs  r269841 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@269781 (milestone: DEV300:m44)
2009-03-18 12:04:25 +0100 fs  r269649 : in SunHH environment, use pre-requisites from /so/env
2009-03-16 12:33:18 +0100 pastea_p  r269522 : correct makefile.mk sorry again
2009-03-15 17:32:43 +0100 pastea_p  r269506 : last files about migration to 1.1.14
2009-03-15 17:19:39 +0100 pastea_p  r269505 : Migrates some files to 1.1.14
2009-03-04 07:45:40 +0100 fs  r268782 : also add pref.xpt
2009-02-27 09:57:37 +0100 fs  r268555 : #i66338# for the moment, disable Mozilla-based code for unxlngx6
2009-02-23 10:56:28 +0100 fs  r268346 : syntax
2009-02-19 14:14:56 +0100 fs  r268283 : make PrintPDE compile in Sun's internal build environment by removing some unneeded stuff
2009-02-18 15:40:40 +0100 fs  r268236 : #i66338# re-enable MozAB on Mac
2009-02-18 15:39:55 +0100 fs  r268235 : #i66338#
2009-02-18 15:30:38 +0100 fs  r268232 : #i66338# tar => $(TAR) (provided by hjs)
2009-02-18 15:28:45 +0100 fs  r268231 : more build envs supported (thanks to hjs for all this work!)
2009-02-18 15:27:02 +0100 fs  r268230 : #i66338#
2009-02-18 15:23:04 +0100 fs  r268229 : #i66338# let it build on Solaris, in Sun Hamburg's build environment
2009-02-18 12:00:12 +0100 fs  r268210 : #i10000#
2009-02-18 08:17:29 +0100 fs  r268198 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now
2009-02-18 08:16:50 +0100 fs  r268197 : #i66338# building Mozilla is not supported anymore, SeaMonkey is the way to go now
2009-02-14 14:05:24 +0100 fs  r267757 : redo the Windows related changes lost with recent resync
2009-02-14 00:06:33 +0100 ericb  r267755 : #i94628#  remove the config_office dir now 
2009-02-14 00:04:59 +0100 ericb  r267754 : #i94628#  remove all files in config_office now 
2009-02-14 00:01:26 +0100 ericb  r267753 : #i94628#  remove guw in config_office 
2009-02-13 23:53:00 +0100 ericb  r267752 : #i94628#  remove files in config_office 
2009-02-13 16:02:58 +0100 fs  r267725 : #i10000#
2009-02-12 18:14:31 +0100 ericb  r267685 : #i94628# new generated configure 
2009-02-12 18:13:52 +0100 ericb  r267684 : #i94628# fix a path issue for finding seamonkey01 
2009-02-12 14:39:17 +0100 ericb  r267662 : #i94628# removing seamonkey.1.1.12 patch
2009-02-12 14:21:04 +0100 ericb  r267658 : #i94628# the new configure, after autoconf
2009-02-12 14:13:21 +0100 ericb  r267656 : #i94628# other missing changes for Windows
2009-02-12 14:04:26 +0100 ericb  r267655 : #i94628# recommit configure.in changes after config_office removing
2009-02-12 13:46:12 +0100 ericb  r267653 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@267171 (milestone: DEV300:m41)
2009-02-12 12:00:48 +0100 ericb  r267643 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@267171 (milestone: DEV300:m41)
2009-02-11 13:28:50 +0100 pl  r267595 : #i94628# add MACDEVSDK variable for unxmacxi
2009-02-06 09:44:15 +0100 ericb  r267446 : #i98957# provide the zipped archives too 
2009-02-06 09:43:32 +0100 ericb  r267445 : #i98957# make seamonkey buildable on OpenSolaris, adding the right options for configure 
2009-02-06 09:42:45 +0100 ericb  r267444 : #i98957# make seamonkey buildable on OpenSolaris
2009-02-02 09:41:57 +0100 fs  r267252 : #i66338#
2009-02-02 09:41:43 +0100 fs  r267251 : #i66338#
2009-01-30 15:12:03 +0100 fs  r267200 : code consolidation - MQueryHelper now uses MLdapAttributeMap's fillCardFromResult and fillResultFromCard, which makes the code as such shorter, and eliminates information duplication
2009-01-30 11:53:31 +0100 fs  r267189 : reworked the statement parsing / statement execution / result set creation: now we don't anymore create three result sets (two of them leaking) for a single prepared statement ...
2009-01-29 20:37:01 +0100 fs  r267170 : #i10000#
2009-01-29 20:32:50 +0100 fs  r267169 : more explicit return type of parseSql
2009-01-29 17:32:56 +0100 fs  r267163 : slightly refactored the statement class hierarchy (basically remove OStatement_BASE2, and renamed the other base classes)
2009-01-29 17:14:58 +0100 fs  r267161 : #i66338# first implementation to re-enable LDAP access. Still work in progress (but hey, you can see the data already :)
2009-01-12 11:25:56 +0100 fs  r266138 : allow using a debug-enabled version of Mozilla/SeaMonkey when MOZILLA_ENABLE_DEBUG is set
2009-01-10 22:01:40 +0100 fs  r266126 : #i95772# nsldap32v50.dll also needs an embedded manifest (the LDP configuration backend links directly against it)
2009-01-09 11:15:32 +0100 fs  r266065 : manifests for DLLs need to have ID 2, not 1
2009-01-08 20:02:24 +0100 fs  r266035 : #i95772# embed manifest file in shared libs built in directory/c-sdk, too
2009-01-05 20:45:38 +0100 ericb  r265886 : #i66338# commiting the correct  configure for the tinderboxes
2009-01-05 17:42:34 +0100 ericb  r265883 : CWS-TOOLING: rebase CWS moz2seamonkey01 to trunk@265758 (milestone: DEV300:m38)
2008-12-16 15:34:26 +0100 ericb  r265550 : #i94628# change for seamonkey1.1.13 : do not forget to do autoconf in config_office before configure
2008-12-16 15:25:37 +0100 pastea_p  r265547 : 1.1.12 to 1.1.13
2008-12-16 14:20:18 +0100 pastea_p  r265540 : correct the hunk about no core_abspath which one broke linux build 
2008-12-16 13:10:06 +0100 pastea_p  r265535 : Change name of patch to 1.1.13
2008-12-15 23:32:54 +0100 pastea_p  r265518 : 2008-12-12 18:43:36 +0100 pastea_p  r265435 : update to 1.1.13
2008-12-12 10:56:38 +0100 fs  r265398 : #i95772# embed .manifest files into SHARED_LIBRARYs built in nsprpub, too
2008-12-12 09:56:38 +0100 fs  r265391 : #i95772# don't use regxpcomp on Windows, it's not needed
2008-12-11 11:22:43 +0100 fs  r265269 : #i95772# Moz/SeaMonkey libs on Windows now link against msvc?80.dll
2008-12-10 13:45:51 +0100 fs  r265182 : proper OSL_ENSURE message
2008-11-13 13:18:03 +0100 fs  r263635 : #i95772# more patches
2008-11-13 12:14:41 +0100 fs  r263630 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip
2008-11-13 12:13:33 +0100 fs  r263629 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip
2008-11-13 12:08:22 +0100 fs  r263628 : #i95772# building SeaMonkey on Windows is supported for MSVS2005 only at the moment, now requiring v8-moztools.zip instead of the previously needed wintools.zip/vc71*.zip
2008-11-13 12:04:15 +0100 fs  r263627 : #i95772#
2008-11-12 08:23:20 +0100 fs  r263575 : i95772# use xpcom_core on Windows, too
2008-11-11 21:02:14 +0100 fs  r263574 : i95772# use xpcom_core.lib on Windows, too
2008-11-11 20:58:07 +0100 fs  r263573 : i95772# use xpcom_core.lib on Windows, too
2008-11-11 15:05:42 +0100 fs  r263564 : alternative fix for part 1 of #i94957#
2008-11-10 22:18:14 +0100 fs  r263541 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842)
2008-11-10 22:15:57 +0100 fs  r263540 : #i95772# with MSVC2008, compile with -Zc:wchar_t- (shamelessly taken from https://bugzilla.mozilla.org/show_bug.cgi?id=324842)
2008-11-10 09:28:26 +0100 fs  r263509 : #i95772# when building on WNT, embed the .manifest file into the .dll/.exe
2008-11-10 09:19:06 +0100 fs  r263508 : collect single patches which comprise the complete patch
2008-11-06 09:10:21 +0100 fs  r263360 : #i95772# core_abspath does not work on Windows, too (at least in security/nss/cmd/shlibsign). Replace with 'cygpath -d -a'
2008-11-02 22:51:27 +0100 fs  r263277 : #i95772# sanitize INCLUDEDIR and GENHEADERS to use cygwin path notation - cygwin's make 1.81 doesn't cope with Windows path notation
2008-11-02 22:50:15 +0100 fs  r263276 : #i95772# no --enable-system-cairo on Windows
2008-10-18 20:12:36 +0200 pastea_p  r262297 : 2008-10-16 17:15:35 +0200 ericb  r262267 : #i94957# fix the breakage in connectivity, for the seamonkey migration 
2008-10-16 17:14:49 +0200 ericb  r262266 : #i94957# fix the breakage in connectivity, for the seamonkey migration 
2008-10-16 16:58:21 +0200 ericb  r262263 : #i94957# fix the breakage in connectivity, for the seamonkey migration 
2008-10-15 20:16:28 +0200 ericb  r262242 : #i94628# use mac as default toolkit on mac
2008-10-14 18:54:13 +0200 ericb  r262216 : #i90774# modify the configure.in for moz2seamonkey migration
2008-10-14 18:48:57 +0200 ericb  r262215 : #i90774# commit moz2seamonkey changes for svn migration
2008-10-14 18:47:05 +0200 ericb  r262214 : #i90774# commit moz2seamonkey changes for svn migration

6 files changed, 304 insertions, 0 deletions

diff --git a/moz/patches/consecutive_ldap_queries.patch b/moz/patches/consecutive_ldap_queries.patch
new file mode 100644
index 000000000000..d82d594bce09
--- /dev/null
+++ b/moz/patches/consecutive_ldap_queries.patch
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000000000000..e0983aecbe74
--- /dev/null
+++ b/moz/patches/cygwin_paths_in_ldap_sdk.patch
@@ -0,0 +1,12 @@
+--- 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/embed_manifest.patch b/moz/patches/embed_manifest.patch
new file mode 100755
index 000000000000..3b0e80b3ab81
--- /dev/null
+++ b/moz/patches/embed_manifest.patch
@@ -0,0 +1,142 @@
+--- 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
new file mode 100644
index 000000000000..fd27f442a05c
--- /dev/null
+++ b/moz/patches/index.txt
@@ -0,0 +1,65 @@
+====================================================================================

+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.

+

diff --git a/moz/patches/no_core_abspath_in_nss.patch b/moz/patches/no_core_abspath_in_nss.patch
new file mode 100644
index 000000000000..026cc7e3eb92
--- /dev/null
+++ b/moz/patches/no_core_abspath_in_nss.patch
@@ -0,0 +1,52 @@
+--- 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/wchart_on_msvc8.patch b/moz/patches/wchart_on_msvc8.patch
new file mode 100644
index 000000000000..a8f31cd4c3e3
--- /dev/null
+++ b/moz/patches/wchart_on_msvc8.patch
@@ -0,0 +1,20 @@
+--- 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