Commit 977274e6 authored by Michael Gilbert's avatar Michael Gilbert

release 52.0.2743.82-3

parent 33944a5c
chromium-browser (52.0.2743.82-3) unstable; urgency=medium
* Fix a few lintian warnings.
* Use gtk3 backend instead of gtk2.
* Launch as a single process when debugging to get useful symbol info.
-- Michael Gilbert <mgilbert@debian.org> Sat, 30 Jul 2016 04:07:46 +0000
chromium-browser (52.0.2743.82-2) unstable; urgency=medium
* Bump standards version.
......
Makefile
third_party/flot/*.js
chrome/test/data/webui/i18n_process_css_test.html
......@@ -32,10 +32,9 @@ Build-Depends:
libegl1-mesa-dev,
libgles2-mesa-dev,
mesa-common-dev,
libgtk2.0-dev,
libglib2.0-dev,
libxt-dev,
libre2-dev,
libgbm-dev,
libpng-dev,
libxss-dev,
libelf-dev,
......@@ -54,6 +53,7 @@ Build-Depends:
libsrtp-dev,
libjpeg-dev,
libxml2-dev,
libgtk-3-dev,
libxslt1-dev,
libpulse-dev,
libpam0g-dev,
......@@ -62,6 +62,7 @@ Build-Depends:
libavutil-dev,
libavcodec-dev (>= 7:3.0),
libavformat-dev,
libglib2.0-dev,
libasound2-dev,
libsqlite3-dev,
libjsoncpp-dev,
......@@ -134,5 +135,3 @@ Description: web browser - WebDriver support
.
This package provides a bridge between the browser component and the selenium
automatic webdriver.
.
See http://code.google.com/p/selenium/wiki/ChromeDriver for details.
......@@ -12,6 +12,7 @@ Files-Excluded:
*config.guess
*jquery*.min.js
tools/emacs
tools/perf/page_sets/tough_scheduling_cases/*.min.js
native_client/NOTICE
third_party/cld
third_party/android*
......@@ -7488,9 +7489,6 @@ Files: webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp webkit/tools
Copyright: Copyright (c) 2010 The Chromium Authors.
License: BSD-3-clause
License: BSD-3-clause
See /usr/share/common-licenses/BSD.
License: GPL-2+
See /usr/share/common-licenses/GPL-2.
......@@ -7506,10 +7504,37 @@ License: LGPL-2.1+
License: Apache-2.0
See /usr/share/common-licenses/Apache-2.0.
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
.
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
License: FreeBSD (guessed)
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
are met:
1. Redistributions of source code must retain the above copyright
notice(s), this list of conditions and the following disclaimer as
the first lines of this file unmodified other than the possible
......@@ -8107,33 +8132,32 @@ License: harfbuzz-License
License: Apple-license
IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
consideration of your agreement to the following terms, and your use, installation,
modification or redistribution of this Apple software constitutes acceptance of these
terms. If you do not agree with these terms, please do not use, install, modify or
consideration of your agreement to the following terms, and your use, installation,
modification or redistribution of this Apple software constitutes acceptance of these
terms. If you do not agree with these terms, please do not use, install, modify or
redistribute this Apple software.
.
In consideration of your agreement to abide by the following terms, and subject to these
terms, Apple grants you a personal, non-exclusive license, under Apple<D5>s copyrights in
this original Apple software (the "Apple Software"), to use, reproduce, modify and
redistribute the Apple Software, with or without modifications, in source and/or binary
forms; provided that if you redistribute the Apple Software in its entirety and without
modifications, you must retain this notice and the following text and disclaimers in all
such redistributions of the Apple Software. Neither the name, trademarks, service marks
or logos of Apple Computer, Inc. may be used to endorse or promote products derived from
In consideration of your agreement to abide by the following terms, and subject to these
terms, Apple grants you a personal, non-exclusive license, under Apple<D5>s copyrights in
this original Apple software (the "Apple Software"), to use, reproduce, modify and
redistribute the Apple Software, with or without modifications, in source and/or binary
forms; provided that if you redistribute the Apple Software in its entirety and without
modifications, you must retain this notice and the following text and disclaimers in all
such redistributions of the Apple Software. Neither the name, trademarks, service marks
or logos of Apple Computer, Inc. may be used to endorse or promote products derived from
the Apple Software without specific prior written permission from Apple. Except as expressly
stated in this notice, no other rights or licenses, express or implied, are granted by Apple
herein, including but not limited to any patent rights that may be infringed by your
herein, including but not limited to any patent rights that may be infringed by your
derivative works or by other works in which the Apple Software may be incorporated.
.
The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO WARRANTIES,
EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT,
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS
The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO WARRANTIES,
EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT,
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS
USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
.
IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,
REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND
WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR
IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,
REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND
WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR
OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
description: avoid gtk2 includes
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -106,6 +106,10 @@
}],
],
},
+ ],
+ }],
+ [ 'use_gtk3==0', {
+ 'targets': [
{
'target_name': 'gdk',
'type': 'none',
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -69,7 +69,7 @@
'../build/linux/system.gyp:xtst',
],
}],
- ['chromeos==0 and use_ozone==0', {
+ ['chromeos==0 and use_ozone==0 and use_gtk3==0', {
'dependencies': [
# use GTK on Linux, even for Aura builds.
'../build/linux/system.gyp:gtk2',
@@ -650,7 +650,7 @@
'host/it2me/it2me_native_messaging_host_main.h',
],
'conditions': [
- ['OS=="linux" and chromeos==0 and use_ozone==0', {
+ ['OS=="linux" and chromeos==0 and use_ozone==0 and use_gtk3==0', {
'dependencies': [
# Always use GTK on Linux, even for Aura builds.
'../build/linux/system.gyp:gtk2',
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1719,7 +1719,7 @@
}, { # Everything but desktop Linux.
'sources': [ '<@(chrome_interactive_ui_test_non_desktop_linux_sources)' ],
}],
- ['OS=="linux" and chromeos==0 and use_ozone==0', {
+ ['OS=="linux" and chromeos==0 and use_ozone==0 and use_gtk3==0', {
'sources': [ 'browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc' ],
'dependencies': [ '../build/linux/system.gyp:gtk2' ],
}],
--- a/gpu/gles2_conform_support/gles2_conform_test.gyp
+++ b/gpu/gles2_conform_support/gles2_conform_test.gyp
@@ -130,7 +130,7 @@
'conditions': [
['OS=="linux"', {
'conditions': [
- [ 'chromeos==0', {
+ [ 'chromeos==0 and use_gtk3==0', {
'dependencies': ['../../build/linux/system.gyp:gtk2']
}],
],
description: better integration with gtk3 themes
origin: https://bugs.archlinux.org/task/47682
--- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc
@@ -138,6 +138,11 @@ SkColor GetBGColor(GtkWidget* widget, Wi
gtk_widget_get_style_context(widget), stateMap[state], &color);
G_GNUC_END_IGNORE_DEPRECATIONS
+ if (color.alpha == 0.0)
+ gtk_style_context_get_background_color(
+ gtk_widget_get_style_context(gtk_widget_get_toplevel(widget)),
+ stateMap[state], &color);
+
// Hack for default color
if (color.alpha == 0.0)
color = {1, 1, 1, 1};
@@ -510,8 +515,11 @@ GtkWidget* NativeThemeGtk2::GetEntry() c
GtkWidget* NativeThemeGtk2::GetLabel() const {
static GtkWidget* fake_label = NULL;
- if (!fake_label)
+ if (!fake_label) {
fake_label = gtk_label_new("");
+ gtk_style_context_add_class(
+ gtk_widget_get_style_context(fake_label), "gtkstyle-fallback");
+ }
return fake_label;
}
description: remove references to missing third_party/khronos_glcts dir
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -595,7 +595,6 @@
'../chrome/chrome.gyp:performance_browser_tests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
- '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_test',
'../gpu/gpu.gyp:gl_tests',
'../gpu/gpu.gyp:angle_unittests',
'../gpu/gpu.gyp:gpu_unittests',
@@ -622,7 +621,6 @@
'../chrome/chrome.gyp:chrome',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
- '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_test',
'../gpu/gpu.gyp:gl_tests',
'../gpu/gpu.gyp:angle_unittests',
'../gpu/gpu.gyp:gpu_unittests',
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -384,7 +384,6 @@
'../extensions/extensions_tests.gyp:extensions_unittests',
'../gin/gin.gyp:gin_shell',
'../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test', # TODO(GYP) crbug.com/471920
- '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_test', # TODO(GYP) crbug.com/471903 to make this complete.
'../ipc/ipc.gyp:ipc_perftests',
'../mojo/mojo_base.gyp:mojo_common_unittests',
'../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma',
......@@ -6,6 +6,10 @@ disable/third-party-cookies.patch
disable/external-components.patch
disable/default-browser-warning.patch
gtk3.patch
gtk3theme.patch
khronos.patch
ps-print.patch
gpu-timeout.patch
master-preferences.patch
......@@ -16,5 +20,3 @@ system/nspr.patch
system/clang.patch
# system/vaapi.patch
system/ffmpeg.patch
webui.patch
--- a/chrome/test/data/webui_test_resources.grd
+++ b/chrome/test/data/webui_test_resources.grd
@@ -8,7 +8,6 @@
</outputs>
<release seq="1">
<includes>
- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
</includes>
</release>
</grit>
......@@ -43,6 +43,7 @@ defines+=use_ozone=0 \
defines+=enable_hidpi=1 \
enable_webrtc=1 \
use_gio=1 \
use_gtk3=1 \
use_pulseaudio=1 \
use_gnome_keyring=1 \
linux_link_libpci=1 \
......@@ -66,7 +67,6 @@ 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,6 +85,7 @@ 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
......@@ -111,7 +112,11 @@ flotpaths=/usr/share/javascript/jquery/*min.js \
dh $@ --parallel
override_dh_auto_configure:
# 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
# configure
GYP_DEFINES="$(defines)" ./build/gyp_chromium $(options)
override_dh_auto_build-arch:
......
......@@ -86,7 +86,7 @@ if [ $want_debug -eq 1 ] ; then
fi
tmpfile=`mktemp /tmp/chromiumargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
echo "set args $CHROMIUM_FLAGS ${1+"$@"}" > $tmpfile
echo "set args $CHROMIUM_FLAGS --single-process ${1+"$@"}" > $tmpfile
echo "# Env:"
echo "# LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
echo "# PATH=$PATH"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment