From e7b1dfdc393eb6a94b8486ed2981948ffc5f5c09 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 26 Apr 2013 08:04:37 +0200
Subject: [PATCH] chromium: Update beta and dev channels to latest.

This updates the channels to the following new versions:

beta: 27.0.1453.47 -> 27.0.1453.65 (builds fine, tested)
dev:  27.0.1453.47 -> 28.0.1485.0  (builds fine, tested)

As we now don't have any version below 26, this update drops all references to
all older versions as well.

In addition to that, the /usr/bin/gcc reference from:

third_party/WebKit/Source/core/core.gyp/core.gyp

Can now - starting at version 28 - be found in:

third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix  | 27 +++++++------------
 .../networking/browsers/chromium/sources.nix  | 12 ++++-----
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index a4f71ffcb25..682de909067 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -13,13 +13,7 @@
 , gcc, bison, gperf
 , glib, gtk, dbus_glib
 , libXScrnSaver, libXcursor, mesa
-, protobuf
-
-# dependencies for v25 only
-, libvpx
-
-# dependencies for >= v26
-, speechd, libXdamage
+, protobuf, speechd, libXdamage
 
 # dependencies for >= v27
 , libXtst
@@ -69,7 +63,7 @@ let
     use_system_xdg_utils = true;
     use_system_yasm = true;
     use_system_zlib = false; # http://crbug.com/143623
-    use_system_protobuf = post25;
+    use_system_protobuf = true;
 
     use_system_harfbuzz = false;
     use_system_icu = false;
@@ -77,9 +71,6 @@ let
     use_system_skia = false;
     use_system_sqlite = false; # http://crbug.com/22208
     use_system_v8 = false;
-  } // optionalAttrs pre26 {
-    use_system_libvpx = true;
-    use_system_protobuf = true;
   };
 
   defaultDependencies = [
@@ -90,10 +81,10 @@ let
     libusb1 libexif
   ];
 
-  pre26 = versionOlder sourceInfo.version "26.0.0.0";
   pre27 = versionOlder sourceInfo.version "27.0.0.0";
-  post25 = !pre26;
+  pre28 = versionOlder sourceInfo.version "28.0.0.0";
   post26 = !pre27;
+  post27 = !pre28;
 
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
@@ -116,14 +107,12 @@ in stdenv.mkDerivation rec {
     krb5
     glib gtk dbus_glib
     libXScrnSaver libXcursor mesa
-    pciutils protobuf
+    pciutils protobuf speechd libXdamage
   ] ++ optional gnomeKeyringSupport libgnome_keyring
     ++ optionals gnomeSupport [ gconf libgcrypt ]
     ++ optional enableSELinux libselinux
     ++ optional cupsSupport libgcrypt
     ++ optional pulseSupport pulseaudio
-    ++ optional pre26 libvpx
-    ++ optionals post25 [ speechd libXdamage ]
     ++ optional post26 libXtst;
 
   opensslPatches = optional useOpenSSL openssl.patches;
@@ -138,9 +127,11 @@ in stdenv.mkDerivation rec {
     sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
   '' + optionalString useOpenSSL ''
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
-  '' + optionalString post25 ''
+  '' + ''
     sed -i -e 's|/usr/bin/gcc|gcc|' \
-      third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
+      third_party/WebKit/Source/${if post27
+                                  then "core/core.gyp/core.gyp"
+                                  else "WebCore/WebCore.gyp/WebCore.gyp"}
   '';
 
   gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix
index b1f145bbbe8..0e041ee9518 100644
--- a/pkgs/applications/networking/browsers/chromium/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/sources.nix
@@ -1,14 +1,14 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "27.0.1453.47";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
-    sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
+    version = "28.0.1485.0";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0.tar.xz";
+    sha256 = "04whky5bwsj909cc1ycwrc91d04iynwncwh21cbbbvg93jsj2pq9";
   };
   beta = {
-    version = "27.0.1453.47";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
-    sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
+    version = "27.0.1453.65";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.65.tar.xz";
+    sha256 = "1flv9870p0bqglnbm4gfzbxzcvz30k2chxgnlbqgpfk5c4qq9mpb";
   };
   stable = {
     version = "26.0.1410.63";