- obsolete

Changed files:
    mozilla-firefox-nss-system-nspr.patch -> 1.3
    mozilla-firefox-nss.patch -> 1.3

diff --git a/mozilla-firefox-nss-system-nspr.patch b/mozilla-firefox-nss-system-nspr.patch
deleted file mode 100644 (file)
index f92abe7..0000000
--- a/mozilla-firefox-nss-system-nspr.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: mozilla/security/coreconf/location.mk
-===================================================================
-RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v
-retrieving revision 1.9
-diff -u -r1.9 location.mk
---- mozilla/security/coreconf/location.mk      25 Apr 2004 15:02:17 -0000      1.9
-+++ mozilla/security/coreconf/location.mk      11 Apr 2005 20:21:57 -0000
-@@ -61,6 +61,8 @@
- 
- DIST          = $(SOURCE_PREFIX)/$(PLATFORM)
- 
-+NSPR_LIBDIR   = $(DIST)/lib
-+
- ifdef BUILD_DEBUG_GC
-     DEFINES += -DDEBUG_GC
- endif
-Index: mozilla/security/manager/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
-retrieving revision 1.56
-diff -u -r1.56 Makefile.in
---- mozilla/security/manager/Makefile.in       14 Mar 2005 10:00:58 -0000      1.56
-+++ mozilla/security/manager/Makefile.in       11 Apr 2005 20:21:57 -0000
-@@ -76,12 +76,23 @@
- endif
- endif
- 
-+ABS_DIST := $(shell cd $(DIST) && pwd)
-+ifeq ($(OS_ARCH),WINNT)
-+ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g')
-+endif
-+NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS)))
-+ifneq (,$(strip $(NSPR_LIBDIR)))
-+NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR)))
-+else
-+NSPR_LIBDIR = $(ABS_DIST)/lib
-+endif
- # NSS makefiles are not safe for parallel execution.
- DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
- DEFAULT_GMAKE_FLAGS += CC="$(CC)"
--DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
--DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
--DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
-+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)"
-+DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
-+DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
-+DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR)
- DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
- DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
- ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
-Index: mozilla/security/nss/lib/ckfw/builtins/Makefile
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v
-retrieving revision 1.14
-diff -u -r1.14 Makefile
---- mozilla/security/nss/lib/ckfw/builtins/Makefile    20 Jan 2005 02:25:46 -0000      1.14
-+++ mozilla/security/nss/lib/ckfw/builtins/Makefile    11 Apr 2005 20:21:57 -0000
-@@ -53,23 +53,23 @@
- # This is merely an expedient hack and not the right solution.
- ifdef NS_USE_GCC
- EXTRA_LIBS += \
--      -L$(DIST)/lib \
-+      -L$(NSPR_LIBDIR) \
-       -lplc4 \
-       -lplds4 \
-       -lnspr4 \
-       $(NULL)
- else
- EXTRA_LIBS += \
--      $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
--      $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
-+      $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-+      $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
-       $(NULL)
- endif
- 
- else
- 
- EXTRA_LIBS += \
--      $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
--      $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+      $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-+      $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-       $(NULL)
- 
- endif
-Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v
-retrieving revision 1.18
-diff -u -r1.18 Makefile
---- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile  25 Apr 2004 15:03:08 -0000      1.18
-+++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile  11 Apr 2005 20:21:57 -0000
-@@ -63,7 +63,7 @@
-       $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
-       $(CRYPTO_LIB) \
-       $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
--      -L$(DIST)/lib \
-+      -L$(NSPR_LIBDIR) \
-       -lplc4 \
-       -lplds4 \
-       -lnspr4 \
-@@ -76,8 +76,8 @@
-       $(DIST)/lib/softokn.lib \
-       $(CRYPTO_LIB) \
-       $(DIST)/lib/secutil.lib \
--      $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
--      $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
-+      $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-+      $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
-       wsock32.lib \
-       winmm.lib \
-       $(NULL)
-@@ -98,8 +98,8 @@
-       $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
-       $(CRYPTO_LIB) \
-       $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
--      $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
--      $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-+      $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-+      $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-       $(NULL)
- 
- endif

diff --git a/mozilla-firefox-nss.patch b/mozilla-firefox-nss.patch
deleted file mode 100644 (file)
index b740331..0000000
--- a/mozilla-firefox-nss.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ur firefox.orig/config/config.mk firefox/config/config.mk
---- firefox.orig/config/config.mk      2004-06-05 02:26:13.000000000 +0200
-+++ firefox/config/config.mk   2004-06-16 09:42:32.000000000 +0200
-@@ -169,7 +169,7 @@
- 
- NSS_LIBS      = \
-       $(LIBS_DIR) \
--      $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-+      -lcrmf \
-       -lsmime3 \
-       -lssl3 \
-       -lnss3 \
-@@ -189,11 +189,6 @@
- endif
- 
- NSS_DEP_LIBS  = \
--      $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
--      $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
--      $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
--      $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
--      $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
-       $(NULL)
- 
- MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
-diff -ur firefox.orig/security/manager/Makefile.in firefox/security/manager/Makefile.in
---- firefox.orig/security/manager/Makefile.in  2004-03-23 05:15:56.000000000 +0100
-+++ firefox/security/manager/Makefile.in       2004-06-16 09:48:35.000000000 +0200
-@@ -148,43 +148,6 @@
- else
-       cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
- endif
--      $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
--      $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--      $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef DISABLE_DIST_GRE
--      $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
--      $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
--      $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
--      $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
--      $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
--      $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
--      $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
--      $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
--      $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
--      $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
--      $(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_MODULES
--      $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
--      $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
--      $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
--      $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
--endif
--endif
-       $(MAKE) -C boot $@
-       $(MAKE) -C ssl $@
- ifdef MOZ_XUL
-diff -ur firefox.orig/security/manager/ssl/src/Makefile.in firefox/security/manager/ssl/src/Makefile.in
---- firefox.orig/security/manager/ssl/src/Makefile.in  2004-01-07 14:36:51.000000000 +0100
-+++ firefox/security/manager/ssl/src/Makefile.in       2004-06-16 09:42:34.000000000 +0200
-@@ -116,7 +116,7 @@
- 
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
-+LOCAL_INCLUDES += -I/usr/include/nss \
-                   $(NULL)
- 
- EXTRA_DSO_LDOPTS += \