...
 
Commits (29)
This diff is collapsed.
out/Release/chromium usr/lib/chromium
out/Release/chrome-sandbox usr/lib/chromium
out/Release/*.so usr/lib/chromium
out/Release/*.bin usr/lib/chromium
out/Release/*.pak usr/lib/chromium
out/Release/icudtl.dat usr/lib/chromium
......
build/secondary/third_party/libjpeg_turbo/BUILD.gn
third_party/libpng/BUILD.gn
third_party/libwebp/BUILD.gn
third_party/libxml/BUILD.gn
third_party/libxslt/BUILD.gn
third_party/yasm/yasm_assemble.gni
......@@ -48,6 +48,7 @@ Build-Depends:
libdrm-dev,
libusb-dev,
libicu-dev,
libffi-dev,
libkrb5-dev,
libexif-dev,
libudev-dev,
......
......@@ -3,7 +3,7 @@ description: set chromedriver version as undefined
--- a/chrome/test/chromedriver/embed_version_in_cpp.py
+++ b/chrome/test/chromedriver/embed_version_in_cpp.py
@@ -26,7 +26,7 @@ def main():
options, args = parser.parse_args()
options, _ = parser.parse_args()
version = open(options.version_file, 'r').read().strip()
- revision = lastchange.FetchVersionInfo(None).revision
......
description: use system clang compilers
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -5754,8 +5754,8 @@
['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
'and OS!="win"', {
'make_global_settings': [
- ['CC', '<(make_clang_dir)/bin/clang'],
- ['CXX', '<(make_clang_dir)/bin/clang++'],
+ ['CC', '/usr/bin/clang'],
+ ['CXX', '/usr/bin/clang++'],
['CC.host', '$(CC)'],
['CXX.host', '$(CXX)'],
],
--- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni
@@ -482,7 +482,7 @@ template("clang_toolchain") {
}
gcc_toolchain(target_name) {
- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+ prefix = "/usr/bin"
cc = "$prefix/clang"
cxx = "$prefix/clang++"
ld = cxx
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -401,7 +401,7 @@ config("compiler") {
# clang-cl (used if is_win) doesn't expose this flag.
# Currently disabled for nacl since its toolchain lacks this flag (too old).
# TODO(zforman): Once nacl's toolchain is updated, remove check.
- if (is_clang && is_linux) {
+ if (false) {
absolute_path = rebase_path("//.")
cflags += [ "-fdebug-prefix-map=$absolute_path=." ]
}
--- a/services/ui/public/cpp/gles2_context.cc
+++ b/services/ui/public/cpp/gles2_context.cc
@@ -46,7 +46,7 @@ bool GLES2Context::Initialize(
gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get();
gpu::GpuControl* gpu_control = command_buffer_proxy_impl_.get();
- constexpr gpu::SharedMemoryLimits default_limits;
+ constexpr gpu::SharedMemoryLimits default_limits{};
gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer));
if (!gles2_helper_->Initialize(default_limits.command_buffer_size))
return false;
--- a/chrome/common/extensions/chrome_extensions_client.h
+++ b/chrome/common/extensions/chrome_extensions_client.h
@@ -58,9 +58,9 @@ class ChromeExtensionsClient : public Ex
static ChromeExtensionsClient* GetInstance();
private:
- const ChromeAPIPermissions chrome_api_permissions_;
- const ExtensionsAPIPermissions extensions_api_permissions_;
- const ChromePermissionMessageProvider permission_message_provider_;
+ ChromeAPIPermissions chrome_api_permissions_;
+ ExtensionsAPIPermissions extensions_api_permissions_;
+ ChromePermissionMessageProvider permission_message_provider_;
// A whitelist of extensions that can script anywhere. Do not add to this
// list (except in tests) without consulting the Extensions team first.
--- a/services/ui/surfaces/surfaces_context_provider.cc
+++ b/services/ui/surfaces/surfaces_context_provider.cc
@@ -78,7 +78,7 @@ bool SurfacesContextProvider::BindToCurr
gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get();
gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer));
- constexpr gpu::SharedMemoryLimits default_limits;
+ constexpr gpu::SharedMemoryLimits default_limits{};
if (!gles2_helper_->Initialize(default_limits.command_buffer_size))
return false;
gles2_helper_->SetAutomaticFlushes(false);
......@@ -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
@@ -833,8 +833,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -804,8 +804,6 @@ void StartupBrowserCreatorImpl::AddInfoB
if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
!command_line_.HasSwitch(switches::kTestType)) {
chrome::ShowBadFlagsPrompt(browser);
......
......@@ -4,10 +4,10 @@ bug-debian: http://bugs.debian.org/634101
--- a/chrome/browser/ui/app_list/app_list_service.cc
+++ b/chrome/browser/ui/app_list/app_list_service.cc
@@ -154,7 +154,7 @@ void AppListService::RegisterPrefs(PrefR
// Identifies whether we should show the app launcher promo or not.
// Note that a field trial also controls the showing, so the promo won't show
// unless the pref is set AND the field trial is set to a proper group.
@@ -155,7 +155,7 @@ void AppListService::RegisterPrefs(PrefR
// Identifies whether we should show the app launcher promo or not. This
// becomes false when the user dismisses the promo.
- registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
+ registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
}
......
description: respect specified number of parallel jobs while bootstrapping gn
author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -102,6 +102,7 @@ def main(argv):
parser.add_option('--gn-gen-args', help='Args to pass to gn gen --args')
parser.add_option('-v', '--verbose', action='store_true',
help='Log more details')
+ parser.add_option('-j', '--jobs', help='Number of jobs')
options, args = parser.parse_args(argv)
if args:
@@ -186,6 +187,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir]
if options.verbose:
cmd.append('-v')
+ if options.jobs:
+ cmd.append('-j'+str(options.jobs))
if is_win:
cmd.append('gn.exe')
description: avoid dependence on gtk3
author: Michael Gilbert <mgilbert@debian.org>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -362,7 +362,9 @@ group("both_gn_and_gyp") {
if (is_linux && !is_chromeos && !is_chromecast && !use_ozone) {
# TODO(thomasanderson): Remove this once we build using
# GTK3 by default. (crbug.com/132847, crbug.com/79722)
+ if (use_gtk3) {
deps += [ "//chrome/browser/ui/libgtkui:libgtk3ui" ]
+ }
}
if (use_ozone) {
--- a/chrome/browser/ui/libgtkui/BUILD.gn
+++ b/chrome/browser/ui/libgtkui/BUILD.gn
@@ -135,6 +135,7 @@ component("libgtk2ui") {
]
}
+if (use_gtk3) {
component("libgtk3ui") {
sources = common_sources
configs += common_configs
@@ -148,3 +149,4 @@ component("libgtk3ui") {
"//chrome/browser:theme_properties",
]
}
+}
......@@ -40,14 +40,3 @@ Author: Daniel Echeverry <epsilon77@gmail.com>
<http://library.gnome.org/devel/gtk/stable/gtk-x11.html>
.SH ENVIRONMENT
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -127,7 +127,7 @@
}, { # else branding!="Chrome"
'variables': {
'name': 'Chromium',
- 'filename': 'chromium-browser',
+ 'filename': 'chromium',
'confdir': 'chromium',
},
}],
--- a/media/cast/logging/encoding_event_subscriber.cc
+++ b/media/cast/logging/encoding_event_subscriber.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include <cstring>
#include <utility>
+#include <algorithm>
#include "base/logging.h"
#include "media/cast/logging/proto/proto_utils.h"
Include system copy of prtime.h
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -598,8 +598,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',
- 'third_party/nspr/prtime.cc',
- 'third_party/nspr/prtime.h',
'third_party/superfasthash/superfasthash.c',
'third_party/xdg_mime/xdgmime.h',
'thread_task_runner_handle.cc',
--- a/base/time/pr_time_unittest.cc
+++ b/base/time/pr_time_unittest.cc
@@ -6,7 +6,7 @@
#include <time.h>
@@ -7,7 +7,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/third_party/nspr/prtime.h"
+#include <nspr/prtime.h>
#include "base/time/time.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
--- a/base/time/time.cc
+++ b/base/time/time.cc
@@ -13,7 +13,8 @@
#include "base/lazy_instance.h"
@@ -14,7 +14,7 @@
#include "base/logging.h"
#include "base/macros.h"
#include "base/strings/stringprintf.h"
-#include "base/third_party/nspr/prtime.h"
+
+#include <nspr/prtime.h>
#include "build/build_config.h"
namespace base {
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -466,7 +466,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',
- 'base/third_party/nspr/prtime.cc',
'base/threading/non_thread_safe_impl.cc',
'base/threading/post_task_and_reply_impl.cc',
'base/threading/sequenced_task_runner_handle.cc',
@@ -566,7 +565,7 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux:
- libs.extend(['-lrt', '-latomic'])
+ libs.extend(['-lrt', '-latomic', '-lnspr4'])
ldflags.extend(['-pthread'])
static_libraries['xdg_user_dirs'] = {
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -49,6 +49,9 @@ config("base_flags") {
"-Wno-char-subscripts",
]
}
+ ldflags = [
+ "-lnspr4",
+ ]
}
config("base_implementation") {
@@ -833,8 +836,6 @@ component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",
- "third_party/nspr/prtime.cc",
- "third_party/nspr/prtime.h",
"third_party/superfasthash/superfasthash.c",
"threading/non_thread_safe.h",
"threading/non_thread_safe_impl.cc",
description: use correct argument type for jessie's png12
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -65,7 +65,7 @@ inline sk_sp<SkColorSpace> readColorSpac
png_charp name = nullptr;
int compression = 0;
- png_bytep profile = nullptr;
+ png_charp profile = nullptr;
png_uint_32 length = 0;
if (png_get_iCCP(png, info, &name, &compression, &profile, &length)) {
return SkColorSpace::MakeICC(profile, length);
description: add ps printing capability
author: Salvatore Bonaccorso
--- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc
@@ -343,6 +343,7 @@ void PrintDialogGtk2::ShowDialog(
--- a/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
+++ b/chrome/browser/ui/libgtkui/print_dialog_gtk.cc
@@ -348,6 +348,7 @@ void PrintDialogGtk2::ShowDialog(
// Since we only generate PDF, only show printers that support PDF.
// TODO(thestig) Add more capabilities to support?
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
......
manpage.patch
gn.patch
clang.patch
clang3.5.patch
disable/promo.patch
disable/google-api-warning.patch
nspr.patch
prefs.patch
system-speech.patch
third-party-cookies-off-by-default.patch
ps-print.patch
chromedriver-revision.patch
missing-include.patch
webui.patch
gtk2.patch
webrtc.patch
webkit.patch
png12.patch
description: use system speex
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -879,6 +879,26 @@
],
},
{
+ 'target_name': 'speex',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags speex)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other speex)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l speex)',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
--- a/content/browser/speech/audio_encoder.cc
+++ b/content/browser/speech/audio_encoder.cc
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
#include "third_party/flac/include/FLAC/stream_encoder.h"
-#include "third_party/speex/include/speex/speex.h"
+#include <speex/speex.h>
namespace content {
namespace {
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1935,7 +1935,7 @@
['enable_web_speech==1', {
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
- '../third_party/speex/speex.gyp:libspeex',
+ '../build/linux/system.gyp:speex',
],
}],
['enable_web_speech==0 and OS=="android"', {
Description: Make default of third-party cookies the most secure for users.
Author: Chad Miller <chad.miller@canonical.com>
--- a/chrome/browser/content_settings/cookie_settings.cc
+++ b/chrome/browser/content_settings/cookie_settings.cc
@@ -68,7 +68,7 @@ void CookieSettings::Factory::RegisterPr
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -83,7 +83,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kBlockThirdPartyCookies,
- false,
+ true,
- prefs::kBlockThirdPartyCookies, false,
+ prefs::kBlockThirdPartyCookies, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
description: fix clang uninitialized const member error
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp
@@ -133,6 +133,7 @@ IDBTransaction::IDBTransaction(Execution
m_database(db),
m_openDBRequest(openDBRequest),
m_mode(WebIDBTransactionModeVersionChange),
+ m_scope(),
m_state(Inactive),
m_oldDatabaseMetadata(oldMetadata) {
DCHECK(m_database);
description: fix unique_ptr casting problem detected by clang
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc
+++ b/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc
@@ -407,12 +407,12 @@ std::unique_ptr<DesktopCapturer> Desktop
if (!options.x_display())
return nullptr;
- std::unique_ptr<ScreenCapturerLinux> capturer(new ScreenCapturerLinux());
- if (!capturer.get()->Init(options)) {
+ ScreenCapturerLinux *capturer = new ScreenCapturerLinux();
+ if (!capturer->Init(options)) {
return nullptr;
}
- return capturer;
+ return std::unique_ptr<DesktopCapturer>(capturer);
}
} // namespace webrtc
--- 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>
......@@ -12,82 +12,40 @@ export LDFLAGS+=-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--hash-si
# more verbose linker output
export LDFLAGS+=-Wl,--trace -Wl,--stats
# treat all warnings as errors
defines=werror=
# use clang instead of gcc
defines+=clang=1
defines+=clang_use_chrome_plugins=
defines=is_clang=true
defines+=clang_use_chrome_plugins=false
# set the appropriate cpu architecture
ifeq (i386,$(shell dpkg-architecture -qDEB_HOST_ARCH))
defines+=host_cpu=\"x86\"
endif
ifeq (amd64,$(shell dpkg-architecture -qDEB_HOST_ARCH))
defines+=host_cpu=\"x64\"
endif
# disabled features
defines+=use_ozone=0 \
use_gconf=0 \
use_allocator=none \
linux_breakpad=0 \
linux_use_libgps=0 \
linux_use_gold_flags=0 \
linux_use_bundled_gold=0 \
linux_use_bundled_binutils=0 \
remoting=0 \
disable_nacl=1 \
enable_remoting_host=0 \
defines+=is_debug=false \
use_gtk3=false \
use_ozone=false \
use_gconf=false \
use_sysroot=false \
use_gnome_keyring=false \
treat_warnings_as_errors=false \
enable_nacl=false \
enable_nacl_nonsfi=false \
enable_google_now=false \
enable_hangout_services_extension=false \
enable_iterator_debugging=false \
gold_path=\"\" \
linux_use_bundled_binutils=false \
# enabled features
defines+=enable_webrtc=1 \
use_gio=1 \
use_pulseaudio=1 \
use_gnome_keyring=1 \
linux_link_libpci=1 \
linux_link_gsettings=1 \
linux_link_libspeechd=1 \
linux_link_gnome_keyring=1 \
# system libraries to use
defines+=use_system_re2=1 \
use_system_yasm=1 \
use_system_opus=1 \
use_system_zlib=1 \
use_system_speex=1 \
use_system_expat=1 \
use_system_snappy=1 \
use_system_libpng=1 \
use_system_libxml=1 \
use_system_libjpeg=1 \
use_system_libwebp=1 \
use_system_libxslt=1 \
use_system_libsrtp=1 \
use_system_jsoncpp=1 \
use_system_libevent=1 \
use_system_harfbuzz=1 \
use_system_xdg_utils=1 \
# enable proprietary codecs
defines+=proprietary_codecs=1 \
ffmpeg_branding=Chrome \
# use embedded protobuf for now (bug #764911)
defines+=use_system_protobuf=0 \
# icu
defines+=use_system_icu=0 \
#icu_use_data_file_flag=0 \
#want_separate_host_toolset=0 \
# embedded libraries (0 is the default, so just making some notes about the issues)
# use_system_libusb=0 requires modified source that exposes libusb_interrupt_handle_event api
# use_system_libvpx=0 requires modified source that exposes different api
# use_system_sqlite=0 build fails
# use_system_ffmpeg=0 build fails
# can't use system nss since net/third_party/nss is heavily patched
# can't use system ots (open text *summarizer*) since that's not google's ots (open text *sanitizer*)
# make gyp a little more informative
options+=--check \
--debug=includes \
# avoid the need for a special src directory (--depth=. seems to require --no-parallel)
options+=--depth=. \
--no-parallel \
defines+=use_gio=true \
use_gold=true \
use_pulseaudio=true \
proprietary_codecs=true \
ffmpeg_branding=\"Chrome\" \
# handle parallel build options
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
......@@ -98,18 +56,20 @@ endif
flotpaths=/usr/share/javascript/jquery/*min.js \
/usr/share/javascript/jquery-flot/*min.js \
# files to exclude from the upstream tarball
excluded=native_client/NOTICE \
third_party/libsrtp/srtp/doc/rfc3711.txt \
%:
dh $@ --parallel
override_dh_auto_configure:
for file in $(flotpaths); do ln -sf $$file third_party/flot; done
GYP_DEFINES="$(defines)" ./build/gyp_chromium $(options)
# strip out system third_party libraries
./debian/scripts/unbundle
# build gn
./tools/gn/bootstrap/bootstrap.py -v -s $(njobs)
# configure
./out/Release/gn gen out/Release --args="$(defines)"
override_dh_auto_build:
./out/Release/gn gen out/Release --args="$(defines)"
ninja $(njobs) -C out/Release chrome chrome_sandbox chromedriver
mv out/Release/chrome out/Release/chromium || true
mv out/Release/chrome.1 out/Release/chromium.1 || true
......@@ -145,6 +105,7 @@ override_dh_auto_clean:
find . -name \*.pyc -execdir rm -rf {} \;
#find . -name config.sub -execdir rm -rf {} \;
#find . -name config.guess -execdir rm -rf {} \;
dh_auto_clean
###################### upstream source downloading ############################
......
#!/usr/bin/python3
import os
import sys
import shutil
sys.path.append("build/linux/unbundle")
import replace_gn_files
def strip(path):
if os.path.exists(path):
for filename in os.listdir(path):
remove=True
for extension in ('.py','.gn','.gni','google','chromium'):
if filename.endswith(extension):
remove=False
if remove:
removal=os.path.join(path,filename)
print('removing: %s'%removal)
if os.path.isdir(removal):
shutil.rmtree(removal)
else:
os.remove(removal)
replacements = ('libjpeg','libpng','libwebp','libxml','libxslt','yasm')
for lib,rule in replace_gn_files.REPLACEMENTS.items():
if lib in replacements:
# remove conflicting embedded third party source files
strip(os.path.dirname(rule))
strip(os.path.join('third_party',lib))
# remove the gn file that builds the embedded library
if os.path.lexists(rule):
os.remove(rule)
# create a symlink to the unbundle gn file
symlink = "ln -s "
path = os.path.split(rule)
while path[0] != '':
path = os.path.split(path[0])
symlink += '../'
symlink += "build/linux/unbundle/%s.gn %s"%(lib,rule)
if os.system(symlink):
raise RuntimeError("error creating symlink",symlink)
# libjpeg_turbo is unlike all the others, so clean it manually here
strip('third_party/libjpeg_turbo')