[packages/chromium-browser] fix linking with harfbuzz-0.9.18; upstream patch

[glen]

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

    fix linking with harfbuzz-0.9.18; upstream patch

 chromium-browser.spec |  2 ++
 harfbuzz-icu.patch    | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 6216fd4..5ed0097 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -107,6 +107,7 @@ Patch26:	master-prefs-path.patch
 Patch28:	system-mesa.patch
 Patch31:	sync-session-name.patch
 Patch32:	nss.patch
+Patch33:	harfbuzz-icu.patch
 URL:		http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:	GConf2-devel}
 %{?with_system_mesa:BuildRequires:	Mesa-libGL-devel >= 9.1}
@@ -302,6 +303,7 @@ ln -s %{SOURCE7} .
 %patch26 -p2
 %patch31 -p0
 %patch32 -p2
+%patch33 -p2
 
 sh -x clean-source.sh \
 	%{!?with_nacl:nacl=0} \
diff --git a/harfbuzz-icu.patch b/harfbuzz-icu.patch
new file mode 100644
index 0000000..4395860
--- /dev/null
+++ b/harfbuzz-icu.patch
@@ -0,0 +1,44 @@
+issues with system harfbuzz-0.9.18
+https://groups.google.com/a/chromium.org/forum/#!topic/chromium-packagers/xULZMMsnolw
+
+--- trunk/src/build/linux/unbundle/harfbuzz.gyp	2013/06/05 21:37:20	204344
++++ trunk/src/build/linux/unbundle/harfbuzz.gyp	2013/06/05 21:40:43	204345
+@@ -3,24 +3,34 @@
+ # found in the LICENSE file.
+ 
+ {
++  'variables': {
++    # Check for presence of harfbuzz-icu library, use it if present.
++    'harfbuzz_libraries':
++        '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
++        '--code "int main() { return 0; }" '
++        '--run-linker '
++        '--on-success "harfbuzz harfbuzz-icu" '
++        '--on-failure "harfbuzz" '
++        '-- -lharfbuzz-icu)',
++  },
+   'targets': [
+     {
+       'target_name': 'harfbuzz-ng',
+       'type': 'none',
+       'cflags': [
+-        '<!@(pkg-config --cflags harfbuzz)',
++        '<!@(pkg-config --cflags <(harfbuzz_libraries))',
+       ],
+       'direct_dependent_settings': {
+         'cflags': [
+-          '<!@(pkg-config --cflags harfbuzz)',
++          '<!@(pkg-config --cflags <(harfbuzz_libraries))',
+         ],
+       },
+       'link_settings': {
+         'ldflags': [
+-          '<!@(pkg-config --libs-only-L --libs-only-other harfbuzz)',
++          '<!@(pkg-config --libs-only-L --libs-only-other <(harfbuzz_libraries))',
+         ],
+         'libraries': [
+-          '<!@(pkg-config --libs-only-l harfbuzz)',
++          '<!@(pkg-config --libs-only-l <(harfbuzz_libraries))',
+         ],
+       },
+     },
================================================================

---- gitweb:

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