packages: chromium-browser/chromium-browser.spec, chromium-browser/disable_...

glen glen at pld-linux.org
Fri Jan 6 00:21:46 CET 2012 

Author: glen                         Date: Thu Jan  5 23:21:46 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 17.0.963.26 beta, chromium stable in CHROMIUM_16 branch

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.167 -> 1.168) , disable_dlog_and_dcheck_in_release_builds.patch (1.2 -> 1.3) , gyp-system-minizip.patch (1.2 -> 1.3) , system-libs.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.167 packages/chromium-browser/chromium-browser.spec:1.168
--- packages/chromium-browser/chromium-browser.spec:1.167	Fri Jan  6 00:03:13 2012
+++ packages/chromium-browser/chromium-browser.spec	Fri Jan  6 00:21:40 2012
@@ -17,7 +17,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
@@ -50,12 +50,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
@@ -119,7 +119,7 @@
 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
@@ -336,6 +336,7 @@
 %{_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
@@ -369,6 +370,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.168  2012/01/05 23:21:40  glen
+- up to 17.0.963.26 beta, chromium stable in CHROMIUM_16 branch
+
 Revision 1.167  2012/01/05 23:03:13  glen
 - invert clean logic foo=0 means do not remove it, undefined foo means do remove it
 

================================================================
Index: packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch
diff -u packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch:1.2 packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch:1.3
--- packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch:1.2	Fri Mar  4 17:02:26 2011
+++ packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch	Fri Jan  6 00:21:40 2012
@@ -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

================================================================
Index: packages/chromium-browser/gyp-system-minizip.patch
diff -u packages/chromium-browser/gyp-system-minizip.patch:1.2 packages/chromium-browser/gyp-system-minizip.patch:1.3
--- packages/chromium-browser/gyp-system-minizip.patch:1.2	Sat Nov  5 17:33:32 2011
+++ packages/chromium-browser/gyp-system-minizip.patch	Fri Jan  6 00:21:40 2012
@@ -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

================================================================
Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.9 packages/chromium-browser/system-libs.patch:1.10
--- packages/chromium-browser/system-libs.patch:1.9	Sat Jul 23 17:17:38 2011
+++ packages/chromium-browser/system-libs.patch	Fri Jan  6 00:21:40 2012
@@ -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 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.167&r2=1.168&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/disable_dlog_and_dcheck_in_release_builds.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/gyp-system-minizip.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.9&r2=1.10&f=u

More information about the pld-cvs-commit mailing list