[packages/chromium-browser] - fix build with nss 3.15.x - updated harfbuz BR - TODO: fix hafrbuzz-icu linking

[baggins]

commit 7ebeabb66f4c6554e0b142c1bd677a39ef1e9cbb
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jul 15 12:28:51 2013 +0200

    - fix build with nss 3.15.x
    - updated harfbuz BR
    - TODO: fix hafrbuzz-icu linking

 chromium-browser.spec |  5 ++++-
 nss.patch             | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 00589a2..4a7e238 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -106,6 +106,7 @@ Patch25:	gnome3-volume-control.patch
 Patch26:	master-prefs-path.patch
 Patch28:	system-mesa.patch
 Patch31:	sync-session-name.patch
+Patch32:	nss.patch
 URL:		http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:	GConf2-devel}
 %{?with_system_mesa:BuildRequires:	Mesa-libGL-devel >= 9.1}
@@ -132,6 +133,7 @@ BuildRequires:	gperf
 BuildRequires:	gtest-devel
 BuildRequires:	gtk+2-devel
 %{?with_system_harfbuzz:BuildRequires:	harfbuzz-devel}
+%{?with_system_harfbuzz:BuildRequires:	harfbuzz-icu-devel}
 %{?with_kerberos:BuildRequires:	heimdal-devel}
 BuildRequires:	hicolor-icon-theme
 %{?with_system_jsoncpp:BuildRequires:	jsoncpp-devel}
@@ -214,7 +216,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		google_default_client_id 724288223830.apps.googleusercontent.com
 %define		google_default_client_secret rHmKOPygcI6G-clFHb-RfuHb
 
-%define		find_lang 	sh find-lang.sh %{buildroot}
+%define		find_lang	sh find-lang.sh %{buildroot}
 
 # Usage: gyp_with BCOND_NAME [OPTION_NAME]
 %define		gyp_with() %{expand:%%{?with_%{1}:-D%{?2:use_%{2}}%{!?2:use_%{1}}=1}%%{!?with_%{1}:-D%{?2:use_%{2}}%{!?2:use_%{1}}=0}}
@@ -299,6 +301,7 @@ ln -s %{SOURCE7} .
 %patch24 -p2
 %patch26 -p2
 %patch31 -p0
+%patch32 -p1
 
 sh -x clean-source.sh \
 	%{!?with_nacl:nacl=0} \
diff --git a/nss.patch b/nss.patch
new file mode 100644
index 0000000..8bcad85
--- /dev/null
+++ b/nss.patch
@@ -0,0 +1,18 @@
+--- /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 @@
+ #include "secerr.h"
+ #include "secport.h"
+ 
++/*
+ typedef struct SECItemArrayStr SECItemArray;
+ 
+ struct SECItemArrayStr {
+     SECItem *items;
+     unsigned int len;
+ };
+-
++*/
+ SECItemArray *
+ SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)
+ {
================================================================

---- gitweb:

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