From c9b6036ee9fa3b7d8061c19dd1a8ea2cb7452231 Mon Sep 17 00:00:00 2001
From: Yucatan Costa <jedi.kenjiro@gmail.com>
Date: Sat, 19 Nov 2011 01:27:05 -0600
Subject: [PATCH] network/chromium: Updated for version 15.0.874.120.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>
---
 network/chromium/chromium.SlackBuild | 17 ++++++++++++-----
 network/chromium/chromium.info       |  8 ++++----
 network/chromium/doinst.sh           |  2 --
 network/chromium/nacl.patch          | 11 +++++++++++
 4 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 network/chromium/nacl.patch

diff --git a/network/chromium/chromium.SlackBuild b/network/chromium/chromium.SlackBuild
index 8d0fed5fcc..69193f4853 100644
--- a/network/chromium/chromium.SlackBuild
+++ b/network/chromium/chromium.SlackBuild
@@ -11,7 +11,8 @@
 # A very special thanks to Gino Bombino (ginolovesyou AT gmail DOT com), who
 # contributed with the parameters to disable the need for gnome dependencies
 # and PAM, allowing the script to be cleaner and more elegant (no need for a
-# a patch to disable PAM).
+# a patch to disable PAM). And another special thanks to dive who handed me
+# the nacl.patch, fixing another compile problem.
 #
 # Copyright 2010  Yucatan "Kenjiro" Costa, Alegrete, RS, Brasil
 # All rights reserved.
@@ -34,11 +35,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=chromium
-VERSION=${VERSION:-11.0.696.60}
+VERSION=${VERSION:-15.0.874.106}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -66,7 +66,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -e # Exit on most errors
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -81,7 +81,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Let's try this nacl patch (thanks to dive):
+patch -p1 < $CWD/nacl.patch
+
 # Configure it before compiling
+
+#
 # Change "-Dproprietary_codecs" to "0" if you don't want to use proprietary codecs
 #
 
@@ -110,10 +115,12 @@ build/gyp_chromium --depth=. \
  -Ddisable_sse2=${NO_SSE2:-0} \
  -Dffmpeg_branding=Chrome \
  -Duse_system_ffmpeg=0 \
+ -Ddisable_nacl=1 \
+ -Duse_kerberos=0 \
  -Duse_system_ssl=0
 
-
 # Compiling...
+#
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -fno-ipa-cp" \
 make chrome chrome_sandbox BUILDTYPE=Release || exit 1
diff --git a/network/chromium/chromium.info b/network/chromium/chromium.info
index 5db1f48209..f71b442358 100644
--- a/network/chromium/chromium.info
+++ b/network/chromium/chromium.info
@@ -1,10 +1,10 @@
 PRGNAM="chromium"
-VERSION="11.0.696.60"
+VERSION="15.0.874.120"
 HOMEPAGE="http://www.chromium.org/"
-DOWNLOAD="http://build.chromium.org/buildbot/official/chromium-11.0.696.60.tar.bz2"
-MD5SUM="1be655872e8a062d2532b977b333cac3"
+DOWNLOAD="http://gsdview.appspot.com/chromium-browser-official/chromium-15.0.874.120.tar.bz2"
+MD5SUM="c26033f1ebecf0d98930046da69c8e2b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Yucatan Costa"
 EMAIL="jedi.kenjiro@gmail.com"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"
diff --git a/network/chromium/doinst.sh b/network/chromium/doinst.sh
index f8f852bc2b..5fb28930db 100644
--- a/network/chromium/doinst.sh
+++ b/network/chromium/doinst.sh
@@ -1,5 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
-
diff --git a/network/chromium/nacl.patch b/network/chromium/nacl.patch
new file mode 100644
index 0000000000..7d0bba7d03
--- /dev/null
+++ b/network/chromium/nacl.patch
@@ -0,0 +1,11 @@
+diff -Naur a/chrome/chrome.gyp b/chrome/chrome.gyp
+--- a/chrome/chrome.gyp	2011-07-30 09:36:14.000000000 +0100
++++ b/chrome/chrome.gyp	2011-09-07 16:52:20.000000000 +0100
+@@ -134,7 +134,6 @@
+     'chrome_renderer.gypi',
+     'chrome_tests.gypi',
+     'common_constants.gypi',
+-    'nacl.gypi',
+   ],
+   'targets': [
+     {