- updated for 3.5b4

Changed files:
    mozilla-firefox-nss_cflags.patch -> 1.1.2.1

diff --git a/mozilla-firefox-nss_cflags.patch b/mozilla-firefox-nss_cflags.patch
index 90d01543ae6f2f946f9e17742375befab1497a8b..de2d00acf721a80cebce056e389f26e938406b67 100644 (file)
--- a/mozilla-firefox-nss_cflags.patch
+++ b/mozilla-firefox-nss_cflags.patch
@@ -1,42 +1,46 @@
---- 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 @@
+diff -ur mozilla-1.9.1/config/autoconf.mk.in mozilla-1.9.1.new/config/autoconf.mk.in
+--- mozilla-1.9.1/config/autoconf.mk.in        2009-04-24 03:46:37.000000000 +0200
++++ mozilla-1.9.1.new/config/autoconf.mk.in    2009-06-05 15:08:17.083806835 +0200
+@@ -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 @@
+Tylko w mozilla-1.9.1.new/config: autoconf.mk.in~
+diff -ur mozilla-1.9.1/config/rules.mk mozilla-1.9.1.new/config/rules.mk
+--- mozilla-1.9.1/config/rules.mk      2009-04-24 03:46:37.000000000 +0200
++++ mozilla-1.9.1.new/config/rules.mk  2009-06-05 15:09:27.531343726 +0200
+@@ -1364,23 +1364,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)
+Tylko w mozilla-1.9.1.new/config: rules.mk~