- up to 17.0.963.26 beta, chromium stable in CHROMIUM_16 branch

Changed files:
    chromium-browser.spec -> 1.168
    disable_dlog_and_dcheck_in_release_builds.patch -> 1.3
    gyp-system-minizip.patch -> 1.3
    system-libs.patch -> 1.10

diff --git a/chromium-browser.spec b/chromium-browser.spec
index c4b2a1da34638051089c64414dfb698b3c2992bc..e5d3193af99e7cac6acc7b5dc4fcce7f5ee37ee3 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -16,7 +16,7 @@
 %bcond_without system_flac             # with system flac
 %bcond_without system_libwebp  # with system libwebp
 %bcond_without system_speex    # with system speex
-%bcond_without system_v8               # with system v8
+%bcond_with            system_v8               # with system v8
 %bcond_without system_vpx              # with system vpx
 %bcond_without system_yasm             # with system yasm
 %bcond_without system_zlib             # with system zlib
@@ -49,12 +49,12 @@
 %define                gyp_rev 1014
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
-Version:       16.0.912.63
+Version:       17.0.963.26
 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: f9e8eb4ddf23640aa6cfbe797d750055
+# Source0-md5: ef898d316b5cc5754aba29bbb919185a
 #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
@@ -118,7 +118,7 @@ BuildRequires:      rpmbuild(macros) >= 1.453
 BuildRequires: sqlite3-devel >= 3.6.1
 BuildRequires: tar >= 1:1.22
 BuildRequires: util-linux
-%{?with_system_v8:BuildRequires:       v8-devel >= 3.6}
+%{?with_system_v8:BuildRequires:       v8-devel >= 3.7}
 BuildRequires: which
 BuildRequires: xorg-lib-libXScrnSaver-devel
 BuildRequires: xorg-lib-libXt-devel
