[packages/chromium-browser: 1/5] up to 49.0.2623.39
glen
glen at pld-linux.org
Sat Mar 19 21:42:19 CET 2016
commit be84bbd94212692eee7e1dcc2fe4ae11e9214d16
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Feb 11 12:10:30 2016 +0200
up to 49.0.2623.39
chromium-browser.spec | 14 +++++++-------
clean-source.sh | 15 +++++++++++----
nacl-verbose.patch | 16 ++++++++--------
system-ffmpeg.patch | 6 +++---
system-icu.patch | 11 -----------
5 files changed, 29 insertions(+), 33 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index d44aa12..c806ce3 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -30,7 +30,7 @@
%bcond_without system_opus # system opus codec support, http://www.opus-codec.org/examples/
# protobuf broken: https://bugs.gentoo.org/show_bug.cgi?id=525560
%bcond_with system_protobuf # system protobuf
-%bcond_without system_re2 # system re2
+%bcond_with system_re2 # system re2
%bcond_without system_snappy # system snappy
%bcond_without system_speex # system speex
%bcond_with system_sqlite # system sqlite WebSQL (http://www.w3.org/TR/webdatabase/) will not work
@@ -72,8 +72,8 @@
# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
# - to look for new tarball, use update-source.sh script
-%define branch 48.0.2564
-%define basever 103
+%define branch 49.0.2623
+%define basever 39
#define patchver 106
%define gyp_rev 1014
Summary: A WebKit powered web browser
@@ -86,8 +86,9 @@ Version: %{branch}.%{basever}
Release: 1
License: BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
Group: X11/Applications/Networking
-Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
-# Source0-md5: 4c527967ce3e6c141ebac00e4b26ae0d
+#Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
+Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
+# Source0-md5: 30e96da6e5dcc947cc5be803bdb074bb
%if "%{?patchver}" != ""
Patch0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
# Patch0-md5: 214631f58aae3e9d9ca0795240a95def
@@ -124,7 +125,6 @@ Patch39: libsecret.patch
Patch40: ffmpeg-generate-errors.patch
Patch41: ffmpeg-generate.patch
Patch42: system-ffmpeg.patch
-Patch43: system-icu.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
%{?with_system_mesa:BuildRequires: Mesa-libGL-devel >= 9.1}
@@ -338,7 +338,6 @@ ln -s %{SOURCE7} .
%patch40 -p1
%patch41 -p1
%patch42 -p1
-%patch43 -p0
# https://groups.google.com/a/chromium.org/forum/#!topic/chromium-packagers/9JX1N2nf4PU
install -d chrome/test/data/webui
@@ -447,6 +446,7 @@ flags="
%{?with_gps:-Dlinux_use_libgps=1 -Dlinux_link_libgps=1} \
-Dclang=0 \
-Dhost_clang=0 \
+ -Dsysroot= \
-Dlinux_use_bundled_binutils=0 \
-Dlinux_use_bundled_gold=0 \
-Dlinux_use_gold_flags=0 \
diff --git a/clean-source.sh b/clean-source.sh
index 73cffea..29534ed 100755
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -609,6 +609,8 @@ clean_third_party() {
'!' -path 'third_party/angle/src/compiler/*' \
'!' -path 'third_party/angle/src/enumerate_files.py' \
'!' -path 'third_party/angle/src/third_party/compiler/*' \
+ '!' -path 'third_party/angle/src/third_party/murmurhash/*' \
+ '!' -path 'third_party/angle/src/third_party/trace_event/*' \
'!' -path 'third_party/boringssl/*' \
'!' -path 'third_party/brotli/*' \
'!' -path 'third_party/cacheinvalidation/*' \
@@ -682,6 +684,7 @@ clean_third_party() {
'!' -path 'third_party/webrtc/*' \
'!' -path 'third_party/webrtc_overrides/*' \
'!' -path 'third_party/widevine/*' \
+ '!' -path 'third_party/woff2/*' \
'!' -path 'third_party/x86inc/*' \
'!' -path 'third_party/zlib/google/*' \
'!' -path 'third_party/zlib/zlib.h' \
@@ -1088,10 +1091,15 @@ remove_bundled_libraries() {
'third_party/analytics' \
'third_party/angle' \
'third_party/angle/src/third_party/compiler' \
+ 'third_party/angle/src/third_party/murmurhash' \
+ 'third_party/angle/src/third_party/trace_event' \
'third_party/boringssl' \
'third_party/brotli' \
'third_party/cacheinvalidation' \
'third_party/catapult' \
+ 'third_party/catapult/third_party/py_vulcanize' \
+ 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
+ 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
'third_party/catapult/tracing/third_party/components/polymer' \
'third_party/catapult/tracing/third_party/d3' \
'third_party/catapult/tracing/third_party/gl-matrix' \
@@ -1099,9 +1107,6 @@ remove_bundled_libraries() {
'third_party/catapult/tracing/third_party/tvcm' \
'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
- 'third_party/catapult/third_party/py_vulcanize' \
- 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
- 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
'third_party/cld_2' \
'third_party/cros_system_api' \
'third_party/cython/python_flags.py' \
@@ -1129,8 +1134,8 @@ remove_bundled_libraries() {
'third_party/libusb' \
'third_party/libvpx_new' \
'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
- 'third_party/libxml/chromium' \
'third_party/libwebm' \
+ 'third_party/libxml/chromium' \
'third_party/libyuv' \
'third_party/lss' \
'third_party/lzma_sdk' \
@@ -1154,6 +1159,7 @@ remove_bundled_libraries() {
'third_party/polymer' \
'third_party/protobuf' \
'third_party/qcms' \
+ 'third_party/re2' \
'third_party/readability' \
'third_party/sfntly' \
'third_party/skia' \
@@ -1166,6 +1172,7 @@ remove_bundled_libraries() {
'third_party/webrtc' \
'third_party/webrtc_overrides' \
'third_party/widevine' \
+ 'third_party/woff2' \
'third_party/x86inc' \
'third_party/zlib/google' \
'url/third_party/mozilla' \
diff --git a/nacl-verbose.patch b/nacl-verbose.patch
index e224857..e2e06f6 100644
--- a/nacl-verbose.patch
+++ b/nacl-verbose.patch
@@ -1,27 +1,27 @@
---- chromium-browser-45.0.2454.93/native_client/build/untrusted.gypi~ 2015-09-17 12:53:04.000000000 +0300
-+++ chromium-browser-45.0.2454.93/native_client/build/untrusted.gypi 2015-09-17 12:53:34.318584373 +0300
-@@ -96,7 +96,7 @@
+--- chromium-browser-49.0.2623.39/native_client/build/untrusted.gypi~ 2016-02-08 11:39:36.000000000 +0200
++++ chromium-browser-49.0.2623.39/native_client/build/untrusted.gypi 2016-02-09 08:41:05.962255541 +0200
+@@ -94,7 +94,7 @@
'build_nonsfi_helper': 0,
'disable_glibc%': 0,
- 'disable_bionic%': 1,
+ 'disable_newlib%': 0,
- 'extra_args': [],
+ 'extra_args': ['--verbose'],
'enable_x86_32': 1,
'enable_x86_64': 1,
'enable_arm': 0,
-@@ -153,7 +153,7 @@
+@@ -150,7 +150,7 @@
'build_nonsfi_helper': 0,
+ 'disable_newlib%': 0,
'disable_glibc%': 0,
- 'disable_bionic%': 1,
- 'extra_args': [],
+ 'extra_args': ['--verbose'],
'enable_x86_32': 0,
'enable_x86_64': 0,
'enable_arm': 1,
-@@ -203,7 +203,7 @@
+@@ -197,7 +197,7 @@
'build_nonsfi_helper': 0,
+ 'disable_newlib%': 0,
'disable_glibc%': 1,
- 'disable_bionic%': 1,
- 'extra_args': [],
+ 'extra_args': ['--verbose'],
'enable_x86_32': 0,
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
index c9f6ce0..8d67ef3 100644
--- a/system-ffmpeg.patch
+++ b/system-ffmpeg.patch
@@ -23,20 +23,20 @@ diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 155e980..7ba327a 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb,
+@@ -1034,24 +1034,6 @@
// If no estimate is found, the stream entry will be kInfiniteDuration().
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration());
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
-- format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
+- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- struct AVPacketList* packet_buffer = internal->packet_buffer;
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
- start_time_estimates.size());
- const AVStream* stream =
- format_context->streams[packet_buffer->pkt.stream_index];
-- if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
+- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- const base::TimeDelta packet_pts =
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- if (packet_pts < start_time_estimates[stream->index])
diff --git a/system-icu.patch b/system-icu.patch
deleted file mode 100644
index e1e2135..0000000
--- a/system-icu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/autofill/core/common/autofill_l10n_util.cc.orig 2015-12-07 11:46:37.738740329 +0000
-+++ components/autofill/core/common/autofill_l10n_util.cc 2015-12-07 11:46:44.574878953 +0000
-@@ -22,7 +22,7 @@
- // library. This could be due to a device-specific issue (has been seen in
- // the wild on Android devices). In the failure case, |collator_| will be
- // null. See http://crbug.com/558625.
-- icu_54::UnicodeString name;
-+ icu::UnicodeString name;
- std::string locale_name;
- locale.getDisplayName(name).toUTF8String(locale_name);
- LOG(ERROR) << "Failed to initialize the ICU Collator for "
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/1f9be6e7cddab05d0f89ca422682fb0da53ced96
More information about the pld-cvs-commit
mailing list