[Pkg-chromium-commit] [pkg-chromium] 02/03: release 52.0.2743.82-4
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Aug 7 04:39:13 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 dc023866c5066b4744185b484511fb7857380f8b
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Jul 30 22:41:04 2016 +0000
release 52.0.2743.82-4
---
debian/changelog | 9 +++++++
debian/chromium.menu | 5 ----
debian/copyright | 4 +++
debian/default-flags | 3 +++
debian/patches/disable/extension-updater.patch | 14 +++++++++++
debian/patches/disable/external-components.patch | 2 ++
debian/patches/disable/pings.patch | 13 ++++++++++
debian/patches/series | 3 +++
debian/patches/system/harfbuzz.patch | 32 ++++++++++++++++++++++++
debian/rules | 3 ++-
10 files changed, 82 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d04d83e..ae5c96c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+chromium-browser (52.0.2743.82-4) unstable; urgency=medium
+
+ * Remove menu file.
+ * Build with fastbuild=2.
+ * Disable background networking features.
+ * Link against system harfbuzz library again.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 30 Jul 2016 21:25:30 +0000
+
chromium-browser (52.0.2743.82-3) unstable; urgency=medium
* Fix a few lintian warnings.
diff --git a/debian/chromium.menu b/debian/chromium.menu
deleted file mode 100644
index 18d5311..0000000
--- a/debian/chromium.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(chromium):needs="x11" section="Applications/Network/Web Browsing" \
- title="Chromium" \
- longtitle="Chromium Web Browser" \
- command="chromium" \
- icon="/usr/share/pixmaps/chromium.xpm"
diff --git a/debian/copyright b/debian/copyright
index 75f5c16..1cd307d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,8 +26,12 @@ Files-Excluded:
third_party/libxml/src
third_party/*rjsmin/bench
third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api
+ base/test/data
base/third_party/nspr
+# dirs that should be removed, but the jessie package still needs them
+# third_party/harfbuzz-ng/src
+
Files: debian/*
Copyright:
2009-2010 Fabien Tassin <fta at ubuntu.com>
diff --git a/debian/default-flags b/debian/default-flags
index f14cbd3..50f3abf 100644
--- a/debian/default-flags
+++ b/debian/default-flags
@@ -5,3 +5,6 @@ export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --show-component-extension-options"
# Don't use the GPU blacklist (bug #802933)
export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ignore-gpu-blacklist"
+
+# Disable background networking
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disable-background-networking"
diff --git a/debian/patches/disable/extension-updater.patch b/debian/patches/disable/extension-updater.patch
new file mode 100644
index 0000000..f9e0018
--- /dev/null
+++ b/debian/patches/disable/extension-updater.patch
@@ -0,0 +1,14 @@
+description: disable automatic extension updating
+
+--- a/chrome/browser/extensions/extension_system_impl.cc
++++ b/chrome/browser/extensions/extension_system_impl.cc
+@@ -186,8 +186,7 @@ void ExtensionSystemImpl::Shared::Init(b
+ // ExtensionService depends on RuntimeData.
+ runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
+
+- bool autoupdate_enabled = !profile_->IsGuestSession() &&
+- !profile_->IsSystemProfile();
++ bool autoupdate_enabled = false;
+ #if defined(OS_CHROMEOS)
+ if (!extensions_enabled)
+ autoupdate_enabled = false;
diff --git a/debian/patches/disable/external-components.patch b/debian/patches/disable/external-components.patch
index 0943afb..e1ca029 100644
--- a/debian/patches/disable/external-components.patch
+++ b/debian/patches/disable/external-components.patch
@@ -1,3 +1,5 @@
+description: disable loading external components
+
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -39,6 +39,9 @@ ExternalComponentLoader::~ExternalCompon
diff --git a/debian/patches/disable/pings.patch b/debian/patches/disable/pings.patch
new file mode 100644
index 0000000..75240f1
--- /dev/null
+++ b/debian/patches/disable/pings.patch
@@ -0,0 +1,13 @@
+description: disable pinging
+
+--- a/components/component_updater/configurator_impl.cc
++++ b/components/component_updater/configurator_impl.cc
+@@ -95,7 +95,7 @@ ConfiguratorImpl::ConfiguratorImpl(
+ cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",",
+ base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+ fast_update_ = HasSwitchValue(switch_values, kSwitchFastUpdate);
+- pings_enabled_ = !HasSwitchValue(switch_values, kSwitchDisablePings);
++ pings_enabled_ = false;
+ deltas_enabled_ = !HasSwitchValue(switch_values, kSwitchDisableDeltaUpdates);
+
+ #if defined(OS_WIN)
diff --git a/debian/patches/series b/debian/patches/series
index 685f6d8..e58fef1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,8 @@
manpage.patch
+disable/pings.patch
disable/promo.patch
+disable/extension-updater.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
disable/external-components.patch
@@ -20,3 +22,4 @@ system/nspr.patch
system/clang.patch
# system/vaapi.patch
system/ffmpeg.patch
+system/harfbuzz.patch
diff --git a/debian/patches/system/harfbuzz.patch b/debian/patches/system/harfbuzz.patch
new file mode 100644
index 0000000..21b5ce3
--- /dev/null
+++ b/debian/patches/system/harfbuzz.patch
@@ -0,0 +1,32 @@
+--- a/ui/gfx/harfbuzz_font_skia.h
++++ b/ui/gfx/harfbuzz_font_skia.h
+@@ -5,7 +5,7 @@
+ #ifndef UI_GFX_HARFBUZZ_FONT_SKIA_H_
+ #define UI_GFX_HARFBUZZ_FONT_SKIA_H_
+
+-#include "third_party/harfbuzz-ng/src/hb.h"
++#include <hb.h>
+ #include "third_party/skia/include/core/SkScalar.h"
+ #include "ui/gfx/font_render_params.h"
+
+--- a/ui/gfx/render_text_harfbuzz.h
++++ b/ui/gfx/render_text_harfbuzz.h
+@@ -13,7 +13,7 @@
+ #include "base/gtest_prod_util.h"
+ #include "base/macros.h"
+ #include "base/memory/scoped_vector.h"
+-#include "third_party/harfbuzz-ng/src/hb.h"
++#include <hb.h>
+ #include "third_party/icu/source/common/unicode/ubidi.h"
+ #include "third_party/icu/source/common/unicode/uscript.h"
+ #include "ui/gfx/render_text.h"
+--- a/ui/gfx/render_text_harfbuzz.cc
++++ b/ui/gfx/render_text_harfbuzz.cc
+@@ -17,7 +17,6 @@
+ #include "base/strings/utf_string_conversions.h"
+ #include "base/trace_event/trace_event.h"
+ #include "build/build_config.h"
+-#include "third_party/harfbuzz-ng/src/hb.h"
+ #include "third_party/icu/source/common/unicode/ubidi.h"
+ #include "third_party/icu/source/common/unicode/utf16.h"
+ #include "third_party/skia/include/core/SkColor.h"
diff --git a/debian/rules b/debian/rules
index ddf9d6f..cda2adf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ defines+=use_ozone=0 \
# enabled features
defines+=enable_hidpi=1 \
enable_webrtc=1 \
+ fastbuild=2 \
use_gio=1 \
use_gtk3=1 \
use_pulseaudio=1 \
@@ -67,6 +68,7 @@ defines+=use_system_re2=1 \
use_system_libxslt=1 \
use_system_jsoncpp=1 \
use_system_libevent=1 \
+ use_system_harfbuzz=1 \
use_system_xdg_utils=1 \
# enable proprietary codecs
@@ -85,7 +87,6 @@ defines+=use_system_icu=0 \
# defines+=remove_webcore_debug_symbols=1
# some notes about embedded libraries
-# use_system_harfbuzz=0 need to run unbundler
# use_system_libvpx=0 need to run unbundler
# use_system_sqlite=0 build fails
# can't use system nss since net/third_party/nss is heavily patched
--
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