- up to 10.0.611.0, r69095

Changed files:
    chromium-browser.spec -> 1.90
    gcc45.patch -> 1.2

diff --git a/chromium-browser.spec b/chromium-browser.spec
index d4a22976a755842df39722c5dbeaf769bb7ef88b..a3ec09fc51337f441c9793fc2fb7a9d3f42c65a0 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -21,18 +21,18 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define                svndate 20101202
-%define                svnver  67949
+%define                svndate 20101214
+%define                svnver  69095
 %define                rel     1
 
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
-Version:       9.0.600.0
+Version:       10.0.611.0
 Release:       %{svnver}.%{rel}
 License:       BSD, LGPL v2+ (ffmpeg)
 Group:         X11/Applications/Networking
 Source0:       http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
-# Source0-md5: 44c92370a2e47f76ca56eaf94f4ef573
+# Source0-md5: d91fca61b2c2300643e773bd31d813cb
 Source2:       %{name}.sh
 Source3:       %{name}.desktop
 Source4:       find-lang.sh
@@ -44,7 +44,6 @@ Patch3:               disable_dlog_and_dcheck_in_release_builds.patch.diff
 # http://aur.archlinux.org/packages/chromium-browser-svn/chromium-browser-svn/search-workaround.patch
 Patch4:                search-workaround.patch
 Patch5:                options-support.patch
-Patch6:                gcc45.patch
 Patch7:                chromium-system-vpx.patch
 URL:           http://code.google.com/chromium/
 BuildRequires: GConf2-devel
@@ -166,7 +165,6 @@ sed -e 's,@localedir@,%{_libdir}/%{name},' %{SOURCE4} > find-lang.sh
 %patch3 -p0
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 cd src
 %patch7 -p0
 cd ..

diff --git a/gcc45.patch b/gcc45.patch
deleted file mode 100644 (file)
index e8d27b8..0000000
--- a/gcc45.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromium-browser-6.0.464.0~svn20100713r52155/src/base/watchdog_unittest.cc~        2010-06-03 05:04:36.000000000 +0300
-+++ chromium-browser-6.0.464.0~svn20100713r52155/src/base/watchdog_unittest.cc 2010-07-13 12:41:18.035417689 +0300
-@@ -83,7 +83,7 @@
- 
- // Make sure a basic alarm fires when the time has expired.
- TEST_F(WatchdogTest, AlarmPriorTimeTest) {
--  WatchdogCounter watchdog(TimeDelta::TimeDelta(), "Enabled2", true);
-+  WatchdogCounter watchdog(TimeDelta(), "Enabled2", true);
-   // Set a time in the past.
-   watchdog.ArmSomeTimeDeltaAgo(TimeDelta::FromSeconds(2));
-   // It should instantly go off, but certainly in less than 5 minutes.