packages: iceweasel/iceweasel-nss_cflags.patch - updated to 3.5 (merged fro...

[paszczus]

Author: paszczus                     Date: Tue Jun 30 13:41:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.5 (merged from DEVEL)

---- Files affected:
packages/iceweasel:
   iceweasel-nss_cflags.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-nss_cflags.patch
diff -u packages/iceweasel/iceweasel-nss_cflags.patch:1.1 packages/iceweasel/iceweasel-nss_cflags.patch:1.2
--- packages/iceweasel/iceweasel-nss_cflags.patch:1.1	Mon Jun 23 12:18:20 2008
+++ packages/iceweasel/iceweasel-nss_cflags.patch	Tue Jun 30 15:41:49 2009
@@ -1,42 +1,42 @@
 --- mozilla/config/autoconf.mk.in.orig	2008-06-19 17:55:40.000000000 +0200
 +++ mozilla/config/autoconf.mk.in	2008-06-19 18:45:18.000000000 +0200
-@@ -276,7 +276,7 @@
+@@ -280,7 +280,7 @@
  OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
  OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
  
--OS_INCLUDES	= $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
-+OS_INCLUDES	= $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
+-OS_INCLUDES	= $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
++OS_INCLUDES	= $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
  OS_LIBS		= @LIBS@
  ACDEFINES	= @MOZ_DEFINES@
  
 --- mozilla/config/rules.mk.orig	2008-06-19 18:45:00.000000000 +0200
 +++ mozilla/config/rules.mk	2008-06-19 18:42:40.000000000 +0200
-@@ -1235,23 +1235,23 @@
+@@ -1365,23 +1365,23 @@
  # Rules for building native targets must come first because of the host_ prefix
- host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.c $(GLOBAL_DEPS)
  	$(REPORT_BUILD)
 -	$(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +	$(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- host_%.$(OBJ_SUFFIX): %.cpp Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.cpp $(GLOBAL_DEPS)
  	$(REPORT_BUILD)
 -	$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +	$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- host_%.$(OBJ_SUFFIX): %.cc Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.cc $(GLOBAL_DEPS)
  	$(REPORT_BUILD)
 -	$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +	$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- host_%.$(OBJ_SUFFIX): %.m Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.m $(GLOBAL_DEPS)
  	$(REPORT_BUILD)
 -	$(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +	$(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- host_%.$(OBJ_SUFFIX): %.mm Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.mm $(GLOBAL_DEPS)
  	$(REPORT_BUILD)
 -	$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +	$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- %: %.c Makefile Makefile.in
+ %: %.c $(GLOBAL_DEPS)
  	$(REPORT_BUILD)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-nss_cflags.patch?r1=1.1&r2=1.2&f=u