pnacl fix from gentoo

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 2ff494d9263a7b06cf0585ce8576556672e0e99f..157b05dda079e2c2cbb232f8dbe1b51151c17237 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -48,7 +48,6 @@
 # - use_system_ssl (use_openssl: http://crbug.com/62803)
 # - use_system_stlport (android specific)
 # - vpx: invert (remove) media_use_libvpx when libvpx with vp9 support is released
-# - nacl. watch https://code.google.com/p/chromium/issues/detail?id=224169
 
 # NOTES:
 # - mute BEEP mixer if you do not want to hear horrible system bell when
@@ -70,7 +69,7 @@ Version:      %{branch}.%{patchver}
 %else
 Version:       %{branch}.%{basever}
 %endif
-Release:       0.4
+Release:       0.6
 License:       BSD, LGPL v2+ (ffmpeg)
 Group:         X11/Applications/Networking
 Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/dev/%{name}-%{branch}.%{basever}.tar.gz
@@ -106,6 +105,7 @@ Patch25:    gnome3-volume-control.patch
 Patch26:       master-prefs-path.patch
 Patch28:       system-mesa.patch
 Patch29:       speechd-0.8.patch
+Patch30:       no-pnacl.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 %{?with_system_mesa:BuildRequires:     Mesa-libGL-devel >= 9.1}
@@ -286,6 +286,7 @@ ln -s %{SOURCE7} .
 %patch24 -p2
 %patch26 -p2
 %patch29 -p2
+%patch30 -p0
 
 sh -x clean-source.sh \
        %{!?with_nacl:nacl=0} \

diff --git a/no-pnacl.patch b/no-pnacl.patch
new file mode 100644 (file)
index 0000000..8ec0151
--- /dev/null
+++ b/no-pnacl.patch
@@ -0,0 +1,11 @@
+--- ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp.orig 2013-03-27 19:49:17.000000000 +0100
++++ ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp      2013-03-27 19:49:59.000000000 +0100
+@@ -13,7 +13,7 @@
+     'target_name': 'pnacl_support_extension',
+     'type': 'none',
+     'conditions': [
+-      ['disable_nacl==0 and disable_nacl_untrusted==0', {
++      ['disable_nacl==0 and disable_pnacl==0 and disable_nacl_untrusted==0', {
+         'dependencies': [
+           '../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
+           '../../../../../native_client/tools.gyp:prep_toolchain',