diff options
Diffstat (limited to 'deskutils/lightning/files/patch-sysnss')
| -rw-r--r-- | deskutils/lightning/files/patch-sysnss | 217 |
1 files changed, 0 insertions, 217 deletions
diff --git a/deskutils/lightning/files/patch-sysnss b/deskutils/lightning/files/patch-sysnss deleted file mode 100644 index a095158255ce..000000000000 --- a/deskutils/lightning/files/patch-sysnss +++ /dev/null @@ -1,217 +0,0 @@ ---- mozilla/security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 -+++ mozilla/security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 -@@ -124,19 +124,19 @@ - pipboot \ - $(NULL) - --EXTRA_DEPS = $(NSS_DEP_LIBS) - - DEFINES += -DNSS_ENABLE_ECC - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk ---- mozilla/security/manager/Makefile.in.orig 2009-12-03 08:19:28.000000000 +0100 -+++ mozilla/security/manager/Makefile.in 2009-12-05 16:08:10.000000000 +0100 -@@ -45,17 +45,6 @@ - - MODULE = psm - --ifndef MOZ_NATIVE_NSS --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) --endif -- --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifndef NSS_DISABLE_DBM - NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) - NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk -@@ -255,13 +244,6 @@ - - .nss.cleaned: .nss.checkout - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif -- touch $@ - endif - - GARBAGE += .nss.cleaned -@@ -280,78 +262,6 @@ - endif - - libs:: --ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) --ifndef NSS_DISABLE_DBM -- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) --endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifdef ENABLE_TESTS -- # Need certutil binary for mochitest certificates generation -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) --endif --ifndef SKIP_CHK --ifndef ENABLE_TESTS # Just avoid secondary compile -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) --endif -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif -- $(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 --ifndef NSS_DISABLE_DBM --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif --endif --ifndef MOZ_NATIVE_NSS --# NSS installs headers to dist/public and we want them in dist/include -- $(NSINSTALL) -D $(DIST)/include/nss -- (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ -- (cd $(DIST)/include/nss && tar -xf -) -- (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ -- (cd $(DIST)/sdk/include && tar -xf -) --endif -- $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ - ifdef MOZ_XUL -@@ -362,50 +272,6 @@ - $(MAKE) -C ssl $@ - - install:: --ifndef MOZ_NATIVE_NSS -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif --endif -- $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ - ifdef MOZ_XUL -@@ -420,12 +286,6 @@ - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - endif - - echo-requires-recursive:: ---- mozilla/toolkit/mozapps/update/src/updater/Makefile.in.orig 2009-12-03 08:19:47.000000000 +0100 -+++ mozilla/toolkit/mozapps/update/src/updater/Makefile.in 2009-12-05 16:10:00.000000000 +0100 -@@ -55,12 +55,11 @@ - - REQUIRES = \ - libmar \ -- $(BZ2_REQUIRES) \ - $(NULL) - - LIBS += \ - $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ -- $(BZ2_LIBS) \ -+ %%LIB_BZ2%% \ - $(NULL) - - ifeq ($(OS_ARCH),WINNT) |