SOURCES (AC-branch): mozilla-thunderbird-nss.patch - updated for 1...

[mguevara]

Author: mguevara                     Date: Thu Mar  8 14:07:33 2007 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- updated for 1.5.0.10

---- Files affected:
SOURCES:
   mozilla-thunderbird-nss.patch (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: SOURCES/mozilla-thunderbird-nss.patch
diff -u SOURCES/mozilla-thunderbird-nss.patch:1.1 SOURCES/mozilla-thunderbird-nss.patch:1.1.2.1
--- SOURCES/mozilla-thunderbird-nss.patch:1.1	Thu May 13 11:50:28 2004
+++ SOURCES/mozilla-thunderbird-nss.patch	Thu Mar  8 15:07:27 2007
@@ -21,9 +21,20 @@
  	$(NULL)
  
  MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- mozilla/security/manager/Makefile.in~	Wed Apr 23 02:54:08 2003
-+++ mozilla/security/manager/Makefile.in	Thu May 15 10:25:59 2003
-@@ -116,43 +116,6 @@
+--- mozilla/security/manager/ssl/src/Makefile.in~	Fri Apr 11 02:56:20 2003
++++ mozilla/security/manager/ssl/src/Makefile.in	Thu May 15 10:27:52 2003
+@@ -114,7 +114,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 += \
+--- mozilla/security/manager/Makefile.in~	2006-12-19 23:07:37.000000000 +0100
++++ mozilla/security/manager/Makefile.in	2007-03-08 15:28:29.000000000 +0100
+@@ -215,87 +215,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
@@ -41,11 +52,33 @@
 -	$(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)
+-ifdef HAVE_FREEBL_LIBS
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(GRE_DIST)
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(GRE_DIST)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(GRE_DIST)
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(GRE_DIST)
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(GRE_DIST)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32INT64
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(GRE_DIST)
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(GRE_DIST)
+-endif
+-ifdef HAVE_FREEBL_LIBS_64
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(GRE_DIST)
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(GRE_DIST)
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(GRE_DIST)
 -endif
 -endif
 -ifndef _SKIP_OLD_GRE_INSTALL
@@ -57,24 +90,35 @@
 -	$(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
+-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
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
- ifdef MOZ_XUL
---- mozilla/security/manager/ssl/src/Makefile.in~	Fri Apr 11 02:56:20 2003
-+++ mozilla/security/manager/ssl/src/Makefile.in	Thu May 15 10:27:52 2003
-@@ -114,7 +114,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 += \
+ 	$(MAKE) -C locales $@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mozilla-thunderbird-nss.patch?r1=1.1&r2=1.1.2.1&f=u