File nss-3.12.3-mingw32.patch of Package mingw32-mozilla-nss

Overview Repositories Revisions Requests Users Attributes Meta

File nss-3.12.3-mingw32.patch of Package mingw32-mozilla-nss (Revision b15e7aac447a11fd9976b6facb266c59)

Currently displaying revision b15e7aac447a11fd9976b6facb266c59 , Show latest

diff -u -r nss-3.12.3/mozilla/security/coreconf/rules.mk nss-3.12.3/mozilla/security/coreconf/rules.mk
--- nss-3.12.3/mozilla/security/coreconf/rules.mk	2008-09-23 08:51:08.000000000 +0200
+++ nss-3.12.3/mozilla/security/coreconf/rules.mk	2009-01-17 15:32:25.000000000 +0100
@@ -404,7 +404,7 @@
 PWD := $(shell pwd)
 ifeq (,$(findstring ;,$(PATH)))
 ifndef USE_MSYS
-PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
+#PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
 endif
 endif
 
diff -u -r nss-3.12.3/mozilla/security/coreconf/WINNT.mk nss-3.12.3/mozilla/security/coreconf/WINNT.mk
--- nss-3.12.3/mozilla/security/coreconf/WINNT.mk	2004-08-27 02:33:40.000000000 +0200
+++ nss-3.12.3/mozilla/security/coreconf/WINNT.mk	2009-01-17 16:09:21.000000000 +0100
@@ -46,7 +46,7 @@
 #
 # Win NT needs -GT so that fibers can work
 #
-OS_CFLAGS += -GT
+#OS_CFLAGS += -GT
 
 # WINNT uses the lib prefix, Win95 and WinCE don't
 NSPR31_LIB_PREFIX = lib
diff -u -r nss-3.12.3/mozilla/security/nss/cmd/crmftest/Makefile nss-3.12.3/mozilla/security/nss/cmd/crmftest/Makefile
--- nss-3.12.3/mozilla/security/nss/cmd/crmftest/Makefile	2005-11-14 01:17:21.000000000 +0100
+++ nss-3.12.3/mozilla/security/nss/cmd/crmftest/Makefile	2009-01-17 17:02:28.000000000 +0100
@@ -85,12 +85,12 @@
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
+#######################################################################
 
 LDDIST = $(DIST)/lib
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-EXTRA_LIBS += $(LDDIST)/sectool.lib
+#EXTRA_LIBS += $(LDDIST)/sectool.lib
 endif
 
 include ../platrules.mk
diff -u -r nss-3.12.3/mozilla/security/nss/cmd/shlibsign/Makefile nss-3.12.3/mozilla/security/nss/cmd/shlibsign/Makefile
--- nss-3.12.3/mozilla/security/nss/cmd/shlibsign/Makefile	2006-12-07 02:57:18.000000000 +0100
+++ nss-3.12.3/mozilla/security/nss/cmd/shlibsign/Makefile	2009-01-17 17:49:51.000000000 +0100
@@ -64,8 +64,8 @@
 CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
 CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
 
-MD_LIB_RELEASE_FILES = $(CHECKLOC)
-ALL_TRASH += $(CHECKLOC)
+MD_LIB_RELEASE_FILES = # $(CHECKLOC)
+#ALL_TRASH += $(CHECKLOC)
 
 
 #######################################################################
@@ -99,5 +99,5 @@
 	$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
 endif
 
-libs install :: $(CHECKLOC)
+libs install :: #$(CHECKLOC)
 
diff -u -r nss-3.12.3/mozilla/security/nss/lib/ckfw/builtins/config.mk nss-3.12.3/mozilla/security/nss/lib/ckfw/builtins/config.mk
--- nss-3.12.3/mozilla/security/nss/lib/ckfw/builtins/config.mk	2005-01-20 03:25:46.000000000 +0100
+++ nss-3.12.3/mozilla/security/nss/lib/ckfw/builtins/config.mk	2009-01-17 16:31:05.000000000 +0100
@@ -48,7 +48,7 @@
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
     SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-    RES = $(OBJDIR)/$(LIBRARY_NAME).res
+    RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
     RESNAME = $(LIBRARY_NAME).rc
 endif
 
diff -u -r nss-3.12.3/mozilla/security/nss/lib/freebl/config.mk nss-3.12.3/mozilla/security/nss/lib/freebl/config.mk
--- nss-3.12.3/mozilla/security/nss/lib/freebl/config.mk	2008-12-17 09:24:24.000000000 +0100
+++ nss-3.12.3/mozilla/security/nss/lib/freebl/config.mk	2009-01-17 16:25:17.000000000 +0100
@@ -81,12 +81,16 @@
 # don't want the 32 in the shared library name
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 
-RES     = $(OBJDIR)/$(LIBRARY_NAME).res
+RES     = $(OBJDIR)/$(LIBRARY_NAME).res.o
 RESNAME = freebl.rc
 
 ifndef WINCE
