nss: no need to care about STLPort include paths

Change-Id: Ibbee91f8ce21f76bc4a5e66ff9c5852dc693793b

nss/nss.patch

---- misc/nss-3.12.8/mozilla/nsprpub/config/rules.mk	2009-12-09 22:24:37.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/nsprpub/config/rules.mk	2010-06-11 16:35:54.946870871 +0200
-@@ -345,7 +345,12 @@
- ifdef NS_USE_GCC
- 	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
- else
--	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+        #We remove stl from the paths to avoid that rc.exe finds the stlport of
-+        #OOo. stlport includes the system stl which will fail. By removing it,
-+        #rc will use the stl from the system if the path is in the INCLUDE
-+        #variable.
-+	INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+
- endif # GCC
- 	@echo $(RES) finished
- endif
 --- misc/nss-3.12.8/mozilla/nsprpub/configure	2010-02-08 19:41:35.000000000 +0100
 +++ misc/build/nss-3.12.8/mozilla/nsprpub/configure	2010-06-11 16:35:54.960188991 +0200
 @@ -3900,7 +3900,7 @@
@@ -114,22 +98,6 @@
  
  ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  ifndef BUILD_OPT
---- misc/nss-3.12.8/mozilla/security/coreconf/rules.mk	2009-12-08 02:33:36.000000000 +0100
-+++ misc/build/nss-3.12.8/mozilla/security/coreconf/rules.mk	2010-06-11 16:35:54.996448704 +0200
-@@ -355,7 +355,12 @@
- ifdef NS_USE_GCC
- 	$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
- else
--	$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+        #We remove stl from the paths to avoid that rc.exe finds the stlport of
-+        #OOo. stlport includes the system stl which will fail. By removing it,
-+        #rc will use the stl from the system if the path is in the INCLUDE
-+        #variable.
-+	INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+
- endif
- 	@echo $(RES) finished
- endif
 --- misc/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk	2010-02-04 19:59:10.000000000 +0100
 +++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk	2010-06-11 16:35:55.004869805 +0200
 @@ -41,27 +41,28 @@