packages: chromium-browser/chromium-browser.spec, chromium-browser/chromium...
arekm
arekm at pld-linux.org
Sat Nov 5 17:33:37 CET 2011
Author: arekm Date: Sat Nov 5 16:33:37 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- initial update to 16.0.912.21~r108057
---- Files affected:
packages/chromium-browser:
chromium-browser.spec (1.141 -> 1.142) , chromium_useragent.patch.in (1.3 -> 1.4) , gyp-system-minizip.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.141 packages/chromium-browser/chromium-browser.spec:1.142
--- packages/chromium-browser/chromium-browser.spec:1.141 Thu Oct 27 09:01:06 2011
+++ packages/chromium-browser/chromium-browser.spec Sat Nov 5 17:33:32 2011
@@ -49,18 +49,18 @@
# http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf
%define svndate %{nil}
-%define svnver 107270
+%define svnver 108057
%define rel 1
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
-Version: 15.0.874.106
+Version: 16.0.912.21
Release: 0.%{svnver}.%{rel}
License: BSD, LGPL v2+ (ffmpeg)
Group: X11/Applications/Networking
Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}_%{version}~r%{svnver}.orig.tar.gz
-# Source0-md5: ae091920e12cf55804f0bf8671d7ab47
+# Source0-md5: a8c42ee43796b5efb11ca330c420445c
#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
@@ -367,6 +367,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.142 2011/11/05 16:33:32 arekm
+- initial update to 16.0.912.21~r108057
+
Revision 1.141 2011/10/27 07:01:06 glen
- up to 15.0.874.106, r107270 also current stable branch
================================================================
Index: packages/chromium-browser/chromium_useragent.patch.in
diff -u packages/chromium-browser/chromium_useragent.patch.in:1.3 packages/chromium-browser/chromium_useragent.patch.in:1.4
--- packages/chromium-browser/chromium_useragent.patch.in:1.3 Sat Jun 18 21:32:40 2011
+++ packages/chromium-browser/chromium_useragent.patch.in Sat Nov 5 17:33:32 2011
@@ -1,8 +1,8 @@
---- chromium-browser-11.0.691.0~svn20110304r76865/src/webkit/glue/user_agent.cc~ 2011-03-04 05:00:41.000000000 +0200
-+++ chromium-browser-11.0.691.0~svn20110304r76865/src/webkit/glue/user_agent.cc 2011-03-04 18:55:33.180524092 +0200
-@@ -102,15 +102,22 @@
- // maximally compatible with Safari, we hope!!
- std::string product = GetProductVersion();
+--- chromium-browser-16.0.912.21~r108057/src/webkit/glue/user_agent.cc~ 2011-11-05 15:01:12.000000000 +0100
++++ chromium-browser-16.0.912.21~r108057/src/webkit/glue/user_agent.cc 2011-11-05 17:29:13.809556210 +0100
+@@ -127,6 +127,12 @@
+
+ std::string user_agent;
+ // We want to also add Chromium
+ std::string realproduct = product.c_str();
@@ -10,13 +10,16 @@
+ if ((pos = realproduct.find("/")) != std::string::npos)
+ realproduct.replace(0, pos, "Chromium");
+
- // Derived from Safari's UA string.
+ // This is done to expose our product name in a manner that is maximally
+ // compatible with Safari, we hope!!
+
+@@ -134,11 +140,12 @@
base::StringAppendF(
&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,
+ kUserAgentPlatform,
webkit_glue::BuildOSCpuInfo().c_str(),
WEBKIT_VERSION_MAJOR,
WEBKIT_VERSION_MINOR,
================================================================
Index: packages/chromium-browser/gyp-system-minizip.patch
diff -u packages/chromium-browser/gyp-system-minizip.patch:1.1 packages/chromium-browser/gyp-system-minizip.patch:1.2
--- packages/chromium-browser/gyp-system-minizip.patch:1.1 Sun Sep 20 12:39:25 2009
+++ packages/chromium-browser/gyp-system-minizip.patch Sat Nov 5 17:33:32 2011
@@ -1,7 +1,6 @@
-diff -up chromium-20090807svn22807/src/third_party/zlib/zlib.gyp.system-minizip chromium-20090807svn22807/src/third_party/zlib/zlib.gyp
---- chromium-20090807svn22807/src/third_party/zlib/zlib.gyp.system-minizip 2009-08-07 19:16:00.000000000 -0400
-+++ chromium-20090807svn22807/src/third_party/zlib/zlib.gyp 2009-08-07 19:16:25.000000000 -0400
-@@ -83,16 +83,11 @@
+--- chromium-browser-16.0.912.21~r108057/src/third_party/zlib/zlib.gyp~ 2011-11-05 15:05:40.000000000 +0100
++++ chromium-browser-16.0.912.21~r108057/src/third_party/zlib/zlib.gyp 2011-11-05 17:31:17.605374715 +0100
+@@ -88,12 +88,6 @@
'USE_SYSTEM_ZLIB',
],
'sources': [
@@ -12,9 +11,13 @@
- 'contrib/minizip/zip.c',
- 'contrib/minizip/zip.h',
],
+ 'conditions': [
+ ['OS=="android"', {
+@@ -102,7 +96,7 @@
+ ],
'link_settings': {
'libraries': [
- '-lz',
+- '-lz',
+ '-lminizip',
],
},
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.141&r2=1.142&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium_useragent.patch.in?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/gyp-system-minizip.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list