[Pkg-chromium-commit] [pkg-chromium] 01/02: release 58.0.3029.68-1

Michael Gilbert mgilbert at moszumanska.debian.org
Wed Apr 26 00:18:48 UTC 2017 

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository pkg-chromium.

commit 8a86a6ecaf53e1485529c8b76737b4eed07d39aa
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Fri Apr 14 20:57:42 2017 +0000

    release 58.0.3029.68-1
---
 debian/changelog                                 | 11 +++++
 debian/chromium.install                          |  1 +
 debian/copyright                                 | 10 ++++
 debian/extensions                                |  2 +
 debian/patches/disable/google-api-warning.patch  |  2 +-
 debian/patches/disable/third-party-cookies.patch |  2 +-
 debian/patches/fixes/arm64-seccomp-memfd.patch   | 60 ------------------------
 debian/patches/gn/callback.patch                 | 13 +++++
 debian/patches/gn/parallel.patch                 |  2 +-
 debian/patches/series                            |  2 +-
 debian/patches/system/event.patch                |  8 ++--
 debian/patches/system/ffmpeg.patch               |  2 +-
 debian/patches/system/icu.patch                  |  2 +-
 debian/patches/system/nspr.patch                 |  6 +--
 debian/patches/system/vpx.patch                  | 28 ++++++++++-
 debian/rules                                     |  1 +
 16 files changed, 77 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ca91a7..1dcd6f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+chromium-browser (58.0.3029.68-1) experimental; urgency=medium
