diff options
Diffstat (limited to 'www/qt5-webengine')
94 files changed, 541 insertions, 208 deletions
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index d99683e11d61..2292e6c9b373 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -20,7 +20,6 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -51,7 +50,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libwebp.so:graphics/webp DISTINFO_FILE= ${.CURDIR}/distinfo -QT5_VERSION= 5.12.1 +QT5_VERSION= 5.12.2 OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO diff --git a/www/qt5-webengine/distinfo b/www/qt5-webengine/distinfo index dc854a62208e..64a0316b729b 100644 --- a/www/qt5-webengine/distinfo +++ b/www/qt5-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549725518 -SHA256 (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0 -SIZE (KDE/Qt/5.12.1/qtwebengine-everywhere-src-5.12.1.tar.xz) = 249191844 +TIMESTAMP = 1553273996 +SHA256 (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 082b1d6e60c1be61881bc8533acc67d9688620d6b3a538417f62b27b34ead493 +SIZE (KDE/Qt/5.12.2/qtwebengine-everywhere-src-5.12.2.tar.xz) = 249240772 diff --git a/www/qt5-webengine/files/patch-config.tests-enable-on-FreeBSD b/www/qt5-webengine/files/patch-config.tests-enable-on-FreeBSD deleted file mode 100644 index c99904ce254d..000000000000 --- a/www/qt5-webengine/files/patch-config.tests-enable-on-FreeBSD +++ /dev/null @@ -1,15 +0,0 @@ ---- config.tests/khr/khr.pro.orig 2017-04-19 08:32:39 UTC -+++ config.tests/khr/khr.pro -@@ -3,4 +3,4 @@ - - CONFIG-=qt - --linux:SOURCES += khr.cpp -+SOURCES += khr.cpp ---- config.tests/snappy/snappy.pro.orig 2017-04-11 14:08:45 UTC -+++ config.tests/snappy/snappy.pro -@@ -1,3 +1,3 @@ --linux:SOURCES += snappy.cpp -+SOURCES += snappy.cpp - LIBS += -lsnappy - CONFIG -= qt diff --git a/www/qt5-webengine/files/patch-config.tests_khr_khr.pro b/www/qt5-webengine/files/patch-config.tests_khr_khr.pro new file mode 100644 index 000000000000..4a778d3d9a47 --- /dev/null +++ b/www/qt5-webengine/files/patch-config.tests_khr_khr.pro @@ -0,0 +1,8 @@ +--- config.tests/khr/khr.pro.orig 2018-11-27 04:10:38 UTC ++++ config.tests/khr/khr.pro +@@ -3,4 +3,4 @@ + + CONFIG-=qt + +-linux:SOURCES += khr.cpp ++unix:SOURCES += khr.cpp diff --git a/www/qt5-webengine/files/patch-config.tests_snappy_snappy.pro b/www/qt5-webengine/files/patch-config.tests_snappy_snappy.pro new file mode 100644 index 000000000000..8762cf1a6e8d --- /dev/null +++ b/www/qt5-webengine/files/patch-config.tests_snappy_snappy.pro @@ -0,0 +1,7 @@ +--- config.tests/snappy/snappy.pro.orig 2018-11-27 04:10:38 UTC ++++ config.tests/snappy/snappy.pro +@@ -1,3 +1,3 @@ +-linux:SOURCES += snappy.cpp ++unix:SOURCES += snappy.cpp + LIBS += -lsnappy + CONFIG -= qt diff --git a/www/qt5-webengine/files/patch-configure.pri b/www/qt5-webengine/files/patch-configure.pri new file mode 100644 index 000000000000..83112adb69f6 --- /dev/null +++ b/www/qt5-webengine/files/patch-configure.pri @@ -0,0 +1,14 @@ +--- configure.pri.orig 2018-11-27 04:10:38 UTC ++++ configure.pri +@@ -85,9 +85,9 @@ defineTest(qtConfTest_detectFlex) { + } + + defineTest(qtConfTest_detectGlibc) { +- ldd = $$qtConfFindInPath("ldd") ++ ldd = $$qtConfFindInPath("ld.bfd") + !isEmpty(ldd) { +- qtLog("Found ldd from path: $$ldd") ++ qtLog("Found ld.bfd from path: $$ldd") + qtRunLoggedCommand("$$ldd --version", version)|return(true) + version ~= 's/^.*[^0-9]\([0-9]*\.[0-9]*\).*$/\1/' + version = $$first(version) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc index fa9d14086533..2ada4a63c62c 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/debug/thread_heap_usage_tracker.cc.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/base/debug/thread_heap_usage_tracker.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/base/debug/thread_heap_usage_tracker.cc -@@ -14,11 +14,13 @@ +@@ -17,10 +17,12 @@ #include "base/threading/thread_local_storage.h" #include "build/build_config.h" @@ -9,8 +9,7 @@ #include <malloc/malloc.h> #else #include <malloc.h> - #endif +#endif + #endif namespace base { - namespace debug { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc index 7de1bbda90be..261fbfd49519 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/linux_util.cc.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/base/linux_util.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/base/linux_util.cc -@@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] = +@@ -111,12 +111,14 @@ char g_linux_distro[kDistroSize] = "CrOS"; #elif defined(OS_ANDROID) "Android"; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.cc index cc47b3687b14..b663e8c6d674 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/launch.cc.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/base/process/launch.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/base/process/launch.cc -@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul +@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default; LaunchOptions LaunchOptionsForTest() { LaunchOptions options; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc index 0700b130bb2b..e4f087044b4b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/base/process/launch_posix.cc -@@ -64,6 +64,7 @@ +@@ -65,6 +65,7 @@ #include "base/feature_list.h" #else extern char** environ; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__unittest.cc index af02e8a66c37..8e8ff9841ab1 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_unittest.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/base/profiler/stack_sampling_profiler_unittest.cc -@@ -31,7 +31,7 @@ +@@ -39,7 +39,7 @@ #include <intrin.h> #include <malloc.h> #include <windows.h> diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc index 69326def4b47..04c1e1b70841 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/security_unittest.cc.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/base/security_unittest.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/base/security_unittest.cc -@@ -74,7 +74,7 @@ bool IsTcMallocBypassed() { +@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h index ba734142e066..455a56311c14 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/threading/platform_thread.h.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/base/threading/platform_thread.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/base/threading/platform_thread.h -@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread { +@@ -217,7 +217,7 @@ class BASE_EXPORT PlatformThread { static ThreadPriority GetCurrentThreadPriority(); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc index c77c1dff866c..b093025e77df 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_posix.cc -@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) { +@@ -61,7 +61,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::ThreadRestrictions::SetSingletonAllowed(false); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_get__concurrent__links.py b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_get__concurrent__links.py index e4ad5262acbc..c1e6fae93cb7 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_get__concurrent__links.py +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_get__concurrent__links.py @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/build/toolchain/get_concurrent_links.py.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/build/toolchain/get_concurrent_links.py.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/build/toolchain/get_concurrent_links.py -@@ -45,6 +45,14 @@ def _GetTotalMemoryInBytes(): +@@ -46,6 +46,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: return 0 diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_layers_scrollbar__layer__impl__base.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_layers_scrollbar__layer__impl__base.cc index 2319e8e82a30..988ce4b9ac19 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_layers_scrollbar__layer__impl__base.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_layers_scrollbar__layer__impl__base.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/cc/layers/scrollbar_layer_impl_base.cc.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/cc/layers/scrollbar_layer_impl_base.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/cc/layers/scrollbar_layer_impl_base.cc -@@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput +@@ -210,8 +210,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect int thumb_offset = TrackStart(); if (maximum > 0) { float ratio = clamped_current_pos / maximum; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_trees_property__tree.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_trees_property__tree.cc index acf72fb6af65..b88e8a9c97b9 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_trees_property__tree.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_trees_property__tree.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/cc/trees/property_tree.cc.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/cc/trees/property_tree.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/cc/trees/property_tree.cc -@@ -1113,13 +1113,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO +@@ -1295,13 +1295,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro - gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id); + gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); - gfx::ScrollOffset max_offset( + gfx::ScrollOffset _max_offset( @@ -17,4 +17,4 @@ + return _max_offset; } - void ScrollTree::OnScrollOffsetAnimated(int layer_id, + void ScrollTree::OnScrollOffsetAnimated(ElementId id, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_input__ime_input__ime__api.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_input__ime_input__ime__api.h index d165c8fe497a..4c7b75dade4b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_input__ime_input__ime__api.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_input__ime_input__ime__api.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2017-01-26 00:49:08 UTC +--- src/3rdparty/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h -@@ -28,7 +28,7 @@ +@@ -31,7 +31,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc index 70e4ab372b89..599f558ca17a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2017-01-26 00:49:09 UTC +--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/chrome/common/chrome_paths.cc -@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePat +@@ -193,7 +193,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -9,7 +9,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -480,10 +480,12 @@ bool PathProvider(int key, base::FilePat +@@ -472,10 +472,12 @@ bool PathProvider(int key, base::FilePath* result) { if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -23,7 +23,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -534,7 +536,7 @@ bool PathProvider(int key, base::FilePat +@@ -526,7 +528,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -32,7 +32,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -548,6 +550,9 @@ bool PathProvider(int key, base::FilePat +@@ -540,6 +542,9 @@ bool PathProvider(int key, base::FilePath* result) { #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); @@ -42,7 +42,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -560,7 +565,7 @@ bool PathProvider(int key, base::FilePat +@@ -552,7 +557,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; @@ -50,4 +50,4 @@ +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: - if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) + if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h index 9baa579bf344..18d176f4badc 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/chrome_paths.h.orig 2017-01-26 00:49:09 UTC +--- src/3rdparty/chromium/chrome/common/chrome_paths.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/chrome/common/chrome_paths.h -@@ -49,7 +49,7 @@ enum { +@@ -51,7 +51,7 @@ enum { // to set policies for chrome. This directory // contains subdirectories. #endif @@ -9,7 +9,7 @@ defined(OS_MACOSX) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. -@@ -58,7 +58,7 @@ enum { +@@ -60,7 +60,7 @@ enum { // create it. #endif @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -112,7 +112,7 @@ enum { +@@ -111,7 +111,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h index 3fae54f11b05..119738e27b10 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/chrome_paths_internal.h.orig 2017-01-26 00:49:09 UTC +--- src/3rdparty/chromium/chrome/common/chrome_paths_internal.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/chrome/common/chrome_paths_internal.h -@@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::F +@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc index 13a088410487..eac52d7007d0 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc.orig 2017-01-26 00:49:11 UTC +--- src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc @@ -11,7 +11,7 @@ @@ -9,7 +9,7 @@ namespace { // Use the operating system's mechanisms to encrypt cookies before writing -@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegat +@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegate>::Destructor net::CookieCryptoDelegate* GetCookieCryptoDelegate() { return g_cookie_crypto_delegate.Pointer(); } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc index 71ad5583288a..b79cf25a8b9a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig 2017-01-26 00:49:11 UTC +--- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/flags_ui/flags_state.cc -@@ -544,7 +544,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -653,7 +653,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc index 00c1d7e3eecd..bda0d9ef3c7a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/json_schema/json_schema_validator.cc.orig 2017-01-26 00:49:11 UTC +--- src/3rdparty/chromium/components/json_schema/json_schema_validator.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/json_schema/json_schema_validator.cc @@ -21,7 +21,11 @@ #include "base/strings/stringprintf.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_keyed__service_core_dependency__graph__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_keyed__service_core_dependency__graph__unittest.cc index b95d02621378..8c2789392175 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_keyed__service_core_dependency__graph__unittest.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_keyed__service_core_dependency__graph__unittest.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/keyed_service/core/dependency_graph_unittest.cc.orig 2017-01-26 00:49:11 UTC +--- src/3rdparty/chromium/components/keyed_service/core/dependency_graph_unittest.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/keyed_service/core/dependency_graph_unittest.cc @@ -9,7 +9,11 @@ #include "components/keyed_service/core/dependency_graph.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc index dc4beaaa0b41..57273a9d7e44 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc.orig 2017-01-26 00:49:12 UTC +--- src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc @@ -4,7 +4,13 @@ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc index fea99313b8c6..15acf1e47ab3 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-01-26 00:49:12 UTC +--- src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc @@ -30,6 +30,7 @@ namespace metrics { UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) @@ -8,7 +8,7 @@ base::SystemMemoryInfoKB memory; if (!base::GetSystemMemoryInfo(&memory)) return; -@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStats +@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) { break; } } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc index 639816741f84..354a633ec8f4 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/password_manager/core/browser/import/csv_reader.cc.orig 2017-01-26 00:49:12 UTC +--- src/3rdparty/chromium/components/password_manager/core/browser/import/csv_reader.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/password_manager/core/browser/import/csv_reader.cc @@ -9,7 +9,11 @@ #include "base/logging.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc index c80bdd0f6eba..7a597b01049d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/components/update_client/update_query_params.cc.orig 2017-01-26 00:49:13 UTC +--- src/3rdparty/chromium/components/update_client/update_query_params.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/update_client/update_query_params.cc -@@ -31,6 +31,8 @@ const char kOs[] = - "linux"; +@@ -38,6 +38,8 @@ const char kOs[] = + "fuchsia"; #elif defined(OS_OPENBSD) "openbsd"; +#elif defined(OS_FREEBSD) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_regex__set__matcher.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_regex__set__matcher.cc index aed9000b28c8..09e3b8de29b2 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_regex__set__matcher.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_regex__set__matcher.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/components/url_matcher/regex_set_matcher.cc.orig 2017-01-26 00:49:13 UTC +--- src/3rdparty/chromium/components/url_matcher/regex_set_matcher.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/url_matcher/regex_set_matcher.cc -@@ -10,8 +10,13 @@ - #include "base/memory/ptr_util.h" +@@ -11,8 +11,13 @@ + #include "base/logging.h" #include "base/strings/string_util.h" #include "components/url_matcher/substring_set_matcher.h" +#if defined(OS_BSD) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_url__matcher__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_url__matcher__factory.cc index 9936a04158ec..230843338166 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_url__matcher__factory.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_url__matcher__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/url_matcher/url_matcher_factory.cc.orig 2017-01-26 00:49:13 UTC +--- src/3rdparty/chromium/components/url_matcher/url_matcher_factory.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/components/url_matcher/url_matcher_factory.cc @@ -16,7 +16,11 @@ #include "base/values.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc index 840877de3500..39c0cb2df18a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/content/browser/media/media_internals.cc.orig 2017-01-26 00:49:13 UTC +--- src/3rdparty/chromium/content/browser/media/media_internals.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/content/browser/media/media_internals.cc -@@ -755,7 +755,7 @@ void MediaInternals::UpdateVideoCaptureD +@@ -724,7 +724,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit device_dict->SetString("name", descriptor.GetNameAndModel()); - device_dict->Set("formats", format_list); + device_dict->Set("formats", std::move(format_list)); #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ - defined(OS_ANDROID) + defined(OS_ANDROID) || defined(OS_BSD) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.cc new file mode 100644 index 000000000000..c90e55d3885c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.cc @@ -0,0 +1,69 @@ +--- src/3rdparty/chromium/content/browser/webui/web_ui_data_source_impl.cc.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/content/browser/webui/web_ui_data_source_impl.cc +@@ -120,24 +120,24 @@ WebUIDataSourceImpl::WebUIDataSourceImpl(const std::st + WebUIDataSourceImpl::~WebUIDataSourceImpl() { + } + +-void WebUIDataSourceImpl::AddString(base::StringPiece name, ++void WebUIDataSourceImpl::AddString(const std::string& name, + const base::string16& value) { + // TODO(dschuyler): Share only one copy of these strings. + localized_strings_.SetKey(name, base::Value(value)); +- replacements_[name.as_string()] = base::UTF16ToUTF8(value); ++ replacements_[name] = base::UTF16ToUTF8(value); + } + +-void WebUIDataSourceImpl::AddString(base::StringPiece name, ++void WebUIDataSourceImpl::AddString(const std::string& name, + const std::string& value) { + localized_strings_.SetKey(name, base::Value(value)); +- replacements_[name.as_string()] = value; ++ replacements_[name] = value; + } + +-void WebUIDataSourceImpl::AddLocalizedString(base::StringPiece name, int ids) { ++void WebUIDataSourceImpl::AddLocalizedString(const std::string& name, int ids) { + std::string utf8_str = + base::UTF16ToUTF8(GetContentClient()->GetLocalizedString(ids)); + localized_strings_.SetKey(name, base::Value(utf8_str)); +- replacements_[name.as_string()] = utf8_str; ++ replacements_[name] = utf8_str; + } + + void WebUIDataSourceImpl::AddLocalizedStrings( +@@ -147,7 +147,7 @@ void WebUIDataSourceImpl::AddLocalizedStrings( + &replacements_); + } + +-void WebUIDataSourceImpl::AddBoolean(base::StringPiece name, bool value) { ++void WebUIDataSourceImpl::AddBoolean(const std::string& name, bool value) { + localized_strings_.SetBoolean(name, value); + // TODO(dschuyler): Change name of |localized_strings_| to |load_time_data_| + // or similar. These values haven't been found as strings for +@@ -156,21 +156,21 @@ void WebUIDataSourceImpl::AddBoolean(base::StringPiece + // replacements. + } + +-void WebUIDataSourceImpl::AddInteger(base::StringPiece name, int32_t value) { ++void WebUIDataSourceImpl::AddInteger(const std::string& name, int32_t value) { + localized_strings_.SetInteger(name, value); + } + +-void WebUIDataSourceImpl::SetJsonPath(base::StringPiece path) { ++void WebUIDataSourceImpl::SetJsonPath(const std::string& path) { + DCHECK(json_path_.empty()); + DCHECK(!path.empty()); + +- json_path_ = path.as_string(); ++ json_path_ = path; + excluded_paths_.insert(json_path_); + } + +-void WebUIDataSourceImpl::AddResourcePath(base::StringPiece path, ++void WebUIDataSourceImpl::AddResourcePath(const std::string& path, + int resource_id) { +- path_to_idr_map_[path.as_string()] = resource_id; ++ path_to_idr_map_[path] = resource_id; + } + + void WebUIDataSourceImpl::SetDefaultResource(int resource_id) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.h new file mode 100644 index 000000000000..f88e86cb0127 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__data__source__impl.h @@ -0,0 +1,25 @@ +--- src/3rdparty/chromium/content/browser/webui/web_ui_data_source_impl.h.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/content/browser/webui/web_ui_data_source_impl.h +@@ -31,15 +31,15 @@ class CONTENT_EXPORT WebUIDataSourceImpl : public URLD + public WebUIDataSource { + public: + // WebUIDataSource implementation: +- void AddString(base::StringPiece name, const base::string16& value) override; +- void AddString(base::StringPiece name, const std::string& value) override; +- void AddLocalizedString(base::StringPiece name, int ids) override; ++ void AddString(const std::string& name, const base::string16& value) override; ++ void AddString(const std::string& name, const std::string& value) override; ++ void AddLocalizedString(const std::string& name, int ids) override; + void AddLocalizedStrings( + const base::DictionaryValue& localized_strings) override; +- void AddBoolean(base::StringPiece name, bool value) override; +- void AddInteger(base::StringPiece name, int32_t value) override; +- void SetJsonPath(base::StringPiece path) override; +- void AddResourcePath(base::StringPiece path, int resource_id) override; ++ void AddBoolean(const std::string& name, bool value) override; ++ void AddInteger(const std::string& name, int32_t value) override; ++ void SetJsonPath(const std::string& path) override; ++ void AddResourcePath(const std::string& path, int resource_id) override; + void SetDefaultResource(int resource_id) override; + void SetRequestFilter( + const WebUIDataSource::HandleRequestCallback& callback) override; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.cc new file mode 100644 index 000000000000..1064f100a95c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/content/browser/webui/web_ui_impl.cc.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/content/browser/webui/web_ui_impl.cc +@@ -249,9 +249,9 @@ void WebUIImpl::CallJavascriptFunctionUnsafe( + ExecuteJavascript(GetJavascriptCall(function_name, args)); + } + +-void WebUIImpl::RegisterMessageCallback(base::StringPiece message, ++void WebUIImpl::RegisterMessageCallback(const std::string& message, + const MessageCallback& callback) { +- message_callbacks_.emplace(message.as_string(), callback); ++ message_callbacks_.insert(std::make_pair(message, callback)); + } + + void WebUIImpl::ProcessWebUIMessage(const GURL& source_url, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.h new file mode 100644 index 000000000000..5fa6c0a79724 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__impl.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/webui/web_ui_impl.h.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/content/browser/webui/web_ui_impl.h +@@ -52,7 +52,7 @@ class CONTENT_EXPORT WebUIImpl : public WebUI, + int GetBindings() const override; + void SetBindings(int bindings) override; + void AddMessageHandler(std::unique_ptr<WebUIMessageHandler> handler) override; +- void RegisterMessageCallback(base::StringPiece message, ++ void RegisterMessageCallback(const std::string& message, + const MessageCallback& callback) override; + void ProcessWebUIMessage(const GURL& source_url, + const std::string& message, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui.h new file mode 100644 index 000000000000..cf54ac9ca2bc --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui.h @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/content/public/browser/web_ui.h.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/content/public/browser/web_ui.h +@@ -11,7 +11,6 @@ + + #include "base/callback.h" + #include "base/strings/string16.h" +-#include "base/strings/string_piece.h" + #include "content/common/content_export.h" + #include "ui/base/page_transition_types.h" + +@@ -75,7 +74,7 @@ class CONTENT_EXPORT WebUI { + // Used by WebUIMessageHandlers. If the given message is already registered, + // the call has no effect. + using MessageCallback = base::RepeatingCallback<void(const base::ListValue*)>; +- virtual void RegisterMessageCallback(base::StringPiece message, ++ virtual void RegisterMessageCallback(const std::string& message, + const MessageCallback& callback) = 0; + + // This is only needed if an embedder overrides handling of a WebUIMessage and diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui__data__source.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui__data__source.h new file mode 100644 index 000000000000..08a2e29f3ee1 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_browser_web__ui__data__source.h @@ -0,0 +1,51 @@ +--- src/3rdparty/chromium/content/public/browser/web_ui_data_source.h.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/content/public/browser/web_ui_data_source.h +@@ -13,7 +13,6 @@ + + #include "base/callback.h" + #include "base/strings/string16.h" +-#include "base/strings/string_piece.h" + #include "content/common/content_export.h" + + namespace base { +@@ -45,33 +44,33 @@ class WebUIDataSource { + std::unique_ptr<base::DictionaryValue> update); + + // Adds a string keyed to its name to our dictionary. +- virtual void AddString(base::StringPiece name, ++ virtual void AddString(const std::string& name, + const base::string16& value) = 0; + + // Adds a string keyed to its name to our dictionary. +- virtual void AddString(base::StringPiece name, const std::string& value) = 0; ++ virtual void AddString(const std::string& name, const std::string& value) = 0; + + // Adds a localized string with resource |ids| keyed to its name to our + // dictionary. +- virtual void AddLocalizedString(base::StringPiece name, int ids) = 0; ++ virtual void AddLocalizedString(const std::string& name, int ids) = 0; + + // Add strings from |localized_strings| to our dictionary. + virtual void AddLocalizedStrings( + const base::DictionaryValue& localized_strings) = 0; + + // Adds a boolean keyed to its name to our dictionary. +- virtual void AddBoolean(base::StringPiece name, bool value) = 0; ++ virtual void AddBoolean(const std::string& name, bool value) = 0; + + // Adds a signed 32-bit integer keyed to its name to our dictionary. Larger + // integers may not be exactly representable in JavaScript. See + // MAX_SAFE_INTEGER in /v8/src/globals.h. +- virtual void AddInteger(base::StringPiece name, int32_t value) = 0; ++ virtual void AddInteger(const std::string& name, int32_t value) = 0; + + // Sets the path which will return the JSON strings. +- virtual void SetJsonPath(base::StringPiece path) = 0; ++ virtual void SetJsonPath(const std::string& path) = 0; + + // Adds a mapping between a path name and a resource to return. +- virtual void AddResourcePath(base::StringPiece path, int resource_id) = 0; ++ virtual void AddResourcePath(const std::string& path, int resource_id) = 0; + + // Sets the resource to returned when no other paths match. + virtual void SetDefaultResource(int resource_id) = 0; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_child__process__host.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_child__process__host.h index 1959d0ca15b2..30c14957e506 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_child__process__host.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_child__process__host.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/child_process_host.h.orig 2017-01-26 00:49:13 UTC +--- src/3rdparty/chromium/content/public/common/child_process_host.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/content/public/common/child_process_host.h -@@ -53,7 +53,7 @@ class CONTENT_EXPORT ChildProcessHost : +@@ -45,7 +45,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // No special behavior requested. CHILD_NORMAL = 0, @@ -9,7 +9,7 @@ // Indicates that the child execed after forking may be execced from // /proc/self/exe rather than using the "real" app path. This prevents // autoupdate from confusing us if it changes the file out from under us. -@@ -62,7 +62,7 @@ class CONTENT_EXPORT ChildProcessHost : +@@ -54,7 +54,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // gdb). In this case, you'd use GetChildPath to get the real executable // file name, and then prepend the GDB command to the command line. CHILD_ALLOW_SELF = 1 << 0, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc index c539966a7e5e..9800bc96ba0c 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2017-01-26 00:49:13 UTC +--- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/content/public/common/content_switches.cc -@@ -992,7 +992,7 @@ const char kDisableVaapiAcceleratedVideo - "disable-vaapi-accelerated-video-encode"; +@@ -978,7 +978,7 @@ const char kDisableAudioSupportForDesktopShare[] = + const char kDisablePanelFitting[] = "disable-panel-fitting"; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h index bf7aec6a9e14..1dc251a70fd1 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2017-01-26 00:49:13 UTC +--- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/content/public/common/content_switches.h -@@ -293,7 +293,7 @@ CONTENT_EXPORT extern const char kDisabl - CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; +@@ -277,7 +277,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[ + CONTENT_EXPORT extern const char kDisablePanelFitting[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h index 9d1b5462ec35..ef8286b1ffae 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/public/common/renderer_preferences.h.orig 2017-01-26 00:49:13 UTC +--- src/3rdparty/chromium/content/public/common/renderer_preferences.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/content/public/common/renderer_preferences.h -@@ -139,7 +139,7 @@ struct CONTENT_EXPORT RendererPreference +@@ -137,7 +137,7 @@ struct CONTENT_EXPORT RendererPreferences { // Country iso of the mobile network for content detection purpose. std::string network_contry_iso; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc index 7ba65a4769e9..b1b240e7cfc8 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-01-26 00:49:13 UTC +--- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc -@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf +@@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ } bool RendererMainPlatformDelegate::EnableSandbox() { @@ -8,7 +8,7 @@ // The setuid sandbox is started in the zygote process: zygote_main_linux.cc // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md // -@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::Enabl +@@ -65,7 +66,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { CHECK_EQ(errno, EPERM); } #endif // __x86_64__ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc index de94c9848207..62bb73f50c1d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2017-02-02 02:02:54 UTC +--- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/device/gamepad/gamepad_provider.cc -@@ -145,7 +145,7 @@ void GamepadProvider::Initialize(std::un +@@ -187,7 +187,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep monitor->AddDevicesChangedObserver(this); polling_thread_.reset(new base::Thread("Gamepad polling thread")); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc index cbd42fdb4af1..7ab5b5621625 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2017-01-26 00:49:14 UTC +--- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_event_router_factory.cc @@ -13,6 +13,7 @@ @@ -8,7 +8,7 @@ // static NetworkingPrivateEventRouter* NetworkingPrivateEventRouterFactory::GetForProfile( -@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory +@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory::ServiceIsCre bool NetworkingPrivateEventRouterFactory::ServiceIsNULLWhileTesting() const { return true; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc index d5a59a331a58..38d2d0154409 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/common/image_util.cc.orig 2017-01-26 00:49:14 UTC +--- src/3rdparty/chromium/extensions/common/image_util.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/extensions/common/image_util.cc @@ -11,7 +11,11 @@ #include "base/strings/string_number_conversions.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_stack__frame.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_stack__frame.cc index 5d3230a2213c..440872172dfa 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_stack__frame.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_stack__frame.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/extensions/common/stack_frame.cc.orig 2017-01-26 00:49:14 UTC +--- src/3rdparty/chromium/extensions/common/stack_frame.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/extensions/common/stack_frame.cc @@ -7,7 +7,11 @@ #include <string> diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h index 6687841c533b..a02c3aba19eb 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2017-01-26 00:49:15 UTC +--- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ipc/ipc_channel.h -@@ -245,7 +245,7 @@ class IPC_EXPORT Channel : public Sender +@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn index 350150fc7907..9d7d3686afd4 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/BUILD.gn.orig 2018-06-21 14:13:32 UTC +--- src/3rdparty/chromium/media/BUILD.gn.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/media/BUILD.gn -@@ -53,6 +53,9 @@ config("media_config") { +@@ -63,6 +63,9 @@ config("media_config") { if (use_cras) { defines += [ "USE_CRAS" ] } @@ -9,4 +9,4 @@ + } } - config("media_implementation") { + # Internal grouping of the configs necessary to support sub-folders having their diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc index efeac4656ee1..86332f519852 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC +--- src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc -@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetD +@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto #elif defined(OS_MACOSX) command_line_file_path.value(), kFileVideoCaptureDeviceName, VideoCaptureApi::MACOSX_AVFOUNDATION diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc index 6422b6f5a0d9..696404fb1b21 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2017-01-26 00:49:15 UTC +--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc -@@ -193,7 +193,7 @@ void VideoCaptureDeviceClient::OnIncomin +@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h index 001a3ba00d29..ccd6c25d8e32 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/filters/vp9_parser.h.orig 2017-01-26 00:49:15 UTC +--- src/3rdparty/chromium/media/filters/vp9_parser.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/media/filters/vp9_parser.h @@ -14,6 +14,7 @@ @@ -7,4 +7,4 @@ +#include <unistd.h> #include <sys/types.h> - #include <deque> + #include <memory> diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.cc index 2c7f44f21075..c8962872b7a5 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/formats/common/offset_byte_queue.cc.orig 2017-01-26 00:49:15 UTC +--- src/3rdparty/chromium/media/formats/common/offset_byte_queue.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/media/formats/common/offset_byte_queue.cc -@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off +@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin *size = tail() - offset; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.h index 5cc88cf1316b..c08998cf397a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/formats/common/offset_byte_queue.h.orig 2017-01-26 00:49:15 UTC +--- src/3rdparty/chromium/media/formats/common/offset_byte_queue.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/media/formats/common/offset_byte_queue.h @@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue { // a null |buf| and a |size| of zero. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__adts.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__adts.cc index eb78cce4250a..9d13bffdd8ff 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__adts.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__adts.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/formats/mp2t/es_parser_adts.cc.orig 2017-01-26 00:49:15 UTC +--- src/3rdparty/chromium/media/formats/mp2t/es_parser_adts.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/media/formats/mp2t/es_parser_adts.cc -@@ -54,11 +54,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts +@@ -63,11 +63,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr const uint8_t* es; es_queue_->Peek(&es, &es_size); @@ -15,7 +15,7 @@ const uint8_t* cur_buf = &es[offset]; if (!isAdtsSyncWord(cur_buf)) continue; -@@ -96,7 +96,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts +@@ -107,7 +107,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr return true; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__mpeg1audio.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__mpeg1audio.cc index d2e6fe3af12a..abee8bf25b40 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__mpeg1audio.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__mpeg1audio.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2017-01-26 00:49:15 UTC +--- src/3rdparty/chromium/media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/media/formats/mp2t/es_parser_mpeg1audio.cc -@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud +@@ -108,11 +108,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( const uint8_t* es; es_queue_->Peek(&es, &es_size); @@ -15,7 +15,7 @@ const uint8_t* cur_buf = &es[offset]; if (cur_buf[0] != 0xff) continue; -@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud +@@ -153,7 +153,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( return true; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni index 6562aa209f71..2f6341d092ef 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni @@ -1,12 +1,12 @@ ---- src/3rdparty/chromium/media/media_options.gni.orig 2018-06-21 14:06:20 UTC +--- src/3rdparty/chromium/media/media_options.gni.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/media/media_options.gni -@@ -53,6 +53,9 @@ declare_args() { - +@@ -99,6 +99,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false -+ -+ # Enables runtime selection of sndio library for audio. -+ use_sndio = false ++ # Enables runtime selection of sndio library for audio. ++ use_sndio = false ++ # Alsa should be used on non-Android, non-Mac POSIX systems. # Alsa should be used on desktop Chromecast and audio-only Chromecast builds. + if (is_posix && !is_android && !is_mac && diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h index 3eb43666a35f..b4a69b80d847 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/base/address_tracker_linux.h.orig 2017-01-26 00:49:16 UTC +--- src/3rdparty/chromium/net/base/address_tracker_linux.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/net/base/address_tracker_linux.h @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ @@ -13,13 +13,13 @@ #include <stddef.h> #include <map> -@@ -34,8 +36,11 @@ namespace internal { - class NET_EXPORT_PRIVATE AddressTrackerLinux : - public base::MessageLoopForIO::Watcher { +@@ -34,8 +36,12 @@ namespace internal { + class NET_EXPORT_PRIVATE AddressTrackerLinux + : public base::MessagePumpForIO::FdWatcher { public: +#if !defined(__FreeBSD__) typedef std::map<IPAddress, struct ifaddrmsg> AddressMap; -- + +#else + typedef void* AddressMap; +#endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux__unittest.cc index 9e15151cf15f..da8abb68297c 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux__unittest.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux__unittest.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/base/address_tracker_linux_unittest.cc.orig 2017-01-26 00:49:16 UTC +--- src/3rdparty/chromium/net/base/address_tracker_linux_unittest.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/net/base/address_tracker_linux_unittest.cc @@ -4,7 +4,11 @@ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h index e50013a86881..ba4d5877166f 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/net/base/network_change_notifier.h.orig 2017-01-26 00:49:16 UTC +--- src/3rdparty/chromium/net/base/network_change_notifier.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/net/base/network_change_notifier.h -@@ -26,7 +26,7 @@ struct NetworkInterface; +@@ -22,7 +22,7 @@ class NetworkChangeNotifierFactory; + struct NetworkInterface; typedef std::vector<NetworkInterface> NetworkInterfaceList; - class URLRequest; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) namespace internal { class AddressTrackerLinux; } -@@ -332,7 +332,7 @@ class NET_EXPORT NetworkChangeNotifier { +@@ -348,7 +348,7 @@ class NET_EXPORT NetworkChangeNotifier { // a large HOSTS file. static void GetDnsConfig(DnsConfig* config); @@ -18,7 +18,7 @@ // Returns the AddressTrackerLinux if present. static const internal::AddressTrackerLinux* GetAddressTracker(); #endif -@@ -488,7 +488,7 @@ class NET_EXPORT NetworkChangeNotifier { +@@ -499,7 +499,7 @@ class NET_EXPORT NetworkChangeNotifier { const NetworkChangeCalculatorParams& params = NetworkChangeCalculatorParams()); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix__unittest.cc index 5028a8af4e37..04823baa0fe8 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix__unittest.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix__unittest.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/dns/dns_config_service_posix_unittest.cc.orig 2017-01-26 00:49:16 UTC +--- src/3rdparty/chromium/net/dns/dns_config_service_posix_unittest.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/net/dns/dns_config_service_posix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc index 5969e2a6e0d9..14e2c63dc34d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/net/dns/dns_reloader.cc.orig 2017-01-26 00:49:16 UTC +--- src/3rdparty/chromium/net/dns/dns_reloader.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/net/dns/dns_reloader.cc @@ -7,6 +7,10 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ - !defined(OS_ANDROID) + !defined(OS_ANDROID) && !defined(OS_FUCHSIA) +#if defined(OS_FREEBSD) +#include <netinet/in.h> diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc index 8273b9ae5c59..3d468c0fbe88 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/socket/socks5_client_socket.cc.orig 2017-01-26 00:49:16 UTC +--- src/3rdparty/chromium/net/socket/socks5_client_socket.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/net/socket/socks5_client_socket.cc @@ -4,6 +4,10 @@ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_file__io__resource.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_file__io__resource.cc index 66881cbb641f..b56b3bd50e7f 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_file__io__resource.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_file__io__resource.cc @@ -1,13 +1,11 @@ ---- src/3rdparty/chromium/ppapi/proxy/file_io_resource.cc.orig 2017-01-26 00:49:16 UTC +--- src/3rdparty/chromium/ppapi/proxy/file_io_resource.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ppapi/proxy/file_io_resource.cc -@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of +@@ -285,17 +285,17 @@ int32_t FileIOResource::Write(int64_t offset, if (check_quota_) { int64_t increase = 0; - uint64_t max_offset = 0; + uint64_t _max_offset = 0; -+ // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD -+ // which also defines max_offset bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0; if (append) { increase = bytes_to_write; @@ -24,7 +22,7 @@ } if (increase > 0) { -@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t of +@@ -319,7 +319,7 @@ int32_t FileIOResource::Write(int64_t offset, if (append) append_mode_write_amount_ += bytes_to_write; else @@ -33,7 +31,7 @@ } } return WriteValidated(offset, buffer, bytes_to_write, callback); -@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuota +@@ -597,9 +597,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( } else { DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_cups__config__helper.py b/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_cups__config__helper.py index 12d4249093ac..b32236b37bec 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_cups__config__helper.py +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_cups__config__helper.py @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/printing/cups_config_helper.py.orig 2017-01-26 00:49:17 UTC +--- src/3rdparty/chromium/printing/cups_config_helper.py.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/printing/cups_config_helper.py @@ -65,7 +65,7 @@ def main(): mode = sys.argv[1] diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_ex__data.c b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_ex__data.c index 305f4c866b62..85c2b36fb20e 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_ex__data.c +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_ex__data.c @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/boringssl/src/crypto/ex_data.c.orig 2017-01-26 00:50:08 UTC +--- src/3rdparty/chromium/third_party/boringssl/src/crypto/ex_data.c.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/third_party/boringssl/src/crypto/ex_data.c -@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *a +@@ -186,7 +186,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index, } } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn index d4a2069f4a4d..cbcc7cbeab8a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn.orig 2017-01-26 00:50:10 UTC +--- src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn -@@ -6,8 +6,13 @@ import("ffmpeg_options.gni") - import("ffmpeg_generated.gni") +@@ -9,8 +9,13 @@ import("//build/buildflag_header.gni") + import("//build/config/sanitizers/sanitizers.gni") # Path to platform configuration files. -platform_config_root = diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_mem.c b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_mem.c index 0514ea56d4eb..c73c1db7f8a3 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_mem.c +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_mem.c @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/ffmpeg/libavutil/mem.c.orig 2017-01-26 00:50:11 UTC +--- src/3rdparty/chromium/third_party/ffmpeg/libavutil/mem.c.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/third_party/ffmpeg/libavutil/mem.c @@ -32,9 +32,6 @@ #include <stdint.h> diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libyuv_include_libyuv_row.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libyuv_include_libyuv_row.h index 35b236afb92f..fe82422bfe20 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libyuv_include_libyuv_row.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_libyuv_include_libyuv_row.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/third_party/libyuv/include/libyuv/row.h.orig 2017-01-26 00:50:13 UTC +--- src/3rdparty/chromium/third_party/libyuv/include/libyuv/row.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/third_party/libyuv/include/libyuv/row.h -@@ -161,10 +161,14 @@ extern "C" { +@@ -157,10 +157,14 @@ extern "C" { #define HAS_ARGBSHADEROW_SSE2 #define HAS_ARGBSUBTRACTROW_SSE2 #define HAS_ARGBUNATTENUATEROW_SSE2 @@ -15,7 +15,7 @@ #define HAS_RGBCOLORTABLEROW_X86 #define HAS_SOBELROW_SSE2 #define HAS_SOBELTOPLANEROW_SSE2 -@@ -211,7 +215,9 @@ extern "C" { +@@ -206,7 +210,9 @@ extern "C" { #define HAS_I422TORGB565ROW_AVX2 #define HAS_I422TORGBAROW_AVX2 #define HAS_I444TOARGBROW_AVX2 @@ -25,7 +25,7 @@ #define HAS_J422TOARGBROW_AVX2 #define HAS_MERGEUVROW_AVX2 #define HAS_MIRRORROW_AVX2 -@@ -234,7 +240,9 @@ extern "C" { +@@ -231,7 +237,9 @@ extern "C" { #define HAS_ARGBMULTIPLYROW_AVX2 #define HAS_ARGBSUBTRACTROW_AVX2 #define HAS_ARGBUNATTENUATEROW_AVX2 diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_logging.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_logging.h index eed4e653b6e9..c337a163e6c0 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_logging.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_logging.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/pdfium/third_party/base/logging.h.orig 2017-01-26 00:50:15 UTC +--- src/3rdparty/chromium/third_party/pdfium/third_party/base/logging.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/third_party/pdfium/third_party/base/logging.h @@ -10,7 +10,7 @@ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_images_SkJpegEncoder.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_images_SkJpegEncoder.cpp new file mode 100644 index 000000000000..c96249972698 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_images_SkJpegEncoder.cpp @@ -0,0 +1,41 @@ +--- src/3rdparty/chromium/third_party/skia/src/images/SkJpegEncoder.cpp.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/third_party/skia/src/images/SkJpegEncoder.cpp +@@ -77,9 +77,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr + return transform_scanline_to_premul_legacy; + }; + ++#ifdef JCS_EXTENSIONS + J_COLOR_SPACE jpegColorType = JCS_EXT_RGBA; ++#else ++ J_COLOR_SPACE jpegColorType = JCS_RGB; ++#endif + int numComponents = 0; + switch (srcInfo.colorType()) { ++#ifdef JCS_EXTENSIONS + case kRGBA_8888_SkColorType: + fProc = chooseProc8888(); + jpegColorType = JCS_EXT_RGBA; +@@ -90,6 +95,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr + jpegColorType = JCS_EXT_BGRA; + numComponents = 4; + break; ++#endif + case kRGB_565_SkColorType: + fProc = transform_scanline_565; + jpegColorType = JCS_RGB; +@@ -109,6 +115,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr + jpegColorType = JCS_GRAYSCALE; + numComponents = 1; + break; ++#ifdef JCS_EXTENSIONS + case kRGBA_F16_SkColorType: + if (!srcInfo.colorSpace()) { + return false; +@@ -124,6 +131,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr + jpegColorType = JCS_EXT_RGBA; + numComponents = 4; + break; ++#endif + default: + return false; + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkFontHost__FreeType.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkFontHost__FreeType.cpp new file mode 100644 index 000000000000..46dae73b2fff --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_ports_SkFontHost__FreeType.cpp @@ -0,0 +1,77 @@ +--- src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp +@@ -112,8 +112,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) + : fGetVarDesignCoordinates(nullptr) + , fGetVarAxisFlags(nullptr) + , fLibrary(nullptr) +- , fIsLCDSupported(false) +- , fLCDExtra(0) + { + if (FT_New_Library(&gFTMemory, &fLibrary)) { + return; +@@ -173,12 +171,7 @@ class FreeTypeLibrary : SkNoncopyable { (public) + } + #endif + +- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs. +- // The default has changed over time, so this doesn't mean the same thing to all users. +- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) { +- fIsLCDSupported = true; +- fLCDExtra = 2; //Using a filter adds one full pixel to each side. +- } ++ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT); + } + ~FreeTypeLibrary() { + if (fLibrary) { +@@ -187,8 +180,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) + } + + FT_Library library() { return fLibrary; } +- bool isLCDSupported() { return fIsLCDSupported; } +- int lcdExtra() { return fLCDExtra; } + + // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1. + // Prior to this there was no way to get the coordinates out of the FT_Face. +@@ -205,8 +196,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) + + private: + FT_Library fLibrary; +- bool fIsLCDSupported; +- int fLCDExtra; + + // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. + // The following platforms provide FreeType of at least 2.4.0. +@@ -704,17 +693,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR + rec->fTextSize = SkIntToScalar(1 << 14); + } + +- if (isLCD(*rec)) { +- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr. +- SkAutoMutexAcquire ama(gFTMutex); +- ref_ft_library(); +- if (!gFTLibrary->isLCDSupported()) { +- // If the runtime Freetype library doesn't support LCD, disable it here. +- rec->fMaskFormat = SkMask::kA8_Format; +- } +- unref_ft_library(); +- } +- + SkPaint::Hinting h = rec->getHinting(); + if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) { + // collapse full->normal hinting if we're not doing LCD +@@ -1109,11 +1087,11 @@ bool SkScalerContext_FreeType::getCBoxForLetter(char l + void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { + if (isLCD(fRec)) { + if (fLCDIsVert) { +- glyph->fHeight += gFTLibrary->lcdExtra(); +- glyph->fTop -= gFTLibrary->lcdExtra() >> 1; ++ glyph->fHeight += 2; ++ glyph->fTop -= 1; + } else { +- glyph->fWidth += gFTLibrary->lcdExtra(); +- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1; ++ glyph->fWidth += 2; ++ glyph->fLeft -= 1; + } + } + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc index ecf843cadb6c..c21a4a7ca54d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2017-01-26 00:50:17 UTC +--- src/3rdparty/chromium/third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -13,6 +13,7 @@ #include <string.h> diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_ime__engine__handler__interface.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_ime__engine__handler__interface.h index 5ac7d45e6f3c..fc352f9c1ab3 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_ime__engine__handler__interface.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_ime__engine__handler__interface.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/base/ime/ime_engine_handler_interface.h.orig 2017-01-26 00:49:31 UTC +--- src/3rdparty/chromium/ui/base/ime/ime_engine_handler_interface.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/base/ime/ime_engine_handler_interface.h -@@ -138,7 +138,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle +@@ -162,7 +162,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface { // Hides the input view window (from API call). virtual void HideInputView() = 0; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc index fa1381203987..4f02c6ed4a2c 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/event_switches.cc.orig 2017-01-26 00:49:31 UTC +--- src/3rdparty/chromium/ui/events/event_switches.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/events/event_switches.cc -@@ -28,7 +28,7 @@ const char kTouchEventsDisabled[] = "dis +@@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = "enable-scroll- const char kCompensateForUnstablePinchZoom[] = "compensate-for-unstable-pinch-zoom"; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h index 9872d158bb7a..c5b1f56cbaec 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_event__switches.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/events/event_switches.h.orig 2017-01-26 00:49:31 UTC +--- src/3rdparty/chromium/ui/events/event_switches.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/events/event_switches.h -@@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTo - EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[]; +@@ -14,7 +14,7 @@ namespace switches { + EVENTS_BASE_EXPORT extern const char kEnableScrollPrediction[]; EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) EVENTS_BASE_EXPORT extern const char kTouchDevices[]; + EVENTS_BASE_EXPORT extern const char kPenDevices[]; #endif - diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc index e44861926c42..6969fb348f67 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_events_keycodes_dom_keycode__converter.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc.orig 2017-01-26 00:49:31 UTC +--- src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/events/keycodes/dom/keycode_converter.cc -@@ -19,7 +19,7 @@ namespace { +@@ -20,7 +20,7 @@ namespace { // and DOM Level 3 |code| strings. #if defined(OS_WIN) #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, win, code} diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc index 139c9dbcd65c..8657dab86396 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig 2017-01-26 00:49:31 UTC +--- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/gfx/canvas_skia.cc -@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithShadows(c +@@ -208,7 +208,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_jpeg__codec.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_jpeg__codec.cc new file mode 100644 index 000000000000..860cb26bd51b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_jpeg__codec.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc +@@ -219,6 +219,7 @@ bool JPEGCodec::Decode(const unsigned char* input, siz + case JCS_GRAYSCALE: + case JCS_RGB: + case JCS_YCbCr: ++#ifdef JCS_EXTENSIONS + // Choose an output colorspace and return if it is an unsupported one. + // Same as JPEGCodec::Encode(), libjpeg-turbo supports all input formats + // used by Chromium (i.e. RGBA and BGRA) and we just map the input +@@ -237,6 +238,9 @@ bool JPEGCodec::Decode(const unsigned char* input, siz + NOTREACHED() << "Invalid pixel format"; + return false; + } ++#else ++ cinfo.out_color_space = JCS_RGB; ++#endif + break; + case JCS_CMYK: + case JCS_YCCK: diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc index f6a90659ebbe..a7be0fc6b551 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__fallback__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc.orig 2017-01-26 00:49:31 UTC +--- src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/gfx/font_fallback_linux.cc @@ -15,6 +15,10 @@ #include "base/memory/ptr_util.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text.cc index fcb09dd611cb..d62797e78114 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_render__text.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/render_text.cc.orig 2017-01-26 00:49:31 UTC +--- src/3rdparty/chromium/ui/gfx/render_text.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/gfx/render_text.cc -@@ -972,32 +972,33 @@ void RenderText::SetDisplayOffset(int ho +@@ -942,32 +942,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_bubble_bubble__dialog__delegate.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_bubble_bubble__dialog__delegate.cc index 8a0cd3b0946f..c90137a013a2 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_bubble_bubble__dialog__delegate.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_bubble_bubble__dialog__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/bubble/bubble_dialog_delegate.cc.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/views/bubble/bubble_dialog_delegate.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/views/bubble/bubble_dialog_delegate.cc -@@ -73,7 +73,7 @@ Widget* BubbleDialogDelegateView::Create +@@ -107,7 +107,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( // the parent frame and let DWM handle compositing. If not, then we don't // want to allow the bubble to extend the frame because it will be clipped. bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled()); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc index 7311a806f52a..ac6f7ec58f6f 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc @@ -34,7 +34,7 @@ const int kCursorOffsetY = 15; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc index d1e6576eec89..c451b062e321 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/examples/widget_example.cc.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/views/examples/widget_example.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/views/examples/widget_example.cc -@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(Vi +@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container) BuildButton(container, "Popup widget", POPUP); BuildButton(container, "Dialog widget", DIALOG); BuildButton(container, "Modal Dialog", MODAL_DIALOG); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_selection__controller.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_selection__controller.cc index 3b73d930f207..0a0f7c8290e9 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_selection__controller.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_selection__controller.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/selection_controller.cc.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/views/selection_controller.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/views/selection_controller.cc -@@ -20,7 +20,7 @@ SelectionController::SelectionController +@@ -20,7 +20,7 @@ SelectionController::SelectionController(SelectionCont delegate_(delegate), handles_selection_clipboard_(false) { // On Linux, update the selection clipboard on a text selection. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc index f46e32a00b07..caa9e8ef7390 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/views/views_delegate.cc -@@ -71,7 +71,7 @@ HICON ViewsDelegate::GetDefaultWindowIco +@@ -87,7 +87,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const { bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { return false; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h index 9753558704f4..50d47039e256 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/views/views_delegate.h -@@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -155,7 +155,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc index baddd0c23fbf..887245427563 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/window/custom_frame_view.cc.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/views/window/custom_frame_view.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/views/window/custom_frame_view.cc -@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderH +@@ -301,7 +301,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc index de432c082de6..d8fa4d4bae13 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/views/window/dialog_delegate.cc -@@ -56,7 +56,7 @@ Widget::InitParams DialogDelegate::GetDi +@@ -65,7 +65,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit params.bounds = bounds; DialogDelegate* dialog = delegate->AsDialogDelegate(); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js index f09470f09e56..6739d86d59b9 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/ui/webui/resources/js/cr.js.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/webui/resources/js/cr.js.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/webui/resources/js/cr.js -@@ -451,6 +451,11 @@ var cr = cr || function() { - get doc() { +@@ -456,6 +456,11 @@ var cr = cr || function() { return document; }, -+ + + /** Whether this is on *BSD. */ + get isBSD() { + return /BSD/.test(navigator.userAgent); + }, - ++ /** Whether we are using a Mac or not. */ get isMac() { + return /Mac/.test(navigator.platform); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_icon.js b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_icon.js index 5d02fa115850..98b334e87ec7 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_icon.js +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_webui_resources_js_icon.js @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/webui/resources/js/icon.js.orig 2017-01-26 00:49:32 UTC +--- src/3rdparty/chromium/ui/webui/resources/js/icon.js.orig 2018-11-13 18:25:11 UTC +++ src/3rdparty/chromium/ui/webui/resources/js/icon.js @@ -14,7 +14,7 @@ cr.define('cr.icon', function() { // supports SCALE_FACTOR_100P on all non-iOS platforms. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_log-utils.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_log-utils.h index 184418f7c87a..aeff5d09a4cd 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_log-utils.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_log-utils.h @@ -1,8 +1,8 @@ ---- src/3rdparty/chromium/v8/src/log-utils.h.orig 2017-12-15 19:24:49.335089000 -0500 -+++ src/3rdparty/chromium/v8/src/log-utils.h 2017-12-15 19:25:08.702391000 -0500 -@@ -14,6 +14,8 @@ - #include "src/base/platform/mutex.h" +--- src/3rdparty/chromium/v8/src/log-utils.h.orig 2018-11-13 18:25:11 UTC ++++ src/3rdparty/chromium/v8/src/log-utils.h +@@ -15,6 +15,8 @@ #include "src/flags.h" + #include "src/ostreams.h" +#include <stdarg.h> + diff --git a/www/qt5-webengine/files/patch-src_buildtools_buildtools.pro b/www/qt5-webengine/files/patch-src_buildtools_buildtools.pro index 532560daff57..c6eeffd54dd2 100644 --- a/www/qt5-webengine/files/patch-src_buildtools_buildtools.pro +++ b/www/qt5-webengine/files/patch-src_buildtools_buildtools.pro @@ -1,4 +1,4 @@ ---- src/buildtools/buildtools.pro +--- src/buildtools/buildtools.pro.orig 2018-11-27 04:10:38 UTC +++ src/buildtools/buildtools.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs @@ -8,4 +8,3 @@ # configure_host.pro and configure_target.pro are phony pro files that # extract things like compiler and linker from qmake. # Only used on Linux as it is only important for cross-building and alternative compilers. - diff --git a/www/qt5-webengine/files/patch-src_tools_qwebengine__convert__dict_qwebengine__convert__dict.pro b/www/qt5-webengine/files/patch-src_tools_qwebengine__convert__dict_qwebengine__convert__dict.pro index be594cae9d83..7817669d3ac2 100644 --- a/www/qt5-webengine/files/patch-src_tools_qwebengine__convert__dict_qwebengine__convert__dict.pro +++ b/www/qt5-webengine/files/patch-src_tools_qwebengine__convert__dict_qwebengine__convert__dict.pro @@ -1,9 +1,6 @@ -Extend another Linux check to FreeBSD, so that the right parameters are passed -to the linker. - ---- src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro +--- src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro.orig 2018-11-27 04:10:38 UTC +++ src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro -@@ -12,7 +12,7 @@ isEmpty(NINJA_LFLAGS): error("Missing linker flags from QtWebEngineCore linking +@@ -12,7 +12,7 @@ isEmpty(NINJA_LFLAGS): error("Missing linker flags fro isEmpty(NINJA_ARCHIVES): error("Missing archive files from QtWebEngineCore linking pri") isEmpty(NINJA_LIBS): error("Missing library files from QtWebEngineCore linking pri") OBJECTS = $$eval($$list($$NINJA_OBJECTS)) |