[packages/chromium-browser] update nss patch from upstream

[glen]

commit f099161f7b9994d8aa9be5a92525b6c5665c36e8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jul 15 13:57:18 2013 +0300

    update nss patch from upstream

 chromium-browser.spec |  4 ++--
 nss.patch             | 28 ++++++++++++++++++++--------
 2 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 4a7e238..6216fd4 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -170,9 +170,9 @@ BuildRequires:	python
 BuildRequires:	python-modules
 BuildRequires:	python-ply
 %{?with_system_re2:BuildRequires:	re2-devel >= 20130115-2}
-%{?with_system_snappy:BuildRequires:	snappy-devel}
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.453
+%{?with_system_snappy:BuildRequires:	snappy-devel}
 BuildRequires:	speech-dispatcher-devel >= 0.8
 %{?with_system_speex:BuildRequires:	speex-devel >= 1:1.2-rc1}
 %{?with_system_sqlite:BuildRequires:	sqlite3-devel >= 3.7}
@@ -301,7 +301,7 @@ ln -s %{SOURCE7} .
 %patch24 -p2
 %patch26 -p2
 %patch31 -p0
-%patch32 -p1
+%patch32 -p2
 
 sh -x clean-source.sh \
 	%{!?with_nacl:nacl=0} \
diff --git a/nss.patch b/nss.patch
index 8bcad85..5e36cc3 100644
--- a/nss.patch
+++ b/nss.patch
@@ -1,18 +1,30 @@
---- /home/users/baggins/rpm/BUILD/chromium-browser-28.0.1500.52/net/third_party/nss/ssl/bodge/secitem_array.c~	2013-06-12 09:28:13.000000000 +0200
-+++ /home/users/baggins/rpm/BUILD/chromium-browser-28.0.1500.52/net/third_party/nss/ssl/bodge/secitem_array.c	2013-07-15 11:05:45.089057968 +0200
-@@ -11,13 +11,14 @@
+Linux: fix compatibility with nss-3.15.
+
+https://groups.google.com/a/chromium.org/forum/#!topic/chromium-packagers/Jwz20yLB_7E
+https://src.chromium.org/viewvc/chrome?revision=206184&view=revision
+--- trunk/src/net/third_party/nss/ssl/bodge/secitem_array.c	2013/06/13 22:43:39	206183
++++ trunk/src/net/third_party/nss/ssl/bodge/secitem_array.c	2013/06/13 22:44:52	206184
+@@ -6,6 +6,7 @@
+  * Support routines for SECItemArray data structure.
+  */
+ 
++#include "nssutil.h"
+ #include "seccomon.h"
+ #include "secitem.h"
  #include "secerr.h"
- #include "secport.h"
+@@ -13,10 +14,15 @@
  
-+/*
  typedef struct SECItemArrayStr SECItemArray;
  
++#define NSSUTIL_VERSION_NUM \
++    (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH)
++#if NSSUTIL_VERSION_NUM < 31500
++// Added in NSS 3.15.
  struct SECItemArrayStr {
      SECItem *items;
      unsigned int len;
  };
--
-+*/
++#endif
+ 
  SECItemArray *
  SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)
- {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/7a1e74db1b5e34d8341ea5d70a3c6d31a2f08d78