+
+  * New upstream beta release.
+    - Drop arm patch, now applied upstream.
+    - Add missing file needed to be able to build gn.
+    - Update vpx.patch to continue using the system library.
+    - Set use_vulcanize=false to avoid bringing in the entire nodejs ecosystem.
+  * Enable remote extensions by default (closes: #856183).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Fri, 07 Apr 2017 04:51:22 +0000
+
 chromium-browser (57.0.2987.133-1) unstable; urgency=medium
 
   * New upstream security update.
diff --git a/debian/chromium.install b/debian/chromium.install
index ff9f26d..88e9696 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -16,4 +16,5 @@ debian/chromium.xml usr/share/gnome-control-center/default-apps
 debian/chromium.desktop usr/share/applications
 
 debian/apikeys etc/chromium.d
+debian/extensions etc/chromium.d
 debian/default-flags etc/chromium.d
diff --git a/debian/copyright b/debian/copyright
index f806680..f54e52e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -44,7 +44,17 @@ Files-Excluded:
  base/test/data
  base/third_party/nspr
  third_party/binutils
+ v8/benchmarks/regexp.js
  v8/third_party/binutils
+ third_party/node
+ third_party/mocha/mocha.js
+ third_party/chaijs/chai.js
+ third_party/catapult/third_party/flot
+ third_party/catapult/third_party/chai
+ third_party/catapult/third_party/mocha
+ third_party/webgl/src/conformance-suites
+ third_party/WebKit/Source/devtools/devtools-node-modules
+ third_party/catapult/tracing/tracing/extras/chrome/cc/layer_tree_host_impl_test_data.js
 
 # dirs that should be removed, but the jessie package still needs them
 # third_party/harfbuzz-ng/src
diff --git a/debian/extensions b/debian/extensions
new file mode 100644
index 0000000..24bd902
--- /dev/null
+++ b/debian/extensions
@@ -0,0 +1,2 @@
+# remote extensions on by default
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --enable-remote-extensions"
diff --git a/debian/patches/disable/google-api-warning.patch b/debian/patches/disable/google-api-warning.patch
index ed3d053..8932809 100644
--- a/debian/patches/disable/google-api-warning.patch
+++ b/debian/patches/disable/google-api-warning.patch
@@ -2,7 +2,7 @@ description: disable the google api key warning when those aren't found
 
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -816,8 +816,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -838,8 +838,6 @@ void StartupBrowserCreatorImpl::AddInfoB
        !command_line_.HasSwitch(switches::kTestType) &&
        !command_line_.HasSwitch(switches::kEnableAutomation)) {
      chrome::ShowBadFlagsPrompt(browser);
diff --git a/debian/patches/disable/third-party-cookies.patch b/debian/patches/disable/third-party-cookies.patch
index dfb0ed3..70ced8c 100644
--- a/debian/patches/disable/third-party-cookies.patch
+++ b/debian/patches/disable/third-party-cookies.patch
@@ -3,7 +3,7 @@ author: Chad Miller <chad.miller at canonical.com>
 
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -101,7 +101,7 @@ void CookieSettings::GetCookieSettings(
+@@ -79,7 +79,7 @@ void CookieSettings::GetCookieSettings(
  void CookieSettings::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
diff --git a/debian/patches/fixes/arm64-seccomp-memfd.patch b/debian/patches/fixes/arm64-seccomp-memfd.patch
deleted file mode 100644
index 6df2eb9..0000000
--- a/debian/patches/fixes/arm64-seccomp-memfd.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Riku Voipio <riku.voipio at linaro.org>
-Subject: seccomp-bpf: whitelist memfd_create on all architectures
-Origin: upstream, https://chromium.googlesource.com/chromium/src/+/2cd89ce477eb1e5ec041612369f29d75e651919e
-
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index b30b3e6acef6..1d9f95cd6444 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -120,9 +120,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
- #if defined(__i386__) || defined(__arm__) || defined(__mips__)
-     case __NR_lstat64:
- #endif
--#if defined(__i386__) || defined(__arm__) || defined(__x86_64__)
-     case __NR_memfd_create:
--#endif
-     case __NR_mkdirat:
-     case __NR_mknodat:
- #if defined(__i386__)
-diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h b/sandbox/linux/system_headers/arm64_linux_syscalls.h
-index 8acb2d100037..59d0eab8ecdc 100644
---- a/sandbox/linux/system_headers/arm64_linux_syscalls.h
-+++ b/sandbox/linux/system_headers/arm64_linux_syscalls.h
-@@ -1059,4 +1059,8 @@
- #define __NR_getrandom 278
- #endif
- 
-+#if !defined(__NR_memfd_create)
-+#define __NR_memfd_create 279
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h
-index 5a179b073572..90f3d1bea8bf 100644
---- a/sandbox/linux/system_headers/mips64_linux_syscalls.h
-+++ b/sandbox/linux/system_headers/mips64_linux_syscalls.h
-@@ -1267,4 +1267,8 @@
- #define __NR_getrandom (__NR_Linux + 313)
- #endif
- 
-+#if !defined(__NR_memfd_create)
-+#define __NR_memfd_create (__NR_Linux + 314)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h
-index 819f9eb38b57..784d6b8ae085 100644
---- a/sandbox/linux/system_headers/mips_linux_syscalls.h
-+++ b/sandbox/linux/system_headers/mips_linux_syscalls.h
-@@ -1429,4 +1429,8 @@
- #define __NR_getrandom (__NR_Linux + 353)
- #endif
- 
-+#if !defined(__NR_memfd_create)
-+#define __NR_memfd_create (__NR_Linux + 354)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
--- 
-2.11.0
-
diff --git a/debian/patches/gn/callback.patch b/debian/patches/gn/callback.patch
new file mode 100644
index 0000000..7ade9b7
--- /dev/null
+++ b/debian/patches/gn/callback.patch
@@ -0,0 +1,13 @@
+description: add a file now required by gn
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -384,6 +384,7 @@ def write_gn_ninja(path, root_gen_dir, o
+       'base/base_paths.cc',
+       'base/base_switches.cc',
+       'base/build_time.cc',
++      'base/callback_helpers.cc',
+       'base/callback_internal.cc',
+       'base/command_line.cc',
+       'base/debug/activity_tracker.cc',
diff --git a/debian/patches/gn/parallel.patch b/debian/patches/gn/parallel.patch
index 3a30c6e..376b4cd 100644
--- a/debian/patches/gn/parallel.patch
+++ b/debian/patches/gn/parallel.patch
@@ -11,7 +11,7 @@ author: Michael Gilbert <mgilbert at debian.org>
    options, args = parser.parse_args(argv)
  
    if args:
-@@ -189,6 +190,8 @@ def build_gn_with_ninja_manually(tempdir
+@@ -198,6 +199,8 @@ def build_gn_with_ninja_manually(tempdir
    cmd = ['ninja', '-C', tempdir]
    if options.verbose:
      cmd.append('-v')
diff --git a/debian/patches/series b/debian/patches/series
index e1b1336..e74b410 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 manpage.patch
 master-preferences.patch
 
+gn/callback.patch
 gn/parallel.patch
 gn/buildflags.patch
 
@@ -13,7 +14,6 @@ fixes/ps-print.patch
 fixes/gpu-timeout.patch
 fixes/widevine-revision.patch
 fixes/chromedriver-revision.patch
-fixes/arm64-seccomp-memfd.patch
 
 system/icu.patch
 system/vpx.patch
diff --git a/debian/patches/system/event.patch b/debian/patches/system/event.patch
index 0ca8622..b5b039f 100644
--- a/debian/patches/system/event.patch
+++ b/debian/patches/system/event.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/third_party/webrtc/base/task_queue_libevent.cc
 +++ b/third_party/webrtc/base/task_queue_libevent.cc
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@
  #include <string.h>
  #include <unistd.h>
  
@@ -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
-@@ -554,29 +554,9 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -573,29 +573,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'] = {
-@@ -600,13 +580,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -620,13 +600,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([
-@@ -635,12 +608,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -655,12 +628,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/ffmpeg.patch b/debian/patches/system/ffmpeg.patch
index 84921f8..ca39125 100644
--- a/debian/patches/system/ffmpeg.patch
+++ b/debian/patches/system/ffmpeg.patch
@@ -21,7 +21,7 @@ author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
  #include <libavutil/imgutils.h>
 --- a/media/filters/ffmpeg_demuxer.cc
 +++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1195,24 +1195,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1221,24 +1221,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
    // If no estimate is found, the stream entry will be kInfiniteDuration.
    std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
                                                      kInfiniteDuration);
diff --git a/debian/patches/system/icu.patch b/debian/patches/system/icu.patch
index a62a349..9cc5aab 100644
--- a/debian/patches/system/icu.patch
+++ b/debian/patches/system/icu.patch
@@ -1,6 +1,6 @@
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -843,8 +843,7 @@ group("gn_only") {
+@@ -811,8 +811,7 @@ group("gn_only") {
      deps += [ "//ui/ozone/demo" ]
    }
  
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index de9024a..9394035 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
-@@ -474,7 +474,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -490,7 +490,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',
-@@ -577,7 +576,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -596,7 +595,7 @@ def write_gn_ninja(path, root_gen_dir, o
      }
  
    if is_linux:
@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  }
  
  config("base_implementation") {
-@@ -866,8 +869,6 @@ component("base") {
+@@ -884,8 +887,6 @@ component("base") {
      "third_party/dmg_fp/g_fmt.cc",
      "third_party/icu/icu_utf.cc",
      "third_party/icu/icu_utf.h",
diff --git a/debian/patches/system/vpx.patch b/debian/patches/system/vpx.patch
index be3f2b3..dab49bb 100644
--- a/debian/patches/system/vpx.patch
+++ b/debian/patches/system/vpx.patch
@@ -36,7 +36,7 @@ author: Michael Gilbert <mgilbert at debian.org>
        return new NullVideoDecoder();
 --- a/third_party/webrtc/media/engine/internalencoderfactory.cc
 +++ b/third_party/webrtc/media/engine/internalencoderfactory.cc
-@@ -31,8 +31,6 @@ bool IsFlexfecFieldTrialEnabled() {
+@@ -34,8 +34,6 @@ bool IsFlexfecAdvertisedFieldTrialEnable
  
  InternalEncoderFactory::InternalEncoderFactory() {
    supported_codecs_.push_back(cricket::VideoCodec(kVp8CodecName));
@@ -45,7 +45,7 @@ author: Michael Gilbert <mgilbert at debian.org>
    if (webrtc::H264Encoder::IsSupported()) {
      cricket::VideoCodec codec(kH264CodecName);
      // TODO(magjed): Move setting these parameters into webrtc::H264Encoder
-@@ -74,8 +72,6 @@ webrtc::VideoEncoder* InternalEncoderFac
+@@ -77,8 +75,6 @@ webrtc::VideoEncoder* InternalEncoderFac
        return webrtc::H264Encoder::Create(codec);
      case webrtc::kVideoCodecVP8:
        return webrtc::VP8Encoder::Create();
@@ -54,3 +54,27 @@ author: Michael Gilbert <mgilbert at debian.org>
      default:
        return nullptr;
    }
+--- a/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
++++ b/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+@@ -1146,9 +1146,6 @@ int VP8DecoderImpl::Decode(const Encoded
+ 
+   img = vpx_codec_get_frame(decoder_, &iter);
+   int qp;
+-  vpx_codec_err_t vpx_ret =
+-      vpx_codec_control(decoder_, VPXD_GET_LAST_QUANTIZER, &qp);
+-  RTC_DCHECK_EQ(vpx_ret, VPX_CODEC_OK);
+   ret = ReturnFrame(img, input_image._timeStamp, input_image.ntp_time_ms_, qp);
+   if (ret != 0) {
+     // Reset to avoid requesting key frames too often.
+@@ -1237,8 +1234,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
+ 
+   VideoFrame decoded_image(buffer, timestamp, 0, kVideoRotation_0);
+   decoded_image.set_ntp_time_ms(ntp_time_ms);
+-  decode_complete_callback_->Decoded(decoded_image, rtc::Optional<int32_t>(),
+-                                     rtc::Optional<uint8_t>(qp));
++  int ret = decode_complete_callback_->Decoded(decoded_image);
++  if (ret != 0)
++    return ret;
+ 
+   // Remember image format for later
+   image_format_ = img->fmt;
diff --git a/debian/rules b/debian/rules
index 3872fb5..8645217 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,7 @@ defines+=is_debug=false \
          use_ozone=false \
          use_gconf=false \
          use_sysroot=false \
+         use_vulcanize=false \
          use_gnome_keyring=false \
          treat_warnings_as_errors=false \
          enable_nacl=false \

-- 
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