@@ -335,6 +335,7 @@ fi
 %{_desktopdir}/*.desktop
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/chrome.pak
+%{_libdir}/%{name}/content_resources.pak
 %{_libdir}/%{name}/resources.pak
 %dir %{_libdir}/%{name}/locales
 %{_libdir}/%{name}/locales/en-US.pak

diff --git a/disable_dlog_and_dcheck_in_release_builds.patch b/disable_dlog_and_dcheck_in_release_builds.patch
index c6d27119d0cd19fa402514b68d7a74e47b1b0813..8cd9f61aef48d3fe3d893771ea6a9c11ac785df0 100644 (file)
--- a/disable_dlog_and_dcheck_in_release_builds.patch
+++ b/disable_dlog_and_dcheck_in_release_builds.patch
@@ -1,27 +1,11 @@
----
- base/logging.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: src/base/logging.h
-===================================================================
---- ./src.orig/base/logging.h
-+++ ./src/base/logging.h
-@@ -495,17 +495,17 @@
- #define CHECK_LT(val1, val2) CHECK_OP(LT, < , val1, val2)
- #define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
- #define CHECK_GT(val1, val2) CHECK_OP(GT, > , val1, val2)
- 
- // http://crbug.com/16512 is open for a real fix for this.  For now, Windows
+--- chromium-browser-17.0.963.26/src/base/logging.h~   2012-01-04 04:02:02.000000000 +0200
++++ chromium-browser-17.0.963.26/src/base/logging.h    2012-01-05 22:54:29.330576996 +0200
+@@ -451,7 +451,7 @@
  // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
  // defined.
  #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
 -    (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
 +    (!defined(OS_WIN) && defined(NDEBUG))
- // Used by unit tests.
- #define LOGGING_IS_OFFICIAL_BUILD
- 
- // In order to have optimized code for official builds, remove DLOGs and
- // DCHECKs.
- #define ENABLE_DLOG 0
- #define ENABLE_DCHECK 0
- 
+ #define LOGGING_IS_OFFICIAL_BUILD 1
+ #else
+ #define LOGGING_IS_OFFICIAL_BUILD 0

diff --git a/gyp-system-minizip.patch b/gyp-system-minizip.patch
index f6b826fd908e84ba00962a9a87ae0c9e6e1b4859..96c8bbd0905cb461bbc65ef58240879b70bc5d9f 100644 (file)
--- a/gyp-system-minizip.patch
+++ b/gyp-system-minizip.patch
@@ -22,3 +22,64 @@
              ],
            },
          },
+--- chromium-browser-17.0.963.26/src/chrome/common/zip.cc~     2012-01-04 04:02:54.000000000 +0200
++++ chromium-browser-17.0.963.26/src/chrome/common/zip.cc      2012-01-05 22:51:39.376075829 +0200
+@@ -12,8 +12,8 @@
+ #include "chrome/common/zip_internal.h"
+ #include "chrome/common/zip_reader.h"
+ #include "net/base/file_stream.h"
+-#include "third_party/zlib/contrib/minizip/unzip.h"
+-#include "third_party/zlib/contrib/minizip/zip.h"
++#include <minizip/unzip.h>
++#include <minizip/zip.h>
+ 
+ namespace {
+ 
+--- chromium-browser-17.0.963.26/src/chrome/common/zip_internal.h~     2012-01-04 04:02:54.000000000 +0200
++++ chromium-browser-17.0.963.26/src/chrome/common/zip_internal.h      2012-01-06 01:00:57.206864774 +0200
+@@ -8,8 +8,8 @@
+ 
+ #include <string>
+ 
+-#include "third_party/zlib/contrib/minizip/unzip.h"
+-#include "third_party/zlib/contrib/minizip/zip.h"
++#include <minizip/unzip.h>
++#include <minizip/zip.h>
+ 
+ // Utility functions and constants used internally for the zip file
+ // library in the directory. Don't use them outside of the library.
+--- chromium-browser-17.0.963.26/src/chrome/common/zip_internal.cc~    2012-01-04 04:02:54.000000000 +0200
++++ chromium-browser-17.0.963.26/src/chrome/common/zip_internal.cc     2012-01-06 01:08:20.967378679 +0200
+@@ -5,8 +5,8 @@
+ #include "chrome/common/zip.h"
+ 
+ #include "base/utf_string_conversions.h"
+-#include "third_party/zlib/contrib/minizip/unzip.h"
+-#include "third_party/zlib/contrib/minizip/zip.h"
++#include <minizip/unzip.h>
++#include <minizip/zip.h>
+ #if defined(OS_WIN)
+ #include "third_party/zlib/contrib/minizip/iowin32.h"
+ #endif
+--- chromium-browser-17.0.963.26/src/chrome/common/zip_reader.h~       2012-01-04 04:02:54.000000000 +0200
++++ chromium-browser-17.0.963.26/src/chrome/common/zip_reader.h        2012-01-06 01:12:08.277856237 +0200
+@@ -12,7 +12,7 @@
+ #include "base/file_path.h"
+ #include "base/memory/scoped_ptr.h"
+ #include "base/time.h"
+-#include "third_party/zlib/contrib/minizip/unzip.h"
++#include <minizip/unzip.h>
+ 
+ namespace zip {
+ 
+--- chromium-browser-17.0.963.26/src/chrome/common/zip_reader.cc~      2012-01-04 04:02:54.000000000 +0200
++++ chromium-browser-17.0.963.26/src/chrome/common/zip_reader.cc       2012-01-06 01:12:40.065988131 +0200
+@@ -10,7 +10,7 @@
+ #include "base/utf_string_conversions.h"
+ #include "chrome/common/zip_internal.h"
+ #include "net/base/file_stream.h"
+-#include "third_party/zlib/contrib/minizip/unzip.h"
++#include <minizip/unzip.h>
+ #if defined(OS_WIN)
+ #include "third_party/zlib/contrib/minizip/iowin32.h"
+ #endif

diff --git a/system-libs.patch b/system-libs.patch
index ea1d27575ff46e2de530bd454efbc485196be34e..de707bbb80950b3194fd203ef8c6635561fbc6a8 100644 (file)
--- a/system-libs.patch
+++ b/system-libs.patch
@@ -20,19 +20,6 @@
  
  #include "base/logging.h"
  
---- chromium-20090827svn24640/src/chrome/common/zip.cc.system-code     2009-08-27 15:22:46.000000000 -0400
-+++ chromium-20090827svn24640/src/chrome/common/zip.cc 2009-08-27 16:05:17.000000000 -0400
-@@ -7,8 +7,8 @@
- #include "base/file_util.h"
- #include "base/string_util.h"
- #include "net/base/file_stream.h"
--#include "third_party/zlib/contrib/minizip/unzip.h"
--#include "third_party/zlib/contrib/minizip/zip.h"
-+#include <minizip/unzip.h>
-+#include <minizip/zip.h>
- #if defined(OS_WIN)
- #include "third_party/zlib/contrib/minizip/iowin32.h"
- #endif
 --- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc~ 2010-01-07 23:19:11.000000000 +0200
 +++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc  2010-02-02 09:16:08.740140511 +0200
 @@ -13,7 +13,7 @@