+ifdef NS_USE_GCC
+OS_LIBS += -lshell32
+else
 OS_LIBS += shell32.lib
 endif
+endif
 
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
diff -u -r nss-3.12.3/mozilla/security/nss/lib/nss/config.mk nss-3.12.3/mozilla/security/nss/lib/nss/config.mk
--- nss-3.12.3/mozilla/security/nss/lib/nss/config.mk	2008-12-17 09:24:25.000000000 +0100
+++ nss-3.12.3/mozilla/security/nss/lib/nss/config.mk	2009-01-17 16:25:17.000000000 +0100
@@ -47,7 +47,7 @@
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).o
 RESNAME = $(LIBRARY_NAME).rc
 
 ifdef NS_USE_GCC
diff -u -r nss-3.12.3/mozilla/security/nss/lib/smime/config.mk nss-3.12.3/mozilla/security/nss/lib/smime/config.mk
--- nss-3.12.3/mozilla/security/nss/lib/smime/config.mk	2008-12-17 09:24:25.000000000 +0100
+++ nss-3.12.3/mozilla/security/nss/lib/smime/config.mk	2009-01-17 16:30:07.000000000 +0100
@@ -43,7 +43,7 @@
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/smime.res
+RES = $(OBJDIR)/smime.res.o
 RESNAME = smime.rc
 
 ifdef NS_USE_GCC
diff -u -r nss-3.12.3/mozilla/security/nss/lib/softoken/config.mk nss-3.12.3/mozilla/security/nss/lib/softoken/config.mk
--- nss-3.12.3/mozilla/security/nss/lib/softoken/config.mk	2008-02-26 10:34:10.000000000 +0100
+++ nss-3.12.3/mozilla/security/nss/lib/softoken/config.mk	2009-01-17 16:25:17.000000000 +0100
@@ -54,7 +54,7 @@
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 RESNAME = $(LIBRARY_NAME).rc
 
 ifdef NS_USE_GCC
diff -u -r nss-3.12.3/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.12.3/mozilla/security/nss/lib/softoken/legacydb/config.mk
--- nss-3.12.3/mozilla/security/nss/lib/softoken/legacydb/config.mk	2008-02-26 10:34:10.000000000 +0100
+++ nss-3.12.3/mozilla/security/nss/lib/softoken/legacydb/config.mk	2009-01-17 16:27:06.000000000 +0100
@@ -55,7 +55,7 @@
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 RESNAME = $(LIBRARY_NAME).rc
 
 ifdef NS_USE_GCC
diff -u -r nss-3.12.3/mozilla/security/nss/lib/ssl/config.mk nss-3.12.3/mozilla/security/nss/lib/ssl/config.mk
--- nss-3.12.3/mozilla/security/nss/lib/ssl/config.mk	2008-12-17 09:24:25.000000000 +0100
+++ nss-3.12.3/mozilla/security/nss/lib/ssl/config.mk	2009-01-17 16:29:17.000000000 +0100
@@ -49,7 +49,7 @@
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/ssl.res
+RES = $(OBJDIR)/ssl.res.o
 RESNAME = ssl.rc
 
 ifdef NS_USE_GCC
diff -u -r nss-3.12.3/mozilla/security/nss/lib/util/config.mk nss-3.12.3/mozilla/security/nss/lib/util/config.mk
--- nss-3.12.3/mozilla/security/nss/lib/util/config.mk	2007-10-12 03:44:50.000000000 +0200
+++ nss-3.12.3/mozilla/security/nss/lib/util/config.mk	2009-01-17 16:25:17.000000000 +0100
@@ -47,7 +47,7 @@
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
 
-RES = $(OBJDIR)/$(LIBRARY_NAME).res
+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
 RESNAME = $(LIBRARY_NAME).rc
 
 ifdef NS_USE_GCC
--- nss-3.12.3/mozilla/security/coreconf/WIN32.mk	2009-04-28 13:42:35.000000000 +0200
+++ nss-3.12.3/mozilla/security/coreconf/WIN32.mk	2009-04-28 13:43:15.000000000 +0200
@@ -97,9 +97,9 @@
     # The -mnop-fun-dllimport flag allows us to avoid a drawback of
     # the dllimport attribute that a pointer to a function marked as
     # dllimport cannot be used as as a constant address.
-    OS_CFLAGS += -mno-cygwin -mms-bitfields -mnop-fun-dllimport
+    OS_CFLAGS += -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0501
     _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
-    DLLFLAGS  += -mno-cygwin -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
+    DLLFLAGS  += -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
     ifdef BUILD_OPT
 	ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
 		OPTIMIZER += -Os

Places

File nss-3.12.3-mingw32.patch of Package mingw32-mozilla-nss (Revision b15e7aac447a11fd9976b6facb266c59)

Places