- up to 14.0.796.0-0.89573

Changed files:
    chromium-browser-tcmalloc.patch -> 1.2
    chromium-browser.spec -> 1.119
    chromium_useragent.patch.in -> 1.3

diff --git a/chromium-browser-tcmalloc.patch b/chromium-browser-tcmalloc.patch
index a1eab30ac9a619916345d431d31d0bf5e5b06868..05f9e7a0867c9548fa8028d56e3f81de14e4babc 100644 (file)
--- a/chromium-browser-tcmalloc.patch
+++ b/chromium-browser-tcmalloc.patch
@@ -32,6 +32,6 @@
  }
 -void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
 +void *(* volatile __memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
- #endif  // #ifndef TCMALLOC_FOR_DEBUGALLOCATION
+ #endif  // TCMALLOC_USING_DEBUGALLOCATION
  
  // ---Double free() debugging implementation -----------------------------------

diff --git a/chromium-browser.spec b/chromium-browser.spec
index bf15162a0a0908540f02041d29886e356e114b2f..26dd37a0a9ee0a870a7c6d28bb892b27dae0b32d 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -29,18 +29,18 @@
 # or:
 # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf
 
-%define                svndate 20110609
-%define                svnver  88472
+%define                svndate 20110617
+%define                svnver  89573
 %define                rel     1
 
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
-Version:       14.0.788.0
+Version:       14.0.796.0
 Release:       0.%{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: 3c65b307ffd1ffea36f27b3fb7be5a71
+# Source0-md5: 1aa753bd81120eaaf75012f32bc5c408
 Source2:       %{name}.sh
 Source3:       %{name}.desktop
 Source4:       find-lang.sh

diff --git a/chromium_useragent.patch.in b/chromium_useragent.patch.in
index 5a09c844f8839e3be2ef6236fade4e2c18502e13..9bb7f28687a024f2ba69d18e5ff5ac3158905b53 100644 (file)
--- a/chromium_useragent.patch.in
+++ b/chromium_useragent.patch.in
@@ -12,12 +12,12 @@
 +
    // Derived from Safari's UA string.
    base::StringAppendF(
-       result,
+       &user_agent,
        "Mozilla/5.0 (%s%s) AppleWebKit/%d.%d"
 -      " (KHTML, like Gecko) %s Safari/%d.%d",
 +      " (KHTML, like Gecko) @BUILD_DIST_NAME@/@BUILD_DIST_VERSION@ %s %s Safari/%d.%d",
        mimic_windows ? "Windows " : kUserAgentPlatform,
-       BuildOSCpuInfo().c_str(),
+       webkit_glue::BuildOSCpuInfo().c_str(),
        WEBKIT_VERSION_MAJOR,
        WEBKIT_VERSION_MINOR,
 +      realproduct.c_str(),