[Pkg-chromium-commit] [pkg-chromium] 01/01: release 63.0.3239.84-1
Michael Gilbert
mgilbert at moszumanska.debian.org
Wed Jan 31 02:15:39 UTC 2018
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch experimental
in repository pkg-chromium.
commit 625a96d9c368400f1e0b19cdb74fbcc1d4860948
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Dec 3 20:48:40 2017 +0000
release 63.0.3239.84-1
---
debian/changelog | 10 ++++++++
debian/clean | 2 ++
debian/control | 3 +--
debian/master_preferences | 20 ++++++++++-----
debian/patches/disable/avatar-menu.patch | 15 +++++++++++
debian/patches/disable/welcome-page.patch | 15 +++++++++++
debian/patches/manpage-build.patch | 37 +++++++++++++++++++++++++++
debian/patches/series | 7 +++++
debian/patches/warnings/comment.patch | 19 ++++++++++++++
debian/patches/warnings/enum-boolean.patch | 18 +++++++++++++
debian/patches/warnings/unused-typedefs.patch | 14 ++++++++++
debian/rules | 16 ++++++------
12 files changed, 160 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ceef1c2..75c4ac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+chromium-browser (63.0.3239.84-1) unstable; urgency=medium
+
+ * New upstream stable release.
+ * Update standards version to 4.1.2.
+ * Stricter default master preferences.
+ * Avoid showing the welcome page (closes: #857767).
+ * Switch from gtk2 to gtk3 again (closes: #883364).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 03 Dec 2017 16:05:00 +0000
+
chromium-browser (63.0.3239.40-1) experimental; urgency=medium
* New upstream beta release.
diff --git a/debian/clean b/debian/clean
index 2f9633f..66a595f 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,6 +1,8 @@
debian/files
debian/scripts/mk-origtargz
+pstables.h
+
Makefile
third_party/flot/*.js
chrome/test/data/webui/i18n_process_css_test.html
diff --git a/debian/control b/debian/control
index 323ff79..f9a6585 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,6 @@ Build-Depends:
libjpeg-dev,
libxml2-dev,
libgtk-3-dev,
- libgtk2.0-dev,
libxslt1-dev,
liblcms2-dev,
libpulse-dev,
@@ -85,7 +84,7 @@ Build-Depends:
libgcrypt20-dev,
fonts-ipafont-gothic,
fonts-ipafont-mincho,
-Standards-Version: 4.1.1
+Standards-Version: 4.1.2
Package: chromium
Architecture: i386 amd64 arm64 armhf
diff --git a/debian/master_preferences b/debian/master_preferences
index 509e57e..6c79e0f 100644
--- a/debian/master_preferences
+++ b/debian/master_preferences
@@ -2,16 +2,16 @@
"distribution": {
"import_bookmarks": false,
"import_bookmarks_from_file": "/usr/share/chromium/initial_bookmarks.html",
- "skip_first_run_ui": true,
- "show_welcome_page": false,
- "suppress_first_run_default_browser_prompt": true,
"make_chrome_default": false,
"make_chrome_default_for_user": false,
+ "verbose_logging": true,
+ "skip_first_run_ui": true,
"create_all_shortcuts": true,
- "show_welcome_page": false
+ "suppress_first_run_default_browser_prompt": true
},
"browser": {
"show_home_button": true,
+ "has_seen_welcome_page" : true,
"check_default_browser" : false
},
"bookmark_bar": {
@@ -20,9 +20,17 @@
"safebrowsing": {
"enabled": false
},
+ "dns_prefetching": {
+ "enabled": false
+ },
"alternate_error_pages": {
"enabled": false
},
- "homepage": "http://www.debian.org",
- "AudioCaptureAllowed" : false
+ "hardware": {
+ "audio_capture_enabled": false
+ },
+ "default_apps": "noinstall",
+ "hide_web_store_icon": true,
+ "homepage_is_newtabpage": true,
+ "homepage": "https://www.debian.org"
}
diff --git a/debian/patches/disable/avatar-menu.patch b/debian/patches/disable/avatar-menu.patch
new file mode 100644
index 0000000..8e5f7c4
--- /dev/null
+++ b/debian/patches/disable/avatar-menu.patch
@@ -0,0 +1,15 @@
+description: remove the user profile (avatar) menu from the title bar
+author: Michael Gilbert <mgilbert at debian.org>
+upstream-bug: http://crbug.com/513899
+
+--- a/chrome/browser/profiles/avatar_menu.cc
++++ b/chrome/browser/profiles/avatar_menu.cc
+@@ -91,7 +91,7 @@ bool AvatarMenu::ShouldShowAvatarMenu()
+ // TODO: Eliminate this ifdef. Add a delegate interface for the menu which
+ // would also help remove the Browser dependency in AvatarMenuActions
+ // implementations.
+-#if defined(OS_CHROMEOS)
++#if 1
+ // On ChromeOS the menu will not be shown.
+ return false;
+ #else
diff --git a/debian/patches/disable/welcome-page.patch b/debian/patches/disable/welcome-page.patch
new file mode 100644
index 0000000..d0aa1eb
--- /dev/null
+++ b/debian/patches/disable/welcome-page.patch
@@ -0,0 +1,15 @@
+description: do not override the welcome page setting set in master_preferences
+author: Michael Gilbert <mgilbert at debian.org>
+bug-debian: http://bugs.debian.org/857767
+
+--- a/chrome/browser/profiles/profile_manager.cc
++++ b/chrome/browser/profiles/profile_manager.cc
+@@ -1012,7 +1012,7 @@ void ProfileManager::InitProfileUserPref
+ profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
+ supervised_user_id);
+ }
+-#if !defined(OS_ANDROID)
++#if 0
+ // TODO(pmonette): Fix IsNewProfile() to handle the case where the profile is
+ // new even if the "Preferences" file already existed. (For example: The
+ // master_preferences file is dumped into the default profile on first run,
diff --git a/debian/patches/manpage-build.patch b/debian/patches/manpage-build.patch
new file mode 100644
index 0000000..1f4e85e
--- /dev/null
+++ b/debian/patches/manpage-build.patch
@@ -0,0 +1,37 @@
+description: restore manpage build process
+origin: upstream chromium before version 63
+
+--- a/chrome/BUILD.gn
++++ b/chrome/BUILD.gn
+@@ -1762,6 +1762,31 @@ if (enable_resource_whitelist_generation
+ }
+
+ if (is_linux) {
++ action("manpage") {
++ name = "Chromium"
++ filename = "chromium-browser"
++ confdir = "chromium"
++
++ script = "//chrome/tools/build/linux/sed.py"
++ infile = "app/resources/manpage.1.in"
++ inputs = [
++ infile,
++ ]
++
++ outfile = "$root_out_dir/chromium.1"
++ outputs = [
++ outfile,
++ ]
++
++ args = [
++ rebase_path(infile, root_build_dir),
++ rebase_path(outfile, root_build_dir),
++ "-e s/@@NAME@@/$name/",
++ "-e s/@@FILENAME@@/$filename/",
++ "-e s/@@CONFDIR@@/$confdir/",
++ ]
++ }
++
+ if (is_official_build) {
+ action("linux_symbols") {
+ script = "//build/linux/dump_app_syms.py"
diff --git a/debian/patches/series b/debian/patches/series
index 3de42f7..43f7816 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
manpage.patch
+manpage-build.patch
master-preferences.patch
gn/parallel.patch
@@ -8,6 +9,8 @@ gn/buildflags.patch
disable/promo.patch
disable/signin.patch
disable/fuzzers.patch
+disable/avatar-menu.patch
+disable/welcome-page.patch
disable/google-api-warning.patch
disable/third-party-cookies.patch
disable/external-components.patch
@@ -23,6 +26,10 @@ fixes/widevine-revision.patch
fixes/connection-message.patch
fixes/chromedriver-revision.patch
+warnings/comment.patch
+warnings/enum-boolean.patch
+warnings/unused-typedefs.patch
+
system/icu.patch
system/vpx.patch
system/gtk2.patch
diff --git a/debian/patches/warnings/comment.patch b/debian/patches/warnings/comment.patch
new file mode 100644
index 0000000..1d4949d
--- /dev/null
+++ b/debian/patches/warnings/comment.patch
@@ -0,0 +1,19 @@
+description: fix gcc warning about a multi-line comment
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/content/browser/frame_host/render_frame_host_impl.h
++++ b/content/browser/frame_host/render_frame_host_impl.h
+@@ -997,11 +997,13 @@ class CONTENT_EXPORT RenderFrameHostImpl
+ // local roots which are under this frame and their first ancestor which is a
+ // local root is either this frame or this frame's local root. For instance,
+ // in a frame tree such as:
++ /*
+ // A0
+ // / | \
+ // B A1 E
+ // / / \ \
+ // D A2 C F
++ */
+ // RFHs at nodes B, E, D, C, and F are all local roots in the given frame tree
+ // under the root at A0, but only B, C, and E are considered immediate local
+ // roots of A0. Note that this will exclude any speculative or pending RFHs.
diff --git a/debian/patches/warnings/enum-boolean.patch b/debian/patches/warnings/enum-boolean.patch
new file mode 100644
index 0000000..17c9d7a
--- /dev/null
+++ b/debian/patches/warnings/enum-boolean.patch
@@ -0,0 +1,18 @@
+description: fix gcc warning about enum constant used in a boolean context
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/third_party/WebKit/Source/platform/wtf/text/TextCodec.h
++++ b/third_party/WebKit/Source/platform/wtf/text/TextCodec.h
+@@ -71,9 +71,9 @@ enum FlushBehavior {
+ kDataEOF
+ };
+
+-static_assert(!kDoNotFlush, "DoNotFlush should be falsy");
+-static_assert(kFetchEOF, "FetchEOF should be truthy");
+-static_assert(kDataEOF, "DataEOF should be truthy");
++static_assert(kDoNotFlush == 0, "DoNotFlush should be falsy");
++static_assert(kFetchEOF != 0, "FetchEOF should be truthy");
++static_assert(kDataEOF != 0, "DataEOF should be truthy");
+
+ class WTF_EXPORT TextCodec {
+ WTF_MAKE_NONCOPYABLE(TextCodec);
diff --git a/debian/patches/warnings/unused-typedefs.patch b/debian/patches/warnings/unused-typedefs.patch
new file mode 100644
index 0000000..7fff0c8
--- /dev/null
+++ b/debian/patches/warnings/unused-typedefs.patch
@@ -0,0 +1,14 @@
+description: fix typo in unused-local-typedefs flag
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/build/config/linux/atk/BUILD.gn
++++ b/build/config/linux/atk/BUILD.gn
+@@ -37,7 +37,7 @@ config("atk") {
+
+ cflags = [
+ # glib uses the pre-c++11 typedef-as-static_assert hack.
+- "-Wno-unused-local-typedef",
++ "-Wno-unused-local-typedefs",
+
+ # G_DEFINE_TYPE automatically generates a *get_instance_private
+ # inline function after glib 2.37. That's unused. Prevent to
diff --git a/debian/rules b/debian/rules
index 145a7a5..eca93d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,13 +27,11 @@ ifeq (arm64,$(DEB_HOST_ARCH))
defines+=host_cpu=\"arm64\"
endif
ifeq (armhf,$(DEB_HOST_ARCH))
-defines+=host_cpu=\"arm\" \
- arm_use_neon=false
+defines+=host_cpu=\"arm\" arm_use_neon=false
endif
# disabled features
defines+=is_debug=false \
- use_gtk3=false \
use_gconf=false \
use_ozone=false \
use_sysroot=false \
@@ -57,6 +55,7 @@ defines+=is_debug=false \
# enabled features
defines+=use_gold=true \
+ use_gtk3=true \
use_pulseaudio=true \
link_pulseaudio=true \
enable_widevine=true \
@@ -103,12 +102,13 @@ override_dh_auto_configure:
override_dh_auto_build-arch: out/Release/gn
./out/Release/gn gen out/Release --args="$(defines)"
ninja $(njobs) -C out/Release chrome chrome_sandbox content_shell chromedriver
- mv out/Release/chrome out/Release/chromium || true
- mv out/Release/chrome.1 out/Release/chromium.1 || true
- mv out/Release/content_shell out/Release/chromium-shell || true
- mv out/Release/chrome_sandbox out/Release/chrome-sandbox || true
- mv out/Release/locales/en-US.pak out/Release/resources || true
+ cp out/Release/chrome out/Release/chromium
+ cp out/Release/content_shell out/Release/chromium-shell
+ cp out/Release/chrome_sandbox out/Release/chrome-sandbox
+ cp out/Release/locales/en-US.pak out/Release/resources
chmod 4755 out/Release/chrome-sandbox # suid sandbox
+ sed -e s/@@PACKAGE@@/chromium/g -e s/@@MENUNAME@@/chromium/g \
+ < chrome/app/resources/manpage.1.in > out/Release/chromium.1
override_dh_auto_build-indep: out/Release/gn
./out/Release/gn gen out/Release --args="$(defines)"
--
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