[Pkg-chromium-commit] [pkg-chromium] 01/01: release 55.0.2883.75-3
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon Dec 19 03:16:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit 601bf3b000b4df4a79463f8500a95b5722f42cfc
Author: Michael Gilbert <mgilbert at debian.org>
Date: Mon Dec 19 03:17:07 2016 +0000
release 55.0.2883.75-3
---
debian/changelog | 12 +++++++++++-
debian/control | 2 +-
debian/default-flags | 3 +++
debian/patches/gn.patch | 22 ++++++++++++++++++++++
debian/patches/series | 2 ++
debian/patches/system/event.patch | 6 +++---
debian/patches/system/nspr.patch | 4 ++--
debian/rules | 11 ++++-------
8 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 89c0a89..d5eb107 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
+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 at debian.org> Sun, 18 Dec 2016 23:14:18 +0000
+
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 at linaro.org> Fri, 16 Dec 2016 14:31:37 +0200
diff --git a/debian/control b/debian/control
index e7cdc87..3dd6a06 100644
--- a/debian/control
+++ b/debian/control
@@ -93,7 +93,6 @@ Depends:
${shlibs:Depends},
x11-utils,
xdg-utils,
- libnettle6,
Recommends:
fonts-liberation,
Suggests:
@@ -102,6 +101,7 @@ Provides:
www-browser,
gnome-www-browser,
Conflicts:
+ libnettle4,
libgl1-mesa-swx11,
Description: web browser
Web browser that aims to build a safer, faster, and more stable internet
diff --git a/debian/default-flags b/debian/default-flags
index 50f3abf..12d892a 100644
--- a/debian/default-flags
+++ b/debian/default-flags
@@ -8,3 +8,6 @@ export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ignore-gpu-blacklist"
# 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"
diff --git a/debian/patches/gn.patch b/debian/patches/gn.patch
new file mode 100644
index 0000000..66f4a43
--- /dev/null
+++ b/debian/patches/gn.patch
@@ -0,0 +1,22 @@
+description: respect specified number of parallel jobs while bootstrapping gn
+author: Michael Gilbert <mgilbert at 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')
diff --git a/debian/patches/series b/debian/patches/series
index e7e5163..159f889 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,10 +12,12 @@ disable/default-browser-warning.patch
glibc2.24.patch
+gn.patch
ps-print.patch
gpu-timeout.patch
build-flags.patch
master-preferences.patch
+
chromedriver-revision.patch
system/icu.patch
diff --git a/debian/patches/system/event.patch b/debian/patches/system/event.patch
index d09295c..2ec0524 100644
--- a/debian/patches/system/event.patch
+++ b/debian/patches/system/event.patch
@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert at debian.org>
#include "webrtc/base/task_queue_posix.h"
--- a/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/trace_event/heap_profiler_allocation_register_posix.cc',
])
@@ -45,7 +45,7 @@ author: Michael Gilbert <mgilbert at debian.org>
ldflags.extend(['-pthread'])
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/trace_event/malloc_dump_provider.cc',
])
@@ -59,7 +59,7 @@ author: Michael Gilbert <mgilbert at debian.org>
if is_mac:
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/trace_event/malloc_dump_provider.cc',
])
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index 266a05f..df35681 100644
--- a/debian/patches/system/nspr.patch
+++ b/debian/patches/system/nspr.patch
@@ -25,7 +25,7 @@ author: Michael Gilbert <mgilbert at debian.org>
namespace base {
--- a/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/g_fmt.cc',
'base/third_party/icu/icu_utf.cc',
@@ -33,7 +33,7 @@ author: Michael Gilbert <mgilbert at debian.org>
'base/threading/non_thread_safe_impl.cc',
'base/threading/post_task_and_reply_impl.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:
diff --git a/debian/rules b/debian/rules
index 6705b59..73bd045 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,7 @@ defines+=host_cpu=\"arm64\"
endif
ifeq (armhf,$(DEB_HOST_ARCH))
defines+=host_cpu=\"arm\" \
- arm_use_neon=false \
-
+ arm_use_neon=false
endif
# disabled features
@@ -76,20 +75,18 @@ flotpaths=/usr/share/javascript/jquery/*min.js \
override_dh_auto_configure:
# output compiler information
$(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
for file in $(flotpaths); do ln -sf $$file third_party/flot; done
# strip out system third_party libraries
./debian/scripts/unbundle
# build gn
- ./tools/gn/bootstrap/bootstrap.py -v -s
+ ./tools/gn/bootstrap/bootstrap.py -s $(njobs)
# configure
./out/Release/gn gen out/Release --args="$(defines)"
override_dh_auto_build-arch:
./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.1 out/Release/chromium.1 || true
mv out/Release/chrome_sandbox out/Release/chrome-sandbox || true
@@ -97,7 +94,7 @@ override_dh_auto_build-arch:
chmod 4755 out/Release/chrome-sandbox # suid sandbox
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
override_dh_auto_install-arch:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list