diff options
author | David Tardon <dtardon@redhat.com> | 2013-02-13 10:01:47 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-02-13 10:54:40 +0100 |
commit | ea8c587f49721b1209a55c5d6ade85e19ecdde81 (patch) | |
tree | 51d572b5ac9f85cc62186b5a97156194539450b0 /nss/nss.mingw.patch | |
parent | 43edaa1b3a79341a7a9394291954ff0972222042 (diff) |
fix application of patches
Diffstat (limited to 'nss/nss.mingw.patch')
-rw-r--r-- | nss/nss.mingw.patch | 128 |
1 files changed, 0 insertions, 128 deletions
diff --git a/nss/nss.mingw.patch b/nss/nss.mingw.patch deleted file mode 100644 index db073e94919a..000000000000 --- a/nss/nss.mingw.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -up misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in.dt nss/wntgcci.pro/misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in ---- misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in.dt 2012-10-29 13:30:49.244696426 +0100 -+++ misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in 2012-10-29 13:31:26.541830215 +0100 -@@ -30,7 +30,6 @@ CSRCS = now.c - - # This version hasn't been ported for us; the one in mozilla/config has - ifneq ($(OS_ARCH),OS2) --CSRCS += nsinstall.c - - PLSRCS = nfspwd.pl - endif -@@ -84,7 +83,6 @@ else - ifeq (,$(filter-out SYMBIAN WINCE,$(OS_ARCH))) - TARGETS = $(PROGS) - else --PROGS += $(OBJDIR)/nsinstall$(PROG_SUFFIX) - TARGETS = $(PROGS) $(PLSRCS:.pl=) - endif - endif -diff -up ./nss-3.13.5/mozilla/security/nss/Makefile.dt ./nss-3.13.5/mozilla/security/nss/Makefile ---- misc/build/nss-3.13.5/mozilla/security/nss/Makefile.dt 2012-10-30 10:13:07.165713712 +0100 -+++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile 2012-10-30 10:13:09.680656998 +0100 -@@ -58,7 +58,7 @@ include $(CORE_DEPTH)/coreconf/config.mk - # (4) Include "local" platform-dependent assignments (OPTIONAL). # - ####################################################################### - --ifeq ($(OS_TARGET),WINCE) -+ifeq ($(OS_TARGET),WINNT) - DIRS = lib # omit cmd since wince has no command line shell - endif - -diff -up misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk -diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk ---- misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk.dt 2012-10-30 12:31:06.675726730 +0100 -+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk 2012-10-30 12:31:08.860676053 +0100 -@@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc -diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk ---- misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk.dt 2012-10-30 12:30:52.020062600 +0100 -+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk 2012-10-30 12:30:54.504004586 +0100 -@@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/smime.res.o - RESNAME = smime.rc -diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk ---- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk.dt 2012-10-30 12:31:02.707816790 +0100 -+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk 2012-10-30 12:31:04.388778631 +0100 -@@ -47,7 +47,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc -diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk ---- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk.dt 2012-10-30 12:30:56.531958414 +0100 -+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk 2012-10-30 12:31:00.575865594 +0100 -@@ -48,7 +48,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc -diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk ---- misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk.dt 2012-10-30 12:31:10.499638736 +0100 -+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk 2012-10-30 12:31:12.624590177 +0100 -@@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - #RES = $(OBJDIR)/$(LIBRARY_NAME).res - #RESNAME = $(LIBRARY_NAME).rc -diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk ---- misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk.dt 2012-10-30 12:31:14.882539495 +0100 -+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk 2012-10-30 12:31:16.379504032 +0100 -@@ -53,7 +53,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/ssl.res.o - RESNAME = ssl.rc -diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk ---- misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk.dt 2012-10-30 12:31:18.195462428 +0100 -+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk 2012-10-30 12:31:20.277414942 +0100 -@@ -45,7 +45,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - #RES = $(OBJDIR)/$(LIBRARY_NAME).res - #RESNAME = $(LIBRARY_NAME).rc -diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk ---- misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk.dt 2012-10-30 12:31:22.179371231 +0100 -+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk 2012-10-30 12:31:24.074328169 +0100 -@@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc |