- beta channel; up to 18.0.1025.11

Changed files:
    chromium-browser.spec -> 1.178
    chromium-revert-jpeg-swizzle-r0.patch -> 1.2
    chromium-revert-jpeg-swizzle-r2.patch -> 1.1
    dlopen-sonames.patch -> 1.2
    gyp-system-minizip.patch -> 1.4
    system-libs.patch -> 1.11

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 88d380560b1a83b09435b6f6f9673f08b9a37b23..9480a4c4012813d8d088cb67762d0c69072b573a 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -49,12 +49,12 @@
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
-Version:       17.0.963.46
-Release:       2
+Version:       18.0.1025.11
+Release:       1
 License:       BSD, LGPL v2+ (ffmpeg)
 Group:         X11/Applications/Networking
 Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz
-# Source0-md5: 2799babdc6837530775219ff8a1b322b
+# Source0-md5: 0bde819c093c1de4b76955608dcccc00
 #SourceX:      http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
 Source2:       %{name}.sh
 Source3:       %{name}.desktop
@@ -71,11 +71,11 @@ Patch6:             get-webkit_revision.patch
 Patch7:                dlopen_sonamed_gl.patch
 Patch8:                chromium_useragent.patch.in
 Patch9:                system-expat.patch
-Patch10:       dlopen-sonames.patch
+Patch10:       %{name}-pulse.patch
 # https://bugs.gentoo.org/show_bug.cgi?id=393471
 # libjpeg-turbo >= 1.1.90 supports that feature
 # but there is no autodetection currently, so revert for now
-Patch11:       chromium-revert-jpeg-swizzle-r0.patch
+Patch11:       chromium-revert-jpeg-swizzle-r2.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -213,9 +213,7 @@ ln -s %{SOURCE7} src
 %patch7 -p1
 cd src
 %patch9 -p1
-cd ..
 %patch10 -p1
-cd src
 %patch11 -p0
 cd ..
 

diff --git a/chromium-revert-jpeg-swizzle-r0.patch b/chromium-revert-jpeg-swizzle-r2.patch
similarity index 80%
rename from chromium-revert-jpeg-swizzle-r0.patch
rename to chromium-revert-jpeg-swizzle-r2.patch
index 1f1aff6bf88c2060a6879c28b897e00557f4d3f6..1d21121f0cc68803396c16a34b5629456a561409 100644 (file)
--- a/chromium-revert-jpeg-swizzle-r0.patch
+++ b/chromium-revert-jpeg-swizzle-r2.patch
@@ -5,7 +5,7 @@ Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageD
 ===================================================================
 --- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp        (revision 96970)
 +++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp        (revision 101286)
-@@ -63,20 +63,6 @@
+@@ -67,24 +67,6 @@
  
  #include <setjmp.h>
  
@@ -15,9 +15,13 @@ Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageD
 -#define ASSUME_LITTLE_ENDIAN 1
 -#endif
 -
--#if defined(JCS_EXTENSIONS) && ASSUME_LITTLE_ENDIAN
+-#if defined(JCS_ALPHA_EXTENSIONS) && ASSUME_LITTLE_ENDIAN
 -#define TURBO_JPEG_RGB_SWIZZLE
--inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRX; }
+-#if USE(SKIA) && (!SK_R32_SHIFT && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16)
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBA; }
+-#else
+-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRA; }
+-#endif
 -inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); }
 -#else
 -inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; }
@@ -26,21 +30,16 @@ Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageD
  namespace WebCore {
  
  struct decoder_error_mgr {
-@@ -235,11 +221,10 @@
-                 // their color profile, CoreGraphics will "upsample" them
-                 // again, resulting in horizontal distortions.
-                 m_decoder->setIgnoreGammaAndColorProfile(true);
--                m_info.out_color_space = JCS_RGB;
--                break;
-+                // Note fall-through!
+@@ -270,7 +252,7 @@
              case JCS_RGB:
              case JCS_YCbCr:
+                 // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB.
 -                m_info.out_color_space = rgbOutputColorSpace();
 +                m_info.out_color_space = JCS_RGB;
                  break;
              case JCS_CMYK:
              case JCS_YCCK:
-@@ -496,19 +481,6 @@
+@@ -525,19 +507,6 @@
      }
  
      jpeg_decompress_struct* info = m_reader->info();

diff --git a/dlopen-sonames.patch b/dlopen-sonames.patch
deleted file mode 100644 (file)
index 8823b0c..0000000
--- a/dlopen-sonames.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromium-browser-17.0.963.33/src/printing/backend/print_backend_cups.cc~   2012-01-11 10:01:11.000000000 +0200
-+++ chromium-browser-17.0.963.33/src/printing/backend/print_backend_cups.cc    2012-01-15 22:39:36.059522637 +0200
-@@ -60,7 +60,7 @@
-  private:
-   void Init() {
-     gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
--    const char* kGnuTlsFile = "libgnutls.so";
-+    const char* kGnuTlsFile = "libgnutls.so.28";
-     void* gnutls_lib = dlopen(kGnuTlsFile, RTLD_NOW);
-     if (!gnutls_lib) {
-       LOG(ERROR) << "Cannot load " << kGnuTlsFile;

diff --git a/gyp-system-minizip.patch b/gyp-system-minizip.patch
index 96c8bbd0905cb461bbc65ef58240879b70bc5d9f..d7429f822721176b0e1e165efa240a86bc3b3ad8 100644 (file)
--- a/gyp-system-minizip.patch
+++ b/gyp-system-minizip.patch
@@ -83,3 +83,14 @@
  #if defined(OS_WIN)
  #include "third_party/zlib/contrib/minizip/iowin32.h"
  #endif
+--- chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc~   2012-02-12 16:37:27.000000000 +0100
++++ chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc    2012-02-12 16:53:51.341474034 +0100
+@@ -10,7 +10,7 @@
+ #if defined(OS_WIN)
+ #include "third_party/zlib/contrib/minizip/iowin32.h"
+ #elif defined(OS_POSIX)
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include <minizip/ioapi.h>
+ #endif
+ 
+ namespace {

diff --git a/system-libs.patch b/system-libs.patch
index de707bbb80950b3194fd203ef8c6635561fbc6a8..f6e8c47b93c79b312cd33353ec5084d9b15ffc4b 100644 (file)
--- a/system-libs.patch
+++ b/system-libs.patch
@@ -42,14 +42,15 @@
  #include "base/time.h"
  #include "base/utf_string_conversions.h"
  #include "chrome/browser/autocomplete/autocomplete.h"
---- chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc.orig    2011-07-19 04:00:59.000000000 +0200
-+++ chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc 2011-07-22 20:43:47.608727449 +0200
-@@ -17,7 +17,7 @@
+--- a/src/chrome/common/metrics/metrics_log_base.cc~   2012-02-09 03:36:29.000000000 +0100
++++ b/src/chrome/common/metrics/metrics_log_base.cc    2012-02-12 16:17:46.992725484 +0100
+@@ -10,7 +10,7 @@
  #include "base/perftimer.h"
  #include "base/string_number_conversions.h"
  #include "base/sys_info.h"
 -#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
- #include "base/time.h"
  #include "base/utf_string_conversions.h"
  #include "chrome/common/logging_chrome.h"
+ #include "libxml/xmlwriter.h"
+