From c8a56c66321495f6bd0460b234acde9d23bb8c41 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 16 Jan 2014 21:55:06 +0000
Subject: [PATCH] extra/chromium fixes

---
 extra/chromium/PKGBUILD             | 15 +++++++++------
 extra/chromium/arm-webrtc-fix.patch |  8 +++-----
 extra/chromium/skia.patch           | 10 +++++-----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD
index 51af73e4f..db2d1581b 100644
--- a/extra/chromium/PKGBUILD
+++ b/extra/chromium/PKGBUILD
@@ -13,6 +13,8 @@
 #  - adjusted gyp flags for v7h
 #  - patch to fix webrtc code for non-android ARM
 #  - patch (hack) to fix skia
+#  - use system protobuf
+#  - makeflags to -j3, seems to barf higher
 #
 #        moonman <moonman [dot] ca [at] gmail [dot] com>
 #  -added armv6 support
@@ -30,7 +32,7 @@ license=('BSD')
 depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'icu'
          'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'opus' 'snappy'
          'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'harfbuzz-icu'
-         'desktop-file-utils' 'hicolor-icon-theme')
+         'desktop-file-utils' 'hicolor-icon-theme' 'protobuf')
 makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
              'elfutils' 'subversion')
 optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
@@ -46,13 +48,13 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
         arm-webrtc-fix.patch
         skia.patch
         v6-ffmpeg.patch)
-sha256sums=('7f0a37391b2829fa077426127f61b830cca51518e6a55ace2bf397aba9e52008'
+sha256sums=('4aad8c69dd575f76b8490142f55f8a620fbdd5567e54d3510ae6243358a08d1e'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
             '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
             '3b167d9480a6472c60ad9493f9a92b0cf79785a029bd0e886ab275f923b510df'
-            '222ec0db5d40b02e4ebbde8a1f1c5de3f0579e51836be87be138c44f8487d0ce'
-            '77668a94924c6bce6c48ca78c5cb778c6728bb687b66334b7164d7301a267939'
+            '9db0f01517c52e3236ff52e8a664840542a19144a54923ae6aabea3dcfa92c52'
+            '0567b09b91c13389d430630a8dfcda06d5f1a12d6b07f0b48dd418d2543a28d8'
             '3fbabcbd512494b529e0a0e17560735887acf2291a74653750f9b29f5d45774d')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -68,14 +70,14 @@ prepare() {
   cd "$srcdir/$pkgname-$_srcver"
 
   # Fix WebRTC for ARM
-  patch -Np2 -i "$srcdir/arm-webrtc-fix.patch"
+  patch -Np0 -i "$srcdir/arm-webrtc-fix.patch"
 
   # Fix ffmpeg build for armv6
   [ "$CARCH" == "armv6h" ] && patch -Np1 -i "$srcdir/v6-ffmpeg.patch"
 
   # Temp fix for skia
   patch -Np0 -i "$srcdir/skia.patch"
-
+MAKEFLAGS=-j3
   # Source tarball for 32.0.1700.77 is currently missing so we might as well
   # patch 32.0.1700.76 with the single change before 32.0.1700.77 was tagged
   patch -Np1 -i "$srcdir/chromium-32.0.1700.76-diff-to-32.0.1700.77.patch"
@@ -137,6 +139,7 @@ fi
     -Dproprietary_codecs=1
     -Duse_system_bzip2=1
     -Duse_system_flac=1
+    -Duse_system_protobuf=1
     -Duse_system_ffmpeg=0
     -Duse_system_harfbuzz=1
     -Duse_system_icu=1
diff --git a/extra/chromium/arm-webrtc-fix.patch b/extra/chromium/arm-webrtc-fix.patch
index 757b5c52d..e5d237d98 100644
--- a/extra/chromium/arm-webrtc-fix.patch
+++ b/extra/chromium/arm-webrtc-fix.patch
@@ -1,10 +1,8 @@
-Index: b/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
-===================================================================
---- a/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
-+++ b/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
+--- third_party/webrtc/system_wrappers/source/cpu_features.cc.orig	2014-01-15 18:38:50.331954791 -0700
++++ third_party/webrtc/system_wrappers/source/cpu_features.cc	2014-01-15 18:38:37.902004379 -0700
 @@ -18,6 +18,47 @@
  
- #include "typedefs.h"
+ #include "webrtc/typedefs.h"
  
 +#include <elf.h>
 +#ifdef __arm__
diff --git a/extra/chromium/skia.patch b/extra/chromium/skia.patch
index 6878c6660..2a8226b08 100644
--- a/extra/chromium/skia.patch
+++ b/extra/chromium/skia.patch
@@ -1,10 +1,10 @@
---- skia/skia_library_opts.gyp.orig	2013-10-02 17:58:46.454702283 -0600
-+++ skia/skia_library_opts.gyp	2013-10-02 17:58:17.649830405 -0600
-@@ -110,6 +110,7 @@
+--- skia/skia_library_opts.gyp.orig	2014-01-15 18:36:06.947606588 -0700
++++ skia/skia_library_opts.gyp	2014-01-15 18:38:07.942123899 -0700
+@@ -117,6 +117,7 @@
              '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
              '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
              '../third_party/skia/src/opts/opts_check_arm.cpp',
 +            '../third_party/skia/src/opts/memset.arm.S',
+             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
+             '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
            ],
-         }],
-         [ 'target_arch == "mipsel"',{