Commit 601bf3b0 authored by Michael Gilbert's avatar Michael Gilbert

release 55.0.2883.75-3

parent 2e2ab4c4
chromium-browser (55.0.2883.75-3) unstable; urgency=medium
* Merge experimental branch.
* Respect parallel setting in DEB_BUILD_OPTIONS while bootstrapping gn.
* Conflict libnettle4 rather than depend on libnettle6 (closes: #841213).
* Disable builtin media router since it only works with official Google
Chrome builds, not chromium (closes: #833477).
-- Michael Gilbert <mgilbert@debian.org> Sun, 18 Dec 2016 23:14:18 +0000
chromium-browser (55.0.2883.75-2+exp3) experimental; urgency=medium chromium-browser (55.0.2883.75-2+exp3) experimental; urgency=medium
* Correct typo from last build * Correct typo from last build.
-- Riku Voipio <riku.voipio@linaro.org> Fri, 16 Dec 2016 14:31:37 +0200 -- Riku Voipio <riku.voipio@linaro.org> Fri, 16 Dec 2016 14:31:37 +0200
......
...@@ -93,7 +93,6 @@ Depends: ...@@ -93,7 +93,6 @@ Depends:
${shlibs:Depends}, ${shlibs:Depends},
x11-utils, x11-utils,
xdg-utils, xdg-utils,
libnettle6,
Recommends: Recommends:
fonts-liberation, fonts-liberation,
Suggests: Suggests:
...@@ -102,6 +101,7 @@ Provides: ...@@ -102,6 +101,7 @@ Provides:
www-browser, www-browser,
gnome-www-browser, gnome-www-browser,
Conflicts: Conflicts:
libnettle4,
libgl1-mesa-swx11, libgl1-mesa-swx11,
Description: web browser Description: web browser
Web browser that aims to build a safer, faster, and more stable internet Web browser that aims to build a safer, faster, and more stable internet
......
...@@ -8,3 +8,6 @@ export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ignore-gpu-blacklist" ...@@ -8,3 +8,6 @@ export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ignore-gpu-blacklist"
# Disable background networking # Disable background networking
export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disable-background-networking" export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disable-background-networking"
# Disable the builtin media router (bug #833477)
export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --media-router=0"
description: respect specified number of parallel jobs while bootstrapping gn
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -102,6 +102,7 @@ def main(argv):
parser.add_option('--gn-gen-args', help='Args to pass to gn gen --args')
parser.add_option('-v', '--verbose', action='store_true',
help='Log more details')
+ parser.add_option('-j', '--jobs', help='Number of jobs')
options, args = parser.parse_args(argv)
if args:
@@ -186,6 +187,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir]
if options.verbose:
cmd.append('-v')
+ if options.jobs:
+ cmd.append('-j'+str(options.jobs))
if is_win:
cmd.append('gn.exe')
...@@ -12,10 +12,12 @@ disable/default-browser-warning.patch ...@@ -12,10 +12,12 @@ disable/default-browser-warning.patch
glibc2.24.patch glibc2.24.patch
gn.patch
ps-print.patch ps-print.patch
gpu-timeout.patch gpu-timeout.patch
build-flags.patch build-flags.patch
master-preferences.patch master-preferences.patch
chromedriver-revision.patch chromedriver-revision.patch
system/icu.patch system/icu.patch
......
...@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert@debian.org>
#include "webrtc/base/task_queue_posix.h" #include "webrtc/base/task_queue_posix.h"
--- a/tools/gn/bootstrap/bootstrap.py --- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py +++ b/tools/gn/bootstrap/bootstrap.py
@@ -541,29 +541,9 @@ def write_gn_ninja(path, root_gen_dir, o @@ -544,29 +544,9 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_posix.cc', 'base/time/time_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc', 'base/trace_event/heap_profiler_allocation_register_posix.cc',
]) ])
...@@ -45,7 +45,7 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -45,7 +45,7 @@ author: Michael Gilbert <mgilbert@debian.org>
ldflags.extend(['-pthread']) ldflags.extend(['-pthread'])
static_libraries['xdg_user_dirs'] = { static_libraries['xdg_user_dirs'] = {
@@ -587,13 +567,6 @@ def write_gn_ninja(path, root_gen_dir, o @@ -590,13 +570,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_linux.cc', 'base/threading/platform_thread_linux.cc',
'base/trace_event/malloc_dump_provider.cc', 'base/trace_event/malloc_dump_provider.cc',
]) ])
...@@ -59,7 +59,7 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -59,7 +59,7 @@ author: Michael Gilbert <mgilbert@debian.org>
if is_mac: if is_mac:
static_libraries['base']['sources'].extend([ static_libraries['base']['sources'].extend([
@@ -622,12 +595,6 @@ def write_gn_ninja(path, root_gen_dir, o @@ -625,12 +598,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_mac.mm', 'base/threading/platform_thread_mac.mm',
'base/trace_event/malloc_dump_provider.cc', 'base/trace_event/malloc_dump_provider.cc',
]) ])
......
...@@ -25,7 +25,7 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -25,7 +25,7 @@ author: Michael Gilbert <mgilbert@debian.org>
namespace base { namespace base {
--- a/tools/gn/bootstrap/bootstrap.py --- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py +++ b/tools/gn/bootstrap/bootstrap.py
@@ -464,7 +464,6 @@ def write_gn_ninja(path, root_gen_dir, o @@ -467,7 +467,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/third_party/dmg_fp/dtoa_wrapper.cc', 'base/third_party/dmg_fp/dtoa_wrapper.cc',
'base/third_party/dmg_fp/g_fmt.cc', 'base/third_party/dmg_fp/g_fmt.cc',
'base/third_party/icu/icu_utf.cc', 'base/third_party/icu/icu_utf.cc',
...@@ -33,7 +33,7 @@ author: Michael Gilbert <mgilbert@debian.org> ...@@ -33,7 +33,7 @@ author: Michael Gilbert <mgilbert@debian.org>
'base/threading/non_thread_safe_impl.cc', 'base/threading/non_thread_safe_impl.cc',
'base/threading/post_task_and_reply_impl.cc', 'base/threading/post_task_and_reply_impl.cc',
'base/threading/sequenced_task_runner_handle.cc', 'base/threading/sequenced_task_runner_handle.cc',
@@ -564,7 +563,7 @@ def write_gn_ninja(path, root_gen_dir, o @@ -567,7 +566,7 @@ def write_gn_ninja(path, root_gen_dir, o
} }
if is_linux: if is_linux:
......
...@@ -29,8 +29,7 @@ defines+=host_cpu=\"arm64\" ...@@ -29,8 +29,7 @@ defines+=host_cpu=\"arm64\"
endif endif
ifeq (armhf,$(DEB_HOST_ARCH)) ifeq (armhf,$(DEB_HOST_ARCH))
defines+=host_cpu=\"arm\" \ defines+=host_cpu=\"arm\" \
arm_use_neon=false \ arm_use_neon=false
endif endif
# disabled features # disabled features
...@@ -76,20 +75,18 @@ flotpaths=/usr/share/javascript/jquery/*min.js \ ...@@ -76,20 +75,18 @@ flotpaths=/usr/share/javascript/jquery/*min.js \
override_dh_auto_configure: override_dh_auto_configure:
# output compiler information # output compiler information
$(CXX) --version $(CXX) --version
# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
touch chrome/test/data/webui/i18n_process_css_test.html
# use system flot # use system flot
for file in $(flotpaths); do ln -sf $$file third_party/flot; done for file in $(flotpaths); do ln -sf $$file third_party/flot; done
# strip out system third_party libraries # strip out system third_party libraries
./debian/scripts/unbundle ./debian/scripts/unbundle
# build gn # build gn
./tools/gn/bootstrap/bootstrap.py -v -s ./tools/gn/bootstrap/bootstrap.py -s $(njobs)
# configure # configure
./out/Release/gn gen out/Release --args="$(defines)" ./out/Release/gn gen out/Release --args="$(defines)"
override_dh_auto_build-arch: override_dh_auto_build-arch:
./out/Release/gn gen out/Release --args="$(defines)" ./out/Release/gn gen out/Release --args="$(defines)"
ninja -v $(njobs) -C out/Release chrome chrome_sandbox chromedriver ninja $(njobs) -C out/Release chrome chrome_sandbox chromedriver
mv out/Release/chrome out/Release/chromium || true mv out/Release/chrome out/Release/chromium || true
mv out/Release/chrome.1 out/Release/chromium.1 || true mv out/Release/chrome.1 out/Release/chromium.1 || true
mv out/Release/chrome_sandbox out/Release/chrome-sandbox || true mv out/Release/chrome_sandbox out/Release/chrome-sandbox || true
...@@ -97,7 +94,7 @@ override_dh_auto_build-arch: ...@@ -97,7 +94,7 @@ override_dh_auto_build-arch:
chmod 4755 out/Release/chrome-sandbox # suid sandbox chmod 4755 out/Release/chrome-sandbox # suid sandbox
override_dh_auto_build-indep: override_dh_auto_build-indep:
ninja -v $(njobs) -C out/Release packed_resources ninja $(njobs) -C out/Release packed_resources
rm -f out/Release/locales/en-US.pak rm -f out/Release/locales/en-US.pak
override_dh_auto_install-arch: override_dh_auto_install-arch:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment