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

Michael Gilbert mgilbert at moszumanska.debian.org
Sat Nov 11 21:37:07 UTC 2017 

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

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

commit 5560f8718275c986287abb10e020901fbbc15226
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Nov 11 21:38:57 2017 +0000

    release 63.0.3239.30-1
---
 debian/changelog                                 | 10 ++++++
 debian/control                                   |  9 +++--
 debian/copyright                                 |  1 +
 debian/patches/disable/external-components.patch | 23 ++++--------
 debian/patches/disable/fuzzers.patch             |  2 +-
 debian/patches/disable/google-api-warning.patch  |  2 +-
 debian/patches/fixes/crc32.patch                 | 14 --------
 debian/patches/fixes/optimize.patch              | 14 ++++++++
 debian/patches/fixes/webrtc.patch                | 13 +++++++
 debian/patches/gn/bootstrap.patch                | 45 ------------------------
 debian/patches/gn/narrowing.patch                |  2 +-
 debian/patches/gn/parallel.patch                 |  4 +--
 debian/patches/manpage.patch                     | 35 ++++++++++++------
 debian/patches/series                            |  5 +--
 debian/patches/system/event.patch                | 14 ++++----
 debian/patches/system/harfbuzz.patch             | 11 ++++++
 debian/patches/system/icu.patch                  |  2 +-
 debian/patches/system/lcms2.patch                |  4 +--
 debian/patches/system/nspr.patch                 |  8 ++---
 debian/patches/system/vpx.patch                  |  4 +--
 debian/rules                                     |  5 +--
 21 files changed, 113 insertions(+), 114 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4505c62..6d2d93f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+chromium-browser (63.0.3239.30-1) experimental; urgency=medium
