From 4bc42e10a36f25eb81156c541c8458b8360df303 Mon Sep 17 00:00:00 2001
From: Joachim Lingner <jl@openoffice.org>
Date: Mon, 21 Jun 2010 10:36:29 +0200
Subject: jl153 #i111877# MinGW patch for nss from tono

---
 nss/nss.patch.mingw | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 nss/nss.patch.mingw

(limited to 'nss')

diff --git a/nss/nss.patch.mingw b/nss/nss.patch.mingw
old mode 100644
new mode 100755
index 01a9ff4e713d..89edd5638e20
--- a/nss/nss.patch.mingw
+++ b/nss/nss.patch.mingw
@@ -1,5 +1,5 @@
---- misc/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in	2009-03-03 23:04:23.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in	2009-09-18 17:24:12.042630830 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in	2009-03-04 07:04:23.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in	2010-06-17 08:42:08.010625000 +0900
 @@ -22,6 +22,7 @@
  RELEASE_OBJDIR_NAME = @RELEASE_OBJDIR_NAME@
  OBJDIR_NAME	= @OBJDIR_NAME@
@@ -8,12 +8,12 @@
  OBJ_SUFFIX	= @OBJ_SUFFIX@
  LIB_SUFFIX	= @LIB_SUFFIX@
  DLL_SUFFIX	= @DLL_SUFFIX@
---- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk	2009-05-02 01:08:01.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk	2009-09-18 17:24:52.422809433 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk	2009-12-10 06:24:37.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk	2010-06-17 08:42:08.057500000 +0900
 @@ -113,9 +113,9 @@
  # other platforms do not.
  #
- ifeq (,$(filter-out WIN95 WINCE OS2,$(OS_TARGET)))
+ ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET)))
 -LIBRARY		= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
 +LIBRARY		= $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
  SHARED_LIBRARY	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
@@ -22,8 +22,8 @@
  SHARED_LIB_PDB	= $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
  else
  LIBRARY		= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
---- misc/nss-3.12.6/mozilla/nsprpub/configure	2009-05-08 15:12:31.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure	2009-09-18 17:25:50.277803372 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/configure	2010-02-09 03:41:35.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/nsprpub/configure	2010-06-17 08:42:10.000000000 +0900
 @@ -2770,6 +2770,7 @@
  LIB_SUFFIX=a
  DLL_SUFFIX=so
@@ -32,7 +32,7 @@
  MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
  PR_MD_ASFILES=
  PR_MD_CSRCS=
-@@ -3998,6 +3999,7 @@
+@@ -4000,6 +4001,7 @@
          OBJ_SUFFIX=obj
          LIB_SUFFIX=lib
          DLL_SUFFIX=dll
@@ -40,7 +40,7 @@
  
          # Determine compiler version
          CC_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' -e 's| .*||'`
-@@ -6291,6 +6293,7 @@
+@@ -6262,6 +6264,7 @@
  s%@LIB_SUFFIX@%$LIB_SUFFIX%g
  s%@DLL_SUFFIX@%$DLL_SUFFIX%g
  s%@ASM_SUFFIX@%$ASM_SUFFIX%g
@@ -48,8 +48,8 @@
  s%@MKSHLIB@%$MKSHLIB%g
  s%@DSO_CFLAGS@%$DSO_CFLAGS%g
  s%@DSO_LDOPTS@%$DSO_LDOPTS%g
---- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in	2009-02-04 23:47:01.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in	2009-09-18 17:26:33.544145410 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in	2009-12-19 18:06:07.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in	2010-06-17 08:42:08.151250000 +0900
 @@ -195,7 +195,7 @@
  
  ifeq ($(OS_ARCH),WINNT)
@@ -59,8 +59,8 @@
  else
  OS_LIBS		= advapi32.lib wsock32.lib winmm.lib
  endif
---- misc/nss-3.12.6/mozilla/security/coreconf/WIN32.mk	2009-07-29 02:15:46.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN32.mk	2009-09-18 17:27:39.253588269 +0200
+--- misc/nss-3.12.6/mozilla/security/coreconf/WIN32.mk	2009-07-29 09:15:46.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN32.mk	2010-06-17 08:42:08.198125000 +0900
 @@ -43,8 +43,8 @@
  DEFAULT_COMPILER = cl
  
@@ -72,8 +72,8 @@
  	LINK         = ld
  	AR           = ar
  	AR          += cr $@
---- misc/nss-3.12.6/mozilla/security/coreconf/WIN95.mk	2009-02-14 06:51:10.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN95.mk	2009-09-18 17:28:06.433136076 +0200
+--- misc/nss-3.12.6/mozilla/security/coreconf/WIN95.mk	2009-02-14 14:51:10.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN95.mk	2010-06-17 08:42:08.245000000 +0900
 @@ -44,4 +44,8 @@
  DEFINES += -DWIN95
  
@@ -85,8 +85,8 @@
 +  NSPR31_LIB_PREFIX = $(NULL)
 +endif
 \ No newline at end of file
---- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk	2009-08-11 05:23:39.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk	2009-09-18 17:29:05.079376677 +0200
+--- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk	2009-12-08 10:33:36.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk	2010-06-17 08:42:08.291875000 +0900
 @@ -281,8 +281,12 @@
  	fi
  endif	# MSVC with manifest tool
@@ -100,8 +100,8 @@
  
  get_objs:
  	@echo $(OBJS)
---- misc/nss-3.12.6/mozilla/security/nss/Makefile	2008-12-03 00:24:39.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile	2009-09-18 17:29:46.194949392 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/Makefile	2009-12-09 01:47:03.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile	2010-06-17 08:42:08.338750000 +0900
 @@ -108,7 +108,7 @@
  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  endif
@@ -111,8 +111,8 @@
  endif
  
  #
---- misc/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile	2005-11-14 01:17:21.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile	2009-09-18 17:30:33.267190024 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile	2005-11-14 09:17:21.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile	2010-06-17 08:42:08.370000000 +0900
 @@ -90,7 +90,7 @@
  LDDIST = $(DIST)/lib
  
@@ -122,8 +122,8 @@
  endif
  
  include ../platrules.mk
---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2009-08-07 21:06:37.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2009-09-18 17:31:02.168253398 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2009-08-08 04:06:37.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2010-06-17 08:42:10.000000000 +0900
 @@ -115,10 +115,16 @@
  	$(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
  	$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
@@ -141,8 +141,8 @@
  
  libs install :: $(CHECKLOC)
  
---- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk	2009-04-11 23:18:42.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk	2009-09-18 17:31:40.067954076 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk	2009-04-12 06:18:42.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk	2010-06-17 08:42:08.557500000 +0900
 @@ -84,10 +84,6 @@
  RES     = $(OBJDIR)/$(LIBRARY_NAME).res
  RESNAME = freebl.rc
-- 
cgit