+
+  * New upstream beta release.
+  * Install 16 and 32 pixel png icon files (closes: #857071).
+  * Improve description for --temp-profile (closes: #881040).
+  * Document Debian bug reports in the manpage (closes: #880965).
+  * Stricter breaks/replaces to support security uploads (closes: #877970).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Wed, 08 Nov 2017 01:54:47 +0000
+
 chromium-browser (62.0.3202.89-1) unstable; urgency=medium
 
   * New upstream security release.
diff --git a/debian/control b/debian/control
index 695d483..2d6fa34 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,6 @@ Build-Depends:
  libpulse-dev,
  libpam0g-dev,
  libsnappy-dev,
- libgconf2-dev,
  libavutil-dev,
  libavcodec-dev (>= 7:3.0),
  libavformat-dev,
@@ -135,6 +134,10 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  chromium-common (= ${binary:Version}),
+Breaks:
+ chromium (<< ${binary:Version}),
+Replaces:
+ chromium (<< ${binary:Version}),
 Description: web browser - minimal shell
  Web browser that aims to build a safer, faster, and more stable internet
  browsing experience.
@@ -175,9 +178,9 @@ Depends:
  x11-utils,
  xdg-utils,
 Breaks:
- chromium (<< 60.0.3112.72-1),
+ chromium (<< ${binary:Version}),
 Replaces:
- chromium (<< 60.0.3112.72-1),
+ chromium (<< ${binary:Version}),
 Description: web browser - common resources used by the chromium packages
  Web browser that aims to build a safer, faster, and more stable internet
  browsing experience.
diff --git a/debian/copyright b/debian/copyright
index 71cbcf7..96feea7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -73,6 +73,7 @@ Files-Excluded:
  third_party/libphonenumber/dist/javascript/i18n/phonenumbers/metadata.js
  third_party/libphonenumber/dist/javascript/i18n/phonenumbers/metadatalite.js
  tools/perf/page_sets/webrtc_cases/adapter.js
+ third_party/pdfium/third_party/lcms
 
 # dirs that should be removed, but the jessie package still needs them
 # third_party/harfbuzz-ng/src
diff --git a/debian/patches/disable/external-components.patch b/debian/patches/disable/external-components.patch
index 02a394f..3863623 100644
--- a/debian/patches/disable/external-components.patch
+++ b/debian/patches/disable/external-components.patch
@@ -3,37 +3,26 @@ description: disable loading external components
 
 --- a/chrome/browser/extensions/external_component_loader.cc
 +++ b/chrome/browser/extensions/external_component_loader.cc
-@@ -38,33 +38,12 @@ ExternalComponentLoader::~ExternalCompon
+@@ -34,22 +34,6 @@ ExternalComponentLoader::~ExternalCompon
  
  void ExternalComponentLoader::StartLoading() {
-   prefs_.reset(new base::DictionaryValue());
+   auto prefs = std::make_unique<base::DictionaryValue>();
 -#if defined(GOOGLE_CHROME_BUILD)
--  AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
+-  AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get());
 -#endif  // defined(GOOGLE_CHROME_BUILD)
 -
 -  if (HotwordServiceFactory::IsHotwordAllowed(profile_))
--    AddExternalExtension(extension_misc::kHotwordSharedModuleId);
+-    AddExternalExtension(extension_misc::kHotwordSharedModuleId, prefs.get());
 -
 -#if defined(OS_CHROMEOS)
 -  {
 -    base::CommandLine* const command_line =
 -        base::CommandLine::ForCurrentProcess();
 -    if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker))
--      AddExternalExtension(extension_misc::kZIPUnpackerExtensionId);
+-      AddExternalExtension(extension_misc::kZIPUnpackerExtensionId,
+-                           prefs.get());
 -  }
 -#endif
  
    if (media_router::MediaRouterEnabled(profile_) &&
        FeatureSwitch::load_media_router_component_extension()->IsEnabled()) {
-     AddExternalExtension(extension_misc::kMediaRouterStableExtensionId);
-   }
- 
--#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
--  std::string google_now_extension_id;
--  if (GetGoogleNowExtensionId(&google_now_extension_id))
--    AddExternalExtension(google_now_extension_id);
--#endif
--
-   LoadFinished();
- }
- 
diff --git a/debian/patches/disable/fuzzers.patch b/debian/patches/disable/fuzzers.patch
index 56044fa..fbc123b 100644
--- a/debian/patches/disable/fuzzers.patch
+++ b/debian/patches/disable/fuzzers.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -688,8 +688,7 @@ group("gn_all") {
+@@ -698,8 +698,7 @@ group("gn_all") {
      }
    }
  
diff --git a/debian/patches/disable/google-api-warning.patch b/debian/patches/disable/google-api-warning.patch
index 697f525..3cb5e5e 100644
--- a/debian/patches/disable/google-api-warning.patch
+++ b/debian/patches/disable/google-api-warning.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -836,8 +836,6 @@ void StartupBrowserCreatorImpl::AddInfoB
+@@ -778,8 +778,6 @@ void StartupBrowserCreatorImpl::AddInfoB
        !command_line_.HasSwitch(switches::kTestType) &&
        !command_line_.HasSwitch(switches::kEnableAutomation)) {
      chrome::ShowBadFlagsPrompt(browser);
diff --git a/debian/patches/fixes/crc32.patch b/debian/patches/fixes/crc32.patch
deleted file mode 100644
index c8f2544..0000000
--- a/debian/patches/fixes/crc32.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-description: fix inverted check
-author: Michael Gilbert <mgilbert at debian.org>
-
---- a/third_party/crc32c/src/include/crc32c/crc32c.h
-+++ b/third_party/crc32c/src/include/crc32c/crc32c.h
-@@ -37,7 +37,7 @@ inline uint32_t Crc32c(const std::string
- #if __has_include(<string_view>)
- // Visual Studio provides a <string_view> header even in C++11 mode. When
- // included, the header issues an #error. (C1189)
--#if !defined(_MSC_VER) || __cplusplus >= 201703L
-+#if !defined(_MSC_VER) && __cplusplus >= 201703L
- #include <string_view>
- 
- // Comptues the CRC32C of the bytes in the string_view.
diff --git a/debian/patches/fixes/optimize.patch b/debian/patches/fixes/optimize.patch
new file mode 100644
index 0000000..6c8b81c
--- /dev/null
+++ b/debian/patches/fixes/optimize.patch
@@ -0,0 +1,14 @@
+description: add missing variable declaration
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -70,6 +70,8 @@ declare_args() {
+     msvs_xtree_patched = false
+   }
+ 
++  optimize_for_size = true
++
+   # Enable fatal linker warnings. Building Chromium with certain versions
+   # of binutils can cause linker warning.
+   # See: https://bugs.chromium.org/p/chromium/issues/detail?id=457359
diff --git a/debian/patches/fixes/webrtc.patch b/debian/patches/fixes/webrtc.patch
new file mode 100644
index 0000000..26364aa
--- /dev/null
+++ b/debian/patches/fixes/webrtc.patch
@@ -0,0 +1,13 @@
+description: add missing include needed for call to round
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/third_party/webrtc/p2p/base/port.cc
++++ b/third_party/webrtc/p2p/base/port.cc
+@@ -10,6 +10,7 @@
+ 
+ #include "p2p/base/port.h"
+ 
++#include <cmath>
+ #include <algorithm>
+ #include <vector>
+ 
diff --git a/debian/patches/gn/bootstrap.patch b/debian/patches/gn/bootstrap.patch
deleted file mode 100644
index ba2bb3d..0000000
--- a/debian/patches/gn/bootstrap.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-description: fix errors in gn's bootstrapping script
-author: Michael Gilbert <mgilbert at debian.org>
-
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -451,7 +451,6 @@ def write_gn_ninja(path, root_gen_dir, o
-       'base/memory/ref_counted_memory.cc',
-       'base/memory/singleton.cc',
-       'base/memory/shared_memory_handle.cc',
--      'base/memory/shared_memory_tracker.cc',
-       'base/memory/weak_ptr.cc',
-       'base/message_loop/incoming_task_queue.cc',
-       'base/message_loop/message_loop.cc',
-@@ -460,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, o
-       'base/message_loop/message_pump_default.cc',
-       'base/metrics/bucket_ranges.cc',
-       'base/metrics/field_trial.cc',
-+      'base/metrics/field_trial_params.cc',
-       'base/metrics/field_trial_param_associator.cc',
-       'base/metrics/histogram.cc',
-       'base/metrics/histogram_base.cc',
-@@ -510,6 +510,7 @@ def write_gn_ninja(path, root_gen_dir, o
-       'base/task_scheduler/scheduler_lock_impl.cc',
-       'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
-       'base/task_scheduler/scheduler_worker.cc',
-+      'base/task_scheduler/scheduler_worker_pool.cc',
-       'base/task_scheduler/scheduler_worker_pool_impl.cc',
-       'base/task_scheduler/scheduler_worker_pool_params.cc',
-       'base/task_scheduler/scheduler_worker_stack.cc',
-@@ -529,6 +530,7 @@ def write_gn_ninja(path, root_gen_dir, o
-       'base/threading/sequence_local_storage_map.cc',
-       'base/threading/sequenced_task_runner_handle.cc',
-       'base/threading/sequenced_worker_pool.cc',
-+      'base/threading/scoped_blocking_call.cc',
-       'base/threading/simple_thread.cc',
-       'base/threading/thread.cc',
-       'base/threading/thread_checker_impl.cc',
-@@ -580,7 +582,6 @@ def write_gn_ninja(path, root_gen_dir, o
-       'base/tracked_objects.cc',
-       'base/tracking_info.cc',
-       'base/unguessable_token.cc',
--      'base/value_iterators.cc',
-       'base/values.cc',
-       'base/value_iterators.cc',
-       'base/vlog.cc',
diff --git a/debian/patches/gn/narrowing.patch b/debian/patches/gn/narrowing.patch
index bcd171c..3d961f5 100644
--- a/debian/patches/gn/narrowing.patch
+++ b/debian/patches/gn/narrowing.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/tools/gn/bootstrap/bootstrap.py
 +++ b/tools/gn/bootstrap/bootstrap.py
-@@ -351,7 +351,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -352,7 +352,7 @@ def write_gn_ninja(path, root_gen_dir, o
          '-pipe',
          '-fno-exceptions'
      ])
diff --git a/debian/patches/gn/parallel.patch b/debian/patches/gn/parallel.patch
index 1618c6b..4111c6d 100644
--- a/debian/patches/gn/parallel.patch
+++ b/debian/patches/gn/parallel.patch
@@ -11,8 +11,8 @@ author: Michael Gilbert <mgilbert at debian.org>
    options, args = parser.parse_args(argv)
  
    if args:
-@@ -207,6 +208,8 @@ def build_gn_with_ninja_manually(tempdir
-   cmd = ['ninja', '-C', tempdir]
+@@ -208,6 +209,8 @@ def build_gn_with_ninja_manually(tempdir
+   cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
    if options.verbose:
      cmd.append('-v')
 +  if options.jobs:
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
index 128aec6..2e6ba87 100644
--- a/debian/patches/manpage.patch
+++ b/debian/patches/manpage.patch
@@ -4,16 +4,8 @@ forwarded: http://code.google.com/p/chromium/issues/detail?id=73591
 
 --- a/chrome/app/resources/manpage.1.in
 +++ b/chrome/app/resources/manpage.1.in
-@@ -1,5 +1,5 @@
--." This file is processed by chrome.gyp to generate manpages in the
--." build diretory.
-+.\" This file is processed by chrome.gyp to generate manpages in the
-+.\" build diretory.
- .TH @@FILENAME@@ 1 "" "" "USER COMMANDS"
- 
- .SH NAME
 @@ -20,6 +20,23 @@ This manpage only describes invocation,
- @@NAME@@ has hundreds of undocumented command-line flags that are added
+ @@MENUNAME@@ has hundreds of undocumented command-line flags that are added
  and removed at the whim of the developers.  Here, we document relatively
  stable flags.
 +
@@ -27,7 +19,7 @@ forwarded: http://code.google.com/p/chromium/issues/detail?id=73591
 +
 +.TP
 +\fB\-\-temp-profile\fR
-+Use a throw-away/temporary profile for this session.
++Use a throw-away/temporary profile for this session.  This creates an entirely new user profile temporarily.  It is not the same as incognito mode.
 +
 +.TP
 +\fB\-\-enable-remote-extensions\fR
@@ -44,3 +36,26 @@ forwarded: http://code.google.com/p/chromium/issues/detail?id=73591
  <http://library.gnome.org/devel/gtk/stable/gtk-x11.html>
  
  .SH ENVIRONMENT
+@@ -159,12 +177,21 @@ Default directory for cache data.  (Why?
+ <http://standards.freedesktop.org/basedir-spec/latest/> .)
+ 
+ .SH BUGS
+-Bug tracker:
++Debian bug tracker:
++.IP
++http://bugs.debian.org/chromium-browser
++.PP
++Upstream bug tracker:
+ .IP
+ http://code.google.com/p/chromium/issues/list
+ .PP
+ Be sure to do your search within "All Issues" before reporting bugs,
+ and be sure to pick the "Defect on Linux" template when filing a new one.
++.PP
++If your bug is specific to Debian, please submit it only to the Debian bug
++tracker.
++.IP
++http://www.debian.org/Bugs/Reporting
+ 
+ .SH AUTHOR
+ The Chromium team \- <http://www.chromium.org>
diff --git a/debian/patches/series b/debian/patches/series
index bdf4240..2270112 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ manpage.patch
 master-preferences.patch
 
 gn/parallel.patch
-gn/bootstrap.patch
 gn/narrowing.patch
 gn/buildflags.patch
 
@@ -14,7 +13,8 @@ disable/external-components.patch
 disable/device-notifications.patch
 
 fixes/mojo.patch
-fixes/crc32.patch
+fixes/webrtc.patch
+fixes/optimize.patch
 fixes/chromecast.patch
 fixes/ps-print.patch
 fixes/gpu-timeout.patch
@@ -28,3 +28,4 @@ system/gtk2.patch
 system/nspr.patch
 system/lcms2.patch
 system/event.patch
+system/harfbuzz.patch
diff --git a/debian/patches/system/event.patch b/debian/patches/system/event.patch
index 7ed24ed..3e71ca1 100644
--- a/debian/patches/system/event.patch
+++ b/debian/patches/system/event.patch
@@ -9,13 +9,13 @@ author: Michael Gilbert <mgilbert at debian.org>
  
 -#include "base/third_party/libevent/event.h"
 +#include <event.h>
- #include "webrtc/rtc_base/checks.h"
- #include "webrtc/rtc_base/logging.h"
- #include "webrtc/rtc_base/platform_thread.h"
+ #include "rtc_base/checks.h"
+ #include "rtc_base/logging.h"
+ #include "rtc_base/platform_thread.h"
 --- a/tools/gn/bootstrap/bootstrap.py
 +++ b/tools/gn/bootstrap/bootstrap.py
-@@ -622,26 +622,6 @@ def write_gn_ninja(path, root_gen_dir, o
-         'base/time/time_now_posix.cc',
+@@ -614,26 +614,6 @@ def write_gn_ninja(path, root_gen_dir, o
+         'base/time/time_conversion_posix.cc',
          'base/trace_event/heap_profiler_allocation_register_posix.cc',
      ])
 -    static_libraries['libevent'] = {
@@ -41,7 +41,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  
    if is_linux or is_aix:
      ldflags.extend(['-pthread'])
-@@ -673,13 +653,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -667,13 +647,7 @@ def write_gn_ninja(path, root_gen_dir, o
          'base/allocator/allocator_shim.cc',
          'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
        ])
@@ -56,7 +56,7 @@ author: Michael Gilbert <mgilbert at debian.org>
      else:
        libs.extend(['-lrt'])
        static_libraries['base']['sources'].extend([
-@@ -716,12 +690,6 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -711,12 +685,6 @@ def write_gn_ninja(path, root_gen_dir, o
          'base/time/time_mac.cc',
          'base/threading/platform_thread_mac.mm',
      ])
diff --git a/debian/patches/system/harfbuzz.patch b/debian/patches/system/harfbuzz.patch
new file mode 100644
index 0000000..d753b1b
--- /dev/null
+++ b/debian/patches/system/harfbuzz.patch
@@ -0,0 +1,11 @@
+--- a/third_party/BUILD.gn
++++ b/third_party/BUILD.gn
+@@ -69,7 +69,7 @@ component("freetype_harfbuzz") {
+     public_deps += [ "//third_party/freetype:freetype_source" ]
+   }
+   if (use_system_harfbuzz) {
+-    public_configs += [ "//third_party/harfbuzz-ng:harfbuzz_from_pkgconfig" ]
++    public_configs += [ "//third_party/harfbuzz-ng:system_harfbuzz" ]
+   } else {
+     public_deps += [ "//third_party/harfbuzz-ng:harfbuzz_source" ]
+   }
diff --git a/debian/patches/system/icu.patch b/debian/patches/system/icu.patch
index 9bd7921..5a255e7 100644
--- a/debian/patches/system/icu.patch
+++ b/debian/patches/system/icu.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/v8/src/runtime/runtime-intl.cc
 +++ b/v8/src/runtime/runtime-intl.cc
-@@ -632,7 +632,11 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSele
+@@ -714,7 +714,11 @@ RUNTIME_FUNCTION(Runtime_PluralRulesSele
    return *isolate->factory()
                ->NewStringFromTwoByte(Vector<const uint16_t>(
                    reinterpret_cast<const uint16_t*>(
diff --git a/debian/patches/system/lcms2.patch b/debian/patches/system/lcms2.patch
index 1e33487..655fe8e 100644
--- a/debian/patches/system/lcms2.patch
+++ b/debian/patches/system/lcms2.patch
@@ -12,7 +12,7 @@ bug-debian: http://bugs.debian.org/879153
      "third_party:bigint",
      "third_party:pdfium_base",
    ]
-@@ -672,6 +673,7 @@ static_library("fpdfapi") {
+@@ -685,6 +686,7 @@ static_library("fpdftext") {
    configs += [ ":pdfium_core_config" ]
    deps = [
      ":fxcrt",
@@ -20,7 +20,7 @@ bug-debian: http://bugs.debian.org/879153
    ]
  }
  
-@@ -1087,6 +1089,7 @@ static_library("fxge") {
+@@ -1079,6 +1081,7 @@ static_library("fxge") {
  
    deps = [
      ":fxcrt",
diff --git a/debian/patches/system/nspr.patch b/debian/patches/system/nspr.patch
index abb4373..2f386fd 100644
--- a/debian/patches/system/nspr.patch
+++ b/debian/patches/system/nspr.patch
@@ -31,9 +31,9 @@ author: Michael Gilbert <mgilbert at debian.org>
        'base/third_party/icu/icu_utf.cc',
 -      'base/third_party/nspr/prtime.cc',
        'base/threading/post_task_and_reply_impl.cc',
+       'base/threading/scoped_blocking_call.cc',
        'base/threading/sequence_local_storage_map.cc',
-       'base/threading/sequenced_task_runner_handle.cc',
-@@ -674,7 +673,7 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -668,7 +667,7 @@ def write_gn_ninja(path, root_gen_dir, o
          'base/allocator/allocator_shim.cc',
          'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
        ])
@@ -44,7 +44,7 @@ author: Michael Gilbert <mgilbert at debian.org>
        ])
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -53,6 +53,9 @@ config("base_flags") {
+@@ -58,6 +58,9 @@ config("base_flags") {
        "-Wno-char-subscripts",
      ]
    }
@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert at debian.org>
  }
  
  config("base_implementation") {
-@@ -852,8 +855,6 @@ component("base") {
+@@ -851,8 +854,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 30732ef..414a2ab 100644
--- a/debian/patches/system/vpx.patch
+++ b/debian/patches/system/vpx.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
 
 --- a/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
 +++ b/third_party/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
-@@ -1171,9 +1171,6 @@ int VP8DecoderImpl::Decode(const Encoded
+@@ -1188,9 +1188,6 @@ int VP8DecoderImpl::Decode(const Encoded
  
    img = vpx_codec_get_frame(decoder_, &iter);
    int qp;
@@ -13,7 +13,7 @@ author: Michael Gilbert <mgilbert at debian.org>
    ret = ReturnFrame(img, input_image._timeStamp, input_image.ntp_time_ms_, qp);
    if (ret != 0) {
      // Reset to avoid requesting key frames too often.
-@@ -1227,8 +1224,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
+@@ -1244,8 +1241,9 @@ int VP8DecoderImpl::ReturnFrame(const vp
  
    VideoFrame decoded_image(buffer, timestamp, 0, kVideoRotation_0);
    decoded_image.set_ntp_time_ms(ntp_time_ms);
diff --git a/debian/rules b/debian/rules
index 62bcc45..d7c8096 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,12 +39,12 @@ defines+=is_debug=false \
          use_sysroot=false \
          use_openh264=false \
          use_kerberos=false \
-         use_vulcanize=false \
          use_custom_libcxx=false \
          use_gnome_keyring=false \
          use_unofficial_version_number=false \
          rtc_libvpx_build_vp9=false \
          treat_warnings_as_errors=false \
+         optimize_webui=false \
          enable_nacl=false \
          enable_nacl_nonsfi=false \
          enable_google_now=false \
@@ -64,6 +64,7 @@ defines+=use_gold=true \
          use_system_zlib=true \
          use_system_lcms2=true \
          use_system_freetype=true \
+         use_system_harfbuzz=true \
          optimize_for_size=true \
          proprietary_codecs=true \
          ffmpeg_branding=\"Chrome\" \
@@ -123,7 +124,7 @@ override_dh_auto_install-arch:
 	sed 's|@BUILD_DIST@|$(shell cat /etc/debian_version)|' \
 	    < debian/scripts/chromium > debian/chromium/usr/bin/chromium
 	# move icons into /usr/share
-	for file in $(shell find chrome/app/theme/chromium -name product_logo_[0-9]* -a ! -name *mono*); do \
+	for file in $(shell find chrome/app/theme -name product_logo_[0-9]*.png -a ! -name *mono*); do \
 	    ext=$$(echo $$file | cut -d\. -f2); \
 	    siz=$$(echo $$file | cut -d_ -f3 | sed s/\.$$ext//); \
 	    dst=debian/chromium/usr/share/icons/hicolor/$$siz\x$$siz/apps; \

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