diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2017-05-03 13:26:51 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2017-05-03 13:26:51 -0300 |
| commit | ad78354fdf2012d5cad519f1aeb9fd7b0baefcc5 (patch) | |
| tree | 792d95f4889a896e0233ed61b9e0c2d8396ad5be | |
| parent | 0ab6edbc213b13c14f547c7a3d2f638ce1061967 (diff) | |
| parent | 466d5086c13b3c5ce0297c4e8fe5158b4db0e4ef (diff) | |
| download | FreeBSD-ports-2.3.4.zip FreeBSD-ports-2.3.4.tar.gz | |
Merge remote-tracking branch 'origin/branches/2017Q2' into RELENG_2_3v2.3.4
643 files changed, 2910 insertions, 2239 deletions
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile index f662dd9..c7932e9 100644 --- a/audio/libmodplug/Makefile +++ b/audio/libmodplug/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libmodplug -PORTVERSION= 0.8.8.5 -PORTREVISION= 2 +PORTVERSION= 0.8.9.0 CATEGORIES= audio MASTER_SITES= SF/modplug-xmms/${PORTNAME}/${PORTVERSION} LOCAL/ehaupt @@ -13,7 +12,7 @@ COMMENT= ModPlug mod-like music shared libraries LICENSE= PD LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe gmake pathfix pkgconfig libtool +USES= cpe pathfix pkgconfig libtool INSTALL_TARGET= install-strip USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/audio/libmodplug/distinfo b/audio/libmodplug/distinfo index d2c5057..fcd1954 100644 --- a/audio/libmodplug/distinfo +++ b/audio/libmodplug/distinfo @@ -1,2 +1,3 @@ -SHA256 (libmodplug-0.8.8.5.tar.gz) = 77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad -SIZE (libmodplug-0.8.8.5.tar.gz) = 546751 +TIMESTAMP = 1493361396 +SHA256 (libmodplug-0.8.9.0.tar.gz) = 457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de +SIZE (libmodplug-0.8.9.0.tar.gz) = 576566 diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt index c290e0e..ded5ff5 100644 --- a/databases/mariadb55-client/files/patch-CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200 -+++ CMakeLists.txt 2014-10-17 21:36:43.000000000 +0200 -@@ -411,28 +411,8 @@ +--- CMakeLists.txt.orig 2017-04-11 22:03:13.000000000 +0200 ++++ CMakeLists.txt 2017-04-18 10:11:38.582817000 +0200 +@@ -393,28 +393,8 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(scripts) @@ -29,7 +29,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) ENDIF() -@@ -444,7 +424,6 @@ +@@ -426,7 +406,6 @@ IF(WIN32) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() @@ -37,15 +37,15 @@ CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) -@@ -477,6 +456,7 @@ +@@ -460,6 +439,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT - COMPONENT Readme) + INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) -@@ -487,6 +467,7 @@ + # MDEV-6526 these files are not installed anymore +@@ -469,6 +449,7 @@ INSTALL_DOCUMENTATION(README COPYING EXC IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() diff --git a/databases/mariadb55-client/files/patch-CVE-2017-3302 b/databases/mariadb55-client/files/patch-CVE-2017-3302 deleted file mode 100644 index 87d08f1..0000000 --- a/databases/mariadb55-client/files/patch-CVE-2017-3302 +++ /dev/null @@ -1,124 +0,0 @@ -From eef21014898d61e77890359d6546d4985d829ef6 Mon Sep 17 00:00:00 2001 -From: Sergei Golubchik <serg@mariadb.org> -Date: Thu, 16 Feb 2017 11:32:47 +0100 -Subject: [PATCH] MDEV-11933 Wrong usage of linked list in - mysql_prune_stmt_list - -mysql_prune_stmt_list() was walking the list following -element->next pointers, but inside the loop it was invoking -list_add(element) that modified element->next. So, mysql_prune_stmt_list() -failed to visit and reset all elements, and some of them were left -with pointers to invalid MYSQL. ---- - sql-common/client.c | 11 ++--------- - tests/mysql_client_test.c | 50 +++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 50 insertions(+), 11 deletions(-) - -diff --git a/sql-common/client.c b/sql-common/client.c -index c2e0cc3..b348afc 100644 ---- sql-common/client.c.orig -+++ sql-common/client.c -@@ -1,5 +1,5 @@ - /* Copyright (c) 2003, 2016, Oracle and/or its affiliates. -- Copyright (c) 2009, 2016, MariaDB -+ Copyright (c) 2009, 2017, MariaDB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -3819,8 +3819,6 @@ static void mysql_close_free(MYSQL *mysql) - static void mysql_prune_stmt_list(MYSQL *mysql) - { - LIST *element= mysql->stmts; -- LIST *pruned_list= 0; -- - for (; element; element= element->next) - { - MYSQL_STMT *stmt= (MYSQL_STMT *) element->data; -@@ -3830,14 +3828,9 @@ static void mysql_prune_stmt_list(MYSQL *mysql) - stmt->last_errno= CR_SERVER_LOST; - strmov(stmt->last_error, ER(CR_SERVER_LOST)); - strmov(stmt->sqlstate, unknown_sqlstate); -- } -- else -- { -- pruned_list= list_add(pruned_list, element); -+ mysql->stmts= list_delete(mysql->stmts, element); - } - } -- -- mysql->stmts= pruned_list; - } - - -diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c -index 446018e..f62545d 100644 ---- tests/mysql_client_test.c.orig -+++ tests/mysql_client_test.c -@@ -1,5 +1,5 @@ --/* Copyright (c) 2002, 2012, Oracle and/or its affiliates. -- Copyright (c) 2008, 2012, Monty Program Ab -+/* Copyright (c) 2002, 2014, Oracle and/or its affiliates. -+ Copyright (c) 2008, 2017, MariaDB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -19031,6 +19031,49 @@ static void test_mdev4326() - myquery(rc); - } - -+ -+/** -+ BUG#17512527: LIST HANDLING INCORRECT IN MYSQL_PRUNE_STMT_LIST() -+*/ -+static void test_bug17512527() -+{ -+ MYSQL *conn; -+ MYSQL_STMT *stmt1, *stmt2; -+ unsigned long thread_id; -+ char query[MAX_TEST_QUERY_LENGTH]; -+ int rc; -+ -+ conn= client_connect(0, MYSQL_PROTOCOL_SOCKET, 1); -+ -+ stmt1 = mysql_stmt_init(conn); -+ check_stmt(stmt1); -+ rc= mysql_stmt_prepare(stmt1, STRING_WITH_LEN("SELECT 1")); -+ check_execute(stmt1, rc); -+ -+ stmt2 = mysql_stmt_init(conn); -+ check_stmt(stmt2); -+ -+ thread_id= mysql_thread_id(conn); -+ sprintf(query, "KILL %lu", thread_id); -+ if (thread_query(query)) -+ exit(1); -+ -+ rc= mysql_stmt_prepare(stmt2, STRING_WITH_LEN("SELECT 2")); -+ check_execute(stmt2, rc); -+ -+ rc= mysql_stmt_execute(stmt1); -+ check_execute_r(stmt1, rc); -+ -+ rc= mysql_stmt_execute(stmt2); -+ check_execute(stmt2, rc); -+ -+ mysql_close(conn); -+ -+ mysql_stmt_close(stmt2); -+ mysql_stmt_close(stmt1); -+} -+ -+ - static struct my_tests_st my_tests[]= { - { "disable_query_logs", disable_query_logs }, - { "test_view_sp_list_fields", test_view_sp_list_fields }, -@@ -19297,6 +19340,9 @@ static struct my_tests_st my_tests[]= { - { "test_bug13001491", test_bug13001491 }, - { "test_mdev4326", test_mdev4326 }, - { "test_ps_sp_out_params", test_ps_sp_out_params }, -+#ifndef _WIN32 -+ { "test_bug17512527", test_bug17512527}, -+#endif - { 0, 0 } - }; - diff --git a/databases/mariadb55-client/files/patch-MDEV-12230 b/databases/mariadb55-client/files/patch-MDEV-12230 new file mode 100644 index 0000000..1a7b2b4 --- /dev/null +++ b/databases/mariadb55-client/files/patch-MDEV-12230 @@ -0,0 +1,205 @@ +From 4fe65ca33a6012ec60c665f6eeb5ff08969fb267 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik <serg@mariadb.org> +Date: Tue, 18 Apr 2017 12:35:05 +0200 +Subject: [PATCH] =?UTF-8?q?MDEV-12230=20include/my=5Fsys.h:600:43:=20error?= + =?UTF-8?q?:=20unknown=20type=20name=20=E2=80=98PSI=5Ffile=5Fkey=E2=80=99"?= + =?UTF-8?q?=20when=20-DWITHOUT=5FSERVER=3D1?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +cherry-pick 2c2bd8c155 (MDEV-12261 build failure without P_S) from 10.0 +--- + include/my_sys.h | 3 +-- + include/mysql/psi/mysql_file.h | 47 ++++++++++++++++++++++++++++++++++++++++ + mysys/my_symlink2.c | 14 +++++------- + sql/handler.cc | 2 +- + sql/sql_db.cc | 4 ++-- + storage/maria/ma_delete_table.c | 4 ++-- + storage/myisam/mi_delete_table.c | 4 ++-- + 7 files changed, 61 insertions(+), 17 deletions(-) + +diff --git a/include/my_sys.h b/include/my_sys.h +index 10551e1..2794068 100644 +--- include/my_sys.h.orig ++++ include/my_sys.h +@@ -580,8 +580,7 @@ extern File my_create_with_symlink(const char *linkname, const char *filename, + myf MyFlags); + extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags); + extern int my_symlink(const char *content, const char *linkname, myf MyFlags); +-extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir); ++extern int my_handler_delete_with_symlink(const char *filename, myf sync_dir); + + extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags); + extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset, +diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h +index 4a0f3fd..aa3ed7e 100644 +--- include/mysql/psi/mysql_file.h.orig ++++ include/mysql/psi/mysql_file.h +@@ -435,6 +435,20 @@ + #endif + + /** ++ @def mysql_file_delete_with_symlink(K, P1, P2, P3) ++ Instrumented delete with symbolic link. ++ @c mysql_file_delete_with_symlink is a replacement ++ for @c my_handler_delete_with_symlink. ++*/ ++#ifdef HAVE_PSI_INTERFACE ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2, P3) ++#else ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(P1, P2, P3) ++#endif ++ ++/** + @def mysql_file_rename_with_symlink(K, P1, P2, P3) + Instrumented rename with symbolic link. + @c mysql_file_rename_with_symlink is a replacement +@@ -1305,6 +1319,7 @@ inline_mysql_file_rename( + return result; + } + ++ + static inline File + inline_mysql_file_create_with_symlink( + #ifdef HAVE_PSI_INTERFACE +@@ -1335,6 +1350,38 @@ inline_mysql_file_create_with_symlink( + } + + static inline int ++inline_mysql_file_delete_with_symlink( ++#ifdef HAVE_PSI_INTERFACE ++ PSI_file_key key, const char *src_file, uint src_line, ++#endif ++ const char *name, const char *ext, myf flags) ++{ ++ int result; ++ char fullname[FN_REFLEN]; ++#ifdef HAVE_PSI_INTERFACE ++ struct PSI_file_locker *locker= NULL; ++ PSI_file_locker_state state; ++#endif ++ fn_format(fullname, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); ++#ifdef HAVE_PSI_INTERFACE ++ if (likely(PSI_server != NULL)) ++ { ++ locker= PSI_server->get_thread_file_name_locker(&state, key, PSI_FILE_DELETE, ++ fullname, &locker); ++ if (likely(locker != NULL)) ++ PSI_server->start_file_wait(locker, (size_t) 0, src_file, src_line); ++ } ++#endif ++ result= my_handler_delete_with_symlink(fullname, flags); ++#ifdef HAVE_PSI_INTERFACE ++ if (likely(locker != NULL)) ++ PSI_server->end_file_wait(locker, (size_t) 0); ++#endif ++ return result; ++} ++ ++ ++static inline int + inline_mysql_file_rename_with_symlink( + #ifdef HAVE_PSI_INTERFACE + PSI_file_key key, const char *src_file, uint src_line, +diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c +index 5fe7b8f..c851468 100644 +--- mysys/my_symlink2.c.orig ++++ mysys/my_symlink2.c +@@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) + in this case both the symlink and the symlinked file are deleted, + but only if the symlinked file is not in the datadir. + */ +-int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir) ++int my_handler_delete_with_symlink(const char *filename, myf sync_dir) + { +- char orig[FN_REFLEN], real[FN_REFLEN]; ++ char real[FN_REFLEN]; + int res= 0; + DBUG_ENTER("my_handler_delete_with_symlink"); + +- fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); +- if (my_is_symlink(orig)) ++ if (my_is_symlink(filename)) + { + /* + Delete the symlinked file only if the symlink is not + pointing into datadir. + */ +- if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real))) +- res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | MY_WME | sync_dir)); ++ if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real))) ++ res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir)); + } +- DBUG_RETURN(mysql_file_delete(key, orig, MYF(MY_WME | sync_dir)) || res); ++ DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res); + } +diff --git a/sql/handler.cc b/sql/handler.cc +index 2ae144a..dc40e34 100644 +--- sql/handler.cc.orig ++++ sql/handler.cc +@@ -3381,7 +3381,7 @@ int handler::delete_table(const char *name) + + for (const char **ext=bas_ext(); *ext ; ext++) + { +- if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) ++ if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0)) + { + if (my_errno != ENOENT) + { +diff --git a/sql/sql_db.cc b/sql/sql_db.cc +index 7bb4f0f..580590b 100644 +--- sql/sql_db.cc.orig ++++ sql/sql_db.cc +@@ -1085,7 +1085,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, + We ignore ENOENT error in order to skip files that was deleted + by concurrently running statement like REPAIR TABLE ... + */ +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && + my_errno != ENOENT) + { + my_error(EE_DELETE, MYF(0), filePath, my_errno); +@@ -1206,7 +1206,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) + continue; + } + strxmov(filePath, org_path, "/", file->name, NullS); +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) + { + goto err; + } +diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c +index c4bcd5b..f80ec13 100644 +--- storage/maria/ma_delete_table.c.orig ++++ storage/maria/ma_delete_table.c +@@ -86,8 +86,8 @@ int maria_delete_table_files(const char *name, myf sync_dir) + { + DBUG_ENTER("maria_delete_table_files"); + +- if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || +- my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) ++ if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || ++ mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) + DBUG_RETURN(my_errno); + DBUG_RETURN(0); + } +diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c +index ebedfbd..ca395ff 100644 +--- storage/myisam/mi_delete_table.c.orig ++++ storage/myisam/mi_delete_table.c +@@ -28,8 +28,8 @@ int mi_delete_table(const char *name) + check_table_is_closed(name,"delete"); + #endif + +- if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || +- my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) ++ if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || ++ mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) + DBUG_RETURN(my_errno); + DBUG_RETURN(0); + } diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index f5d993c..69ebeeb 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.54 -PORTREVISION?= 3 +PORTVERSION= 5.5.55 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ @@ -25,7 +25,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb55-client USES= cmake execinfo shebangfix ssl -SHEBANG_FILES= scripts/*.sh +SHEBANG_FILES= scripts/*.sh sql-bench/[a-km-z]* CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ @@ -43,7 +43,6 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ - -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ -DWITH_SSL=yes \ -DEXECINFO_ROOT=${LOCALBASE} \ diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo index fbe811a..acc88dc 100644 --- a/databases/mariadb55-server/distinfo +++ b/databases/mariadb55-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482613700 -SHA256 (mariadb-5.5.54.tar.gz) = 54405ad9beff02339819eb73c59b4bf25f58a2c5abffbf17e81c4940a893538c -SIZE (mariadb-5.5.54.tar.gz) = 45765936 +TIMESTAMP = 1492502977 +SHA256 (mariadb-5.5.55.tar.gz) = cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86 +SIZE (mariadb-5.5.55.tar.gz) = 45757922 diff --git a/databases/mariadb55-server/files/patch-CMakeLists.txt b/databases/mariadb55-server/files/patch-CMakeLists.txt index 90a15c8..45eb8c7 100644 --- a/databases/mariadb55-server/files/patch-CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-CMakeLists.txt @@ -1,45 +1,46 @@ ---- CMakeLists.txt.orig 2014-06-13 13:53:43.304277057 +0300 -+++ CMakeLists.txt 2014-06-13 13:57:07.790256621 +0300 -@@ -407,18 +407,12 @@ +--- CMakeLists.txt.orig 2017-04-11 20:03:13 UTC ++++ CMakeLists.txt +@@ -397,22 +397,22 @@ ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(support-files) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) ++# ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) ++# ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) + ADD_SUBDIRECTORY(mysql-test) + ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(sql-bench) -- ++# ADD_SUBDIRECTORY(sql-bench) + IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -437,7 +431,6 @@ - ADD_SUBDIRECTORY(win/upgrade_wizard) - ADD_SUBDIRECTORY(win/packaging) +- ADD_SUBDIRECTORY(packaging/rpm-oel) ++# ADD_SUBDIRECTORY(packaging/rpm-oel) ENDIF() --ADD_SUBDIRECTORY(packaging/solaris) - CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) - CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) -@@ -470,6 +463,7 @@ + IF(UNIX) +@@ -460,14 +460,14 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -+IF(FALSE) - INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT - COMPONENT Readme) - INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC -@@ -477,6 +471,7 @@ +-INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) ++#INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) + + # MDEV-6526 these files are not installed anymore + #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC + # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) + IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) +- INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ++# INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() -+ENDIF() INCLUDE(CPack) - diff --git a/databases/mariadb55-server/files/patch-CVE-2017-3302 b/databases/mariadb55-server/files/patch-CVE-2017-3302 deleted file mode 100644 index 87d08f1..0000000 --- a/databases/mariadb55-server/files/patch-CVE-2017-3302 +++ /dev/null @@ -1,124 +0,0 @@ -From eef21014898d61e77890359d6546d4985d829ef6 Mon Sep 17 00:00:00 2001 -From: Sergei Golubchik <serg@mariadb.org> -Date: Thu, 16 Feb 2017 11:32:47 +0100 -Subject: [PATCH] MDEV-11933 Wrong usage of linked list in - mysql_prune_stmt_list - -mysql_prune_stmt_list() was walking the list following -element->next pointers, but inside the loop it was invoking -list_add(element) that modified element->next. So, mysql_prune_stmt_list() -failed to visit and reset all elements, and some of them were left -with pointers to invalid MYSQL. ---- - sql-common/client.c | 11 ++--------- - tests/mysql_client_test.c | 50 +++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 50 insertions(+), 11 deletions(-) - -diff --git a/sql-common/client.c b/sql-common/client.c -index c2e0cc3..b348afc 100644 ---- sql-common/client.c.orig -+++ sql-common/client.c -@@ -1,5 +1,5 @@ - /* Copyright (c) 2003, 2016, Oracle and/or its affiliates. -- Copyright (c) 2009, 2016, MariaDB -+ Copyright (c) 2009, 2017, MariaDB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -3819,8 +3819,6 @@ static void mysql_close_free(MYSQL *mysql) - static void mysql_prune_stmt_list(MYSQL *mysql) - { - LIST *element= mysql->stmts; -- LIST *pruned_list= 0; -- - for (; element; element= element->next) - { - MYSQL_STMT *stmt= (MYSQL_STMT *) element->data; -@@ -3830,14 +3828,9 @@ static void mysql_prune_stmt_list(MYSQL *mysql) - stmt->last_errno= CR_SERVER_LOST; - strmov(stmt->last_error, ER(CR_SERVER_LOST)); - strmov(stmt->sqlstate, unknown_sqlstate); -- } -- else -- { -- pruned_list= list_add(pruned_list, element); -+ mysql->stmts= list_delete(mysql->stmts, element); - } - } -- -- mysql->stmts= pruned_list; - } - - -diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c -index 446018e..f62545d 100644 ---- tests/mysql_client_test.c.orig -+++ tests/mysql_client_test.c -@@ -1,5 +1,5 @@ --/* Copyright (c) 2002, 2012, Oracle and/or its affiliates. -- Copyright (c) 2008, 2012, Monty Program Ab -+/* Copyright (c) 2002, 2014, Oracle and/or its affiliates. -+ Copyright (c) 2008, 2017, MariaDB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -19031,6 +19031,49 @@ static void test_mdev4326() - myquery(rc); - } - -+ -+/** -+ BUG#17512527: LIST HANDLING INCORRECT IN MYSQL_PRUNE_STMT_LIST() -+*/ -+static void test_bug17512527() -+{ -+ MYSQL *conn; -+ MYSQL_STMT *stmt1, *stmt2; -+ unsigned long thread_id; -+ char query[MAX_TEST_QUERY_LENGTH]; -+ int rc; -+ -+ conn= client_connect(0, MYSQL_PROTOCOL_SOCKET, 1); -+ -+ stmt1 = mysql_stmt_init(conn); -+ check_stmt(stmt1); -+ rc= mysql_stmt_prepare(stmt1, STRING_WITH_LEN("SELECT 1")); -+ check_execute(stmt1, rc); -+ -+ stmt2 = mysql_stmt_init(conn); -+ check_stmt(stmt2); -+ -+ thread_id= mysql_thread_id(conn); -+ sprintf(query, "KILL %lu", thread_id); -+ if (thread_query(query)) -+ exit(1); -+ -+ rc= mysql_stmt_prepare(stmt2, STRING_WITH_LEN("SELECT 2")); -+ check_execute(stmt2, rc); -+ -+ rc= mysql_stmt_execute(stmt1); -+ check_execute_r(stmt1, rc); -+ -+ rc= mysql_stmt_execute(stmt2); -+ check_execute(stmt2, rc); -+ -+ mysql_close(conn); -+ -+ mysql_stmt_close(stmt2); -+ mysql_stmt_close(stmt1); -+} -+ -+ - static struct my_tests_st my_tests[]= { - { "disable_query_logs", disable_query_logs }, - { "test_view_sp_list_fields", test_view_sp_list_fields }, -@@ -19297,6 +19340,9 @@ static struct my_tests_st my_tests[]= { - { "test_bug13001491", test_bug13001491 }, - { "test_mdev4326", test_mdev4326 }, - { "test_ps_sp_out_params", test_ps_sp_out_params }, -+#ifndef _WIN32 -+ { "test_bug17512527", test_bug17512527}, -+#endif - { 0, 0 } - }; - diff --git a/databases/mariadb55-server/files/patch-MDEV-12230 b/databases/mariadb55-server/files/patch-MDEV-12230 new file mode 100644 index 0000000..1a7b2b4 --- /dev/null +++ b/databases/mariadb55-server/files/patch-MDEV-12230 @@ -0,0 +1,205 @@ +From 4fe65ca33a6012ec60c665f6eeb5ff08969fb267 Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik <serg@mariadb.org> +Date: Tue, 18 Apr 2017 12:35:05 +0200 +Subject: [PATCH] =?UTF-8?q?MDEV-12230=20include/my=5Fsys.h:600:43:=20error?= + =?UTF-8?q?:=20unknown=20type=20name=20=E2=80=98PSI=5Ffile=5Fkey=E2=80=99"?= + =?UTF-8?q?=20when=20-DWITHOUT=5FSERVER=3D1?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +cherry-pick 2c2bd8c155 (MDEV-12261 build failure without P_S) from 10.0 +--- + include/my_sys.h | 3 +-- + include/mysql/psi/mysql_file.h | 47 ++++++++++++++++++++++++++++++++++++++++ + mysys/my_symlink2.c | 14 +++++------- + sql/handler.cc | 2 +- + sql/sql_db.cc | 4 ++-- + storage/maria/ma_delete_table.c | 4 ++-- + storage/myisam/mi_delete_table.c | 4 ++-- + 7 files changed, 61 insertions(+), 17 deletions(-) + +diff --git a/include/my_sys.h b/include/my_sys.h +index 10551e1..2794068 100644 +--- include/my_sys.h.orig ++++ include/my_sys.h +@@ -580,8 +580,7 @@ extern File my_create_with_symlink(const char *linkname, const char *filename, + myf MyFlags); + extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags); + extern int my_symlink(const char *content, const char *linkname, myf MyFlags); +-extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir); ++extern int my_handler_delete_with_symlink(const char *filename, myf sync_dir); + + extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags); + extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset, +diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h +index 4a0f3fd..aa3ed7e 100644 +--- include/mysql/psi/mysql_file.h.orig ++++ include/mysql/psi/mysql_file.h +@@ -435,6 +435,20 @@ + #endif + + /** ++ @def mysql_file_delete_with_symlink(K, P1, P2, P3) ++ Instrumented delete with symbolic link. ++ @c mysql_file_delete_with_symlink is a replacement ++ for @c my_handler_delete_with_symlink. ++*/ ++#ifdef HAVE_PSI_INTERFACE ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2, P3) ++#else ++ #define mysql_file_delete_with_symlink(K, P1, P2, P3) \ ++ inline_mysql_file_delete_with_symlink(P1, P2, P3) ++#endif ++ ++/** + @def mysql_file_rename_with_symlink(K, P1, P2, P3) + Instrumented rename with symbolic link. + @c mysql_file_rename_with_symlink is a replacement +@@ -1305,6 +1319,7 @@ inline_mysql_file_rename( + return result; + } + ++ + static inline File + inline_mysql_file_create_with_symlink( + #ifdef HAVE_PSI_INTERFACE +@@ -1335,6 +1350,38 @@ inline_mysql_file_create_with_symlink( + } + + static inline int ++inline_mysql_file_delete_with_symlink( ++#ifdef HAVE_PSI_INTERFACE ++ PSI_file_key key, const char *src_file, uint src_line, ++#endif ++ const char *name, const char *ext, myf flags) ++{ ++ int result; ++ char fullname[FN_REFLEN]; ++#ifdef HAVE_PSI_INTERFACE ++ struct PSI_file_locker *locker= NULL; ++ PSI_file_locker_state state; ++#endif ++ fn_format(fullname, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); ++#ifdef HAVE_PSI_INTERFACE ++ if (likely(PSI_server != NULL)) ++ { ++ locker= PSI_server->get_thread_file_name_locker(&state, key, PSI_FILE_DELETE, ++ fullname, &locker); ++ if (likely(locker != NULL)) ++ PSI_server->start_file_wait(locker, (size_t) 0, src_file, src_line); ++ } ++#endif ++ result= my_handler_delete_with_symlink(fullname, flags); ++#ifdef HAVE_PSI_INTERFACE ++ if (likely(locker != NULL)) ++ PSI_server->end_file_wait(locker, (size_t) 0); ++#endif ++ return result; ++} ++ ++ ++static inline int + inline_mysql_file_rename_with_symlink( + #ifdef HAVE_PSI_INTERFACE + PSI_file_key key, const char *src_file, uint src_line, +diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c +index 5fe7b8f..c851468 100644 +--- mysys/my_symlink2.c.orig ++++ mysys/my_symlink2.c +@@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) + in this case both the symlink and the symlinked file are deleted, + but only if the symlinked file is not in the datadir. + */ +-int my_handler_delete_with_symlink(PSI_file_key key, const char *name, +- const char *ext, myf sync_dir) ++int my_handler_delete_with_symlink(const char *filename, myf sync_dir) + { +- char orig[FN_REFLEN], real[FN_REFLEN]; ++ char real[FN_REFLEN]; + int res= 0; + DBUG_ENTER("my_handler_delete_with_symlink"); + +- fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); +- if (my_is_symlink(orig)) ++ if (my_is_symlink(filename)) + { + /* + Delete the symlinked file only if the symlink is not + pointing into datadir. + */ +- if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real))) +- res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | MY_WME | sync_dir)); ++ if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real))) ++ res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir)); + } +- DBUG_RETURN(mysql_file_delete(key, orig, MYF(MY_WME | sync_dir)) || res); ++ DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res); + } +diff --git a/sql/handler.cc b/sql/handler.cc +index 2ae144a..dc40e34 100644 +--- sql/handler.cc.orig ++++ sql/handler.cc +@@ -3381,7 +3381,7 @@ int handler::delete_table(const char *name) + + for (const char **ext=bas_ext(); *ext ; ext++) + { +- if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0)) ++ if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0)) + { + if (my_errno != ENOENT) + { +diff --git a/sql/sql_db.cc b/sql/sql_db.cc +index 7bb4f0f..580590b 100644 +--- sql/sql_db.cc.orig ++++ sql/sql_db.cc +@@ -1085,7 +1085,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, + We ignore ENOENT error in order to skip files that was deleted + by concurrently running statement like REPAIR TABLE ... + */ +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) && + my_errno != ENOENT) + { + my_error(EE_DELETE, MYF(0), filePath, my_errno); +@@ -1206,7 +1206,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path) + continue; + } + strxmov(filePath, org_path, "/", file->name, NullS); +- if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) ++ if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME))) + { + goto err; + } +diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c +index c4bcd5b..f80ec13 100644 +--- storage/maria/ma_delete_table.c.orig ++++ storage/maria/ma_delete_table.c +@@ -86,8 +86,8 @@ int maria_delete_table_files(const char *name, myf sync_dir) + { + DBUG_ENTER("maria_delete_table_files"); + +- if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || +- my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) ++ if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) || ++ mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir)) + DBUG_RETURN(my_errno); + DBUG_RETURN(0); + } +diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c +index ebedfbd..ca395ff 100644 +--- storage/myisam/mi_delete_table.c.orig ++++ storage/myisam/mi_delete_table.c +@@ -28,8 +28,8 @@ int mi_delete_table(const char *name) + check_table_is_closed(name,"delete"); + #endif + +- if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || +- my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) ++ if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) || ++ mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0)) + DBUG_RETURN(my_errno); + DBUG_RETURN(0); + } diff --git a/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt index 70154e2..280b241 100644 --- a/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt @@ -1,10 +1,11 @@ ---- support-files/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ support-files/CMakeLists.txt 2012-12-23 05:40:39.000000000 +0200 -@@ -66,10 +66,11 @@ +--- support-files/CMakeLists.txt.orig 2017-04-11 20:03:17 UTC ++++ support-files/CMakeLists.txt +@@ -67,10 +67,12 @@ IF(UNIX) ENDFOREACH() IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) -- INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) +- ADD_SUBDIRECTORY(SELinux) ++# ADD_SUBDIRECTORY(SELinux) ENDIF() +IF(FALSE) diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index 6e8c693..5c6cb4a 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 2 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt index 218a1e7..405d4f7 100644 --- a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt +++ b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt @@ -1,24 +1,14 @@ ---- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- support-files/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC +++ support-files/CMakeLists.txt -@@ -44,14 +44,17 @@ ELSE() - SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - ENDIF() - -+IF(FALSE) - SET(inifile my-default) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) -+ENDIF() - - IF(UNIX) +@@ -47,6 +47,7 @@ IF(UNIX) + SET (PIDOF "pgrep -d' ' -f") + ENDIF() SET(prefix ${CMAKE_INSTALL_PREFIX}) -+IF(FALSE) ++IF (FALSE) FOREACH(script mysqld_multi.server mysql-log-rotate) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -68,9 +71,11 @@ IF(UNIX) +@@ -59,9 +60,11 @@ IF(UNIX) IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() @@ -30,7 +20,7 @@ SET(bindir ${prefix}/${INSTALL_BINDIR}) SET(sbindir ${prefix}/${INSTALL_SBINDIR}) SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR}) -@@ -83,3 +88,4 @@ IF(UNIX) +@@ -74,3 +77,4 @@ IF(UNIX) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 34977ce..f7b58be 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.7.17 -PORTREVISION?= 4 +PORTVERSION= 5.7.18 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo index 2ca5866..141edf8 100644 --- a/databases/mysql57-server/distinfo +++ b/databases/mysql57-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483356681 -SHA256 (mysql-boost-5.7.17.tar.gz) = b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 -SIZE (mysql-boost-5.7.17.tar.gz) = 61480982 +TIMESTAMP = 1492018141 +SHA256 (mysql-boost-5.7.18.tar.gz) = ae6f5e2cf7b936496cf60260cd7fd5a0862c21f48cd240448021c4ea067a0f0c +SIZE (mysql-boost-5.7.18.tar.gz) = 61612105 diff --git a/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt b/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt index 7dddb54..1982355 100644 --- a/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt @@ -1,9 +1,9 @@ ---- rapid/plugin/x/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- rapid/plugin/x/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC +++ rapid/plugin/x/CMakeLists.txt -@@ -91,14 +91,14 @@ ELSE() - ${CMAKE_CURRENT_SOURCE_DIR}/ngs/include +@@ -92,14 +92,14 @@ ELSE() ${CMAKE_SOURCE_DIR}/include #temporary ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql + ${CMAKE_CURRENT_BINARY_DIR}/generated - ${SSL_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} + ${BOOST_INCLUDE_DIR} diff --git a/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc index c33d355..2b5e80a 100644 --- a/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc +++ b/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc @@ -1,6 +1,6 @@ ---- sql/conn_handler/socket_connection.cc.orig 2016-03-28 18:06:12 UTC +--- sql/conn_handler/socket_connection.cc.orig 2017-03-18 07:45:14 UTC +++ sql/conn_handler/socket_connection.cc -@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li +@@ -942,22 +942,25 @@ Channel_info* Mysqld_socket_listener::li signal(SIGCHLD, SIG_DFL); request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE, mysql_socket_getfd(connect_sock), NULL); @@ -22,9 +22,11 @@ - "refused connect from %s", eval_client(&req)); + "refused connect from %s", my_eval_client(&req)); + #ifdef HAVE_LIBWRAP_PROTOTYPES + // Some distros have patched tcpd.h to have proper prototypes if (req.sink) - (req.sink)(req.fd); + ((void (*)(int)) (req.sink))(req.fd); - - mysql_socket_shutdown(listen_sock, SHUT_RDWR); - mysql_socket_close(listen_sock); + #else + // Some distros have not patched tcpd.h + if (req.sink) diff --git a/databases/mysql57-server/pkg-plist b/databases/mysql57-server/pkg-plist index 207780b..0956b4f 100644 --- a/databases/mysql57-server/pkg-plist +++ b/databases/mysql57-server/pkg-plist @@ -136,7 +136,6 @@ man/man8/mysqld.8.gz %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic -%%DATADIR%%/my-default.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_security_commands.sql diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile index 5885892..1d4e771 100644 --- a/devel/jenkins-lts/Makefile +++ b/devel/jenkins-lts/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 2.32.2 +PORTVERSION= 2.46.2 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/ PKGNAMESUFFIX= -lts diff --git a/devel/jenkins-lts/distinfo b/devel/jenkins-lts/distinfo index 839c83a..7d91368 100644 --- a/devel/jenkins-lts/distinfo +++ b/devel/jenkins-lts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485968129 -SHA256 (jenkins/2.32.2/jenkins.war) = 73b216449cb5eacd4fe5a6ee2e089245705e5815b448e315fbc8b6de7809e55f -SIZE (jenkins/2.32.2/jenkins.war) = 69874457 +TIMESTAMP = 1493264528 +SHA256 (jenkins/2.46.2/jenkins.war) = aa7f243a4c84d3d6cfb99a218950b8f7b926af7aa2570b0e1707279d464472c7 +SIZE (jenkins/2.46.2/jenkins.war) = 70342163 diff --git a/devel/jenkins-lts/files/jenkins.in b/devel/jenkins-lts/files/jenkins.in index 55c4fd7..019ffde 100644 --- a/devel/jenkins-lts/files/jenkins.in +++ b/devel/jenkins-lts/files/jenkins.in @@ -60,7 +60,7 @@ pidfile="/var/run/jenkins/jenkins.pid" command="/usr/sbin/daemon" java_cmd="${jenkins_java_home}/bin/java" procname="${java_cmd}" -command_args="-p ${pidfile} ${java_cmd} -DJENKINS_HOME=${jenkins_home} ${jenkins_java_opts} -jar %%DATADIR%%/jenkins.war ${jenkins_args} > ${jenkins_log_file} 2>&1" +command_args="-p ${pidfile} ${java_cmd} -DJENKINS_HOME=${jenkins_home} ${jenkins_java_opts} -jar %%DATADIR%%/jenkins.war ${jenkins_args} >> ${jenkins_log_file} 2>&1" required_files="${java_cmd}" start_precmd="jenkins_prestart" diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile index e84f6f9..c78212a 100644 --- a/devel/jenkins/Makefile +++ b/devel/jenkins/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 2.52 +PORTVERSION= 2.57 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/ DISTNAME= jenkins diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo index 3f99762..3bc5e44b 100644 --- a/devel/jenkins/distinfo +++ b/devel/jenkins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490597889 -SHA256 (jenkins/2.52/jenkins.war) = 7a78fc8b3f1eacd45891d052f7fa03471a60b9df52213b4ee948e05834cffc38 -SIZE (jenkins/2.52/jenkins.war) = 68800962 +TIMESTAMP = 1493264495 +SHA256 (jenkins/2.57/jenkins.war) = 5d7a66864d0941629e1fb8ef82ed98a38e54da39f4a9f3ca31561d573e18b2a5 +SIZE (jenkins/2.57/jenkins.war) = 70476328 diff --git a/emulators/qemu-utils/Makefile b/emulators/qemu-utils/Makefile index 57ba7ff..a0e14ef 100644 --- a/emulators/qemu-utils/Makefile +++ b/emulators/qemu-utils/Makefile @@ -19,7 +19,7 @@ OPTIONS_EXCLUDE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ MASTERDIR= ${.CURDIR}/../qemu PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr -EXTRA_PATCHES= ${.CURDIR}/files/patch-configure +EXTRA_PATCHES= ${.CURDIR}/files/patch-Makefile ${.CURDIR}/files/patch-configure PKGMESSAGE= PORTDOCS= qemu-doc.html qmp-commands.txt diff --git a/emulators/qemu-utils/files/patch-Makefile b/emulators/qemu-utils/files/patch-Makefile new file mode 100644 index 0000000..2d9d97f --- /dev/null +++ b/emulators/qemu-utils/files/patch-Makefile @@ -0,0 +1,14 @@ +--- Makefile.orig 2017-03-31 14:07:03 UTC ++++ Makefile +@@ -484,11 +490,6 @@ endif + ifeq ($(CONFIG_GTK),y) + $(MAKE) -C po $@ + endif +- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" +- set -e; for x in $(KEYMAPS); do \ +- $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ +- done +- $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" + for d in $(TARGET_DIRS); do \ + $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ + done diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile index c4f4ef1..52e19af 100644 --- a/irc/weechat/Makefile +++ b/irc/weechat/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= weechat -PORTVERSION= 1.7 +PORTVERSION= 1.7.1 CATEGORIES= irc MASTER_SITES= https://weechat.org/files/src/ diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo index 76e1ddc..359a76f 100644 --- a/irc/weechat/distinfo +++ b/irc/weechat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485178739 -SHA256 (weechat-1.7.tar.xz) = 599348337a4bff179bf50888dad135751fa401538ebaadc59831d2223be52db3 -SIZE (weechat-1.7.tar.xz) = 1837004 +TIMESTAMP = 1493064823 +SHA256 (weechat-1.7.1.tar.xz) = 3f7e04793ce21796369199573d84a04ea23313942af880d2c9600bdc73571c30 +SIZE (weechat-1.7.1.tar.xz) = 1836844 diff --git a/lang/swift/Makefile b/lang/swift/Makefile index ce5f469..5f3b30f2 100644 --- a/lang/swift/Makefile +++ b/lang/swift/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= swift -PORTVERSION= 2.2.1 +PORTVERSION= 3.1.1 DISTVERSIONPREFIX= swift- DISTVERSIONSUFFIX= -RELEASE -PORTREVISION= 4 CATEGORIES= lang MAINTAINER= swills@FreeBSD.org @@ -20,36 +19,53 @@ BUILD_DEPENDS= cmake:devel/cmake \ sphinx-build:textproc/py-sphinx \ binutils>=2.25.1:devel/binutils LIB_DEPENDS= libicudata.so:devel/icu \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/e2fsprogs-libuuid \ + libobjc.so:lang/libobjc2 +REL_SNAP= 2017-04-22-a USE_GITHUB= yes -GH_ACCOUNT= apple:DEFAULT,llvm,clang,lldb,cmark,llbuild,swiftpm,xctest,xcfound + +GH_ACCOUNT= apple:DEFAULT,llvm,clang,dispatch,lldb,cmark,llbuild,swiftpm,xctest,xcfound GH_PROJECT= swift:DEFAULT swift-llvm:llvm swift-clang:clang swift-lldb:lldb \ swift-cmark:cmark swift-llbuild:llbuild swift-package-manager:swiftpm \ - swift-corelibs-xctest:xctest swift-corelibs-foundation:xcfound -GH_TAGNAME= swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a:llbuild,swiftpm,xctest,xcfound + swift-corelibs-xctest:xctest swift-corelibs-foundation:xcfound \ + swift-corelibs-libdispatch:dispatch +GH_TAGNAME= swift-${PORTVERSION}-RELEASE:llbuild,swiftpm,xctest,xcfound,dispatch GH_SUBDIR= llvm:llvm clang:clang lldb:lldb cmark:cmark llbuild:llbuild \ swiftpm:swiftpm swift-corelibs-xctest:xctest \ - swift-corelibs-foundation:xcfound + swift-corelibs-foundation:xcfound \ + swift-corelibs-libdispatch:dispatch WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= iconv libedit ninja perl5 pkgconfig python:3,build sqlite +USES= autoreconf:build compiler:c++14-lang libtool localbase:ldflags iconv libedit ninja perl5 pkgconfig sqlite +USE_AUTOTOOLS= autoconf:env USE_GNOME= libxml2 USE_LDCONFIG= yes ONLY_FOR_ARCHS= amd64 +BROKEN_FreeBSD_10= Builds but does not work CONFLICTS_BUILD= googletest +LDFLAGS+= -lobjc OPTIONS_DEFINE= DOCS PORTDOCS= * +STRIP_FILES= bin/sil-func-extractor bin/sil-nm bin/sil-opt \ + bin/sil-passpipeline-dumper bin/swift \ + bin/swift-api-digester bin/swift-build-tool \ + bin/swift-demangle bin/swift-ide-test \ + bin/swift-llvm-opt bin/swift-reflection-dump \ + bin/swift-remoteast-test lib/swift/freebsd/libswiftCore.so \ + lib/swift/freebsd/libswiftGlibc.so \ + lib/swift/freebsd/libswiftRemoteMirror.so \ + lib/swift/freebsd/libswiftSwiftOnoneSupport.so + .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100079 -BUILD_DEPENDS+= clang38:devel/llvm38 -EXTRA_FLAGS= --host-cc=${LOCALBASE}/bin/clang38 --host-cxx=${LOCALBASE}/bin/clang++38 -.endif +CC_ONLY= ${CC:C/.*\///} +CPP_ONLY= ${CPP:C/.*\///} +CXX_ONLY= ${CXX:C/.*\///} post-extract: @${MKDIR} ${WRKSRC} @@ -58,47 +74,39 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/swift/cmake/modules/SwiftSharedCMakeConfig.cmake + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ + -e 's|%%CPP_ONLY%%|${CPP_ONLY}|g' \ + -e 's|%%CC_ONLY%%|${CC_ONLY}|g' \ + -e 's|%%CXX_ONLY%%|${CXX_ONLY}|g' \ + ${WRKSRC}/swift/utils/build-presets.ini \ + ${WRKSRC}/swift/utils/build-script-impl do-build: @${MKDIR} ${STAGEDIR}${PREFIX} - cd ${WRKSRC}/swift; ${SETENV} PATH=${LOCALBASE}/bin:${PATH} \ - CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \ - CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ - CXXFLAGS="-I${LOCALBASE}/include ${CXXFLAGS}" \ - LDFLAGS='-B${LOCALBASE}/bin -fuse-ld=bfd' \ + cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ + ./swift/utils/build-script --preset=mixin_freebsd_installation \ + -j ${MAKE_JOBS_NUMBER} \ install_destdir=${STAGEDIR} \ - ./utils/build-script -R --no-assertions \ - --llbuild \ -- \ ${EXTRA_FLAGS} \ - --verbose-build \ - --swift-runtime-enable-dtrace \ - --install-swift \ - --install-llbuild \ + --skip-build-llvm=1 \ --install_prefix=${PREFIX} \ --install_destdir=${STAGEDIR} \ - --swift-install-components='compiler;clang-builtin-headers;stdlib;sdk-overlay;license;tools;editor-integration' \ - --build-swift-static-stdlib=1 \ - --skip-test-lldb=1 + --verbose-build=1 \ + --install-llbuild=1 \ + --skip-test-llbuild=1 @${RM} /var/run/libuuid/clock.txt /var/run/libuuid/request /var/run/libuuid/uuidd.pid do-install: ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/swift.1 ${STAGEDIR}${PREFIX}/man/man1/swift.1 ${RM} -r ${STAGEDIR}${PREFIX}/share/man ${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/swift.1 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/swift/freebsd/libswiftGlibc.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/swift/freebsd/libswiftCore.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-compress - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sil-extract - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-ide-test - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-llvm-opt - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-build-tool - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/swift-demangle - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sil-opt +.for FILE in ${STRIP_FILES} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${FILE} +.endfor do-install-DOCS-on: - cd ${WRKSRC}/build/Ninja-Release/swift-freebsd-x86_64/docs/html ; \ + cd ${WRKSRC}/build/Ninja-ReleaseAssert+stdlib-Release/swift-freebsd-x86_64/docs/html ; \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include <bsd.port.post.mk> diff --git a/lang/swift/distinfo b/lang/swift/distinfo index 6a66e7a..0575c3d 100644 --- a/lang/swift/distinfo +++ b/lang/swift/distinfo @@ -1,19 +1,21 @@ -TIMESTAMP = 1490087178 -SHA256 (apple-swift-swift-2.2.1-RELEASE_GH0.tar.gz) = e971e2287055da72564356f369bad97e95821afb1ef36157e954a04a7e90753a -SIZE (apple-swift-swift-2.2.1-RELEASE_GH0.tar.gz) = 8443158 -SHA256 (apple-swift-llvm-swift-2.2.1-RELEASE_GH0.tar.gz) = f7977e5bb275494b5dac4490afc5d634f894ba5f209f3b2dbd5b7e520fa5fce2 -SIZE (apple-swift-llvm-swift-2.2.1-RELEASE_GH0.tar.gz) = 22560962 -SHA256 (apple-swift-clang-swift-2.2.1-RELEASE_GH0.tar.gz) = 40bdfa7eec0497ec69005d6a5d018b12c85aa2c0959d3408ecaaa9e34ff0415f -SIZE (apple-swift-clang-swift-2.2.1-RELEASE_GH0.tar.gz) = 12995260 -SHA256 (apple-swift-lldb-swift-2.2.1-RELEASE_GH0.tar.gz) = 2098043dbda98374e784d3357f71f8e931aea3ac958c042adf0df0fae7bc22a3 -SIZE (apple-swift-lldb-swift-2.2.1-RELEASE_GH0.tar.gz) = 14216244 -SHA256 (apple-swift-cmark-swift-2.2.1-RELEASE_GH0.tar.gz) = 254d3c02bf2b03ad456fa3ad27b4da854e36318fcaf6b6f199fdb3e978a90803 -SIZE (apple-swift-cmark-swift-2.2.1-RELEASE_GH0.tar.gz) = 214444 -SHA256 (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 520680d66b14329089d0040d5e05f48f3a6d4c7266aa9e92ca3e5b332d567808 -SIZE (apple-swift-llbuild-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 4713455 -SHA256 (apple-swift-package-manager-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = fce64a4266bb00717293f7d3b3e39d6601887910b60505885d670fc70a6f958b -SIZE (apple-swift-package-manager-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 142826 -SHA256 (apple-swift-corelibs-xctest-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 97bbc56579e2af93c5101478e99c18446963af3d6764f6e75220ea22e4886c4f -SIZE (apple-swift-corelibs-xctest-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 42557 -SHA256 (apple-swift-corelibs-foundation-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 5fbb87ea62faf2a3fcc3cd1cfb49348d0e94837ba7aa8a430c172cac685e6d97 -SIZE (apple-swift-corelibs-foundation-swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a_GH0.tar.gz) = 2455060 +TIMESTAMP = 1493047496 +SHA256 (apple-swift-swift-3.1.1-RELEASE_GH0.tar.gz) = 03eb54e7f89109a85c9b2a9bfdee88d2d7e1bdef73ae0385b30fe4661efaf407 +SIZE (apple-swift-swift-3.1.1-RELEASE_GH0.tar.gz) = 10548277 +SHA256 (apple-swift-llvm-swift-3.1.1-RELEASE_GH0.tar.gz) = fc6ac7c0c6afff344a8d4e5299b7417f414f1499cf374953e06c339d8177fc26 +SIZE (apple-swift-llvm-swift-3.1.1-RELEASE_GH0.tar.gz) = 28252386 +SHA256 (apple-swift-clang-swift-3.1.1-RELEASE_GH0.tar.gz) = ed41f1231bae030a412455491a5244ede53a4761617194b2dda573f5776361ad +SIZE (apple-swift-clang-swift-3.1.1-RELEASE_GH0.tar.gz) = 14642919 +SHA256 (apple-swift-corelibs-libdispatch-swift-3.1.1-RELEASE_GH0.tar.gz) = b711a5afaf027ac2cfefc144cd3760dd1d6a99689864be6ecb73a62cbb21b04f +SIZE (apple-swift-corelibs-libdispatch-swift-3.1.1-RELEASE_GH0.tar.gz) = 487271 +SHA256 (apple-swift-lldb-swift-3.1.1-RELEASE_GH0.tar.gz) = 84a8640ce285748dee4bfd742dee50136a10f3a96d24bb15410092afe6f495bf +SIZE (apple-swift-lldb-swift-3.1.1-RELEASE_GH0.tar.gz) = 18179384 +SHA256 (apple-swift-cmark-swift-3.1.1-RELEASE_GH0.tar.gz) = 51db8067f11976a7ca38a6ff9f173d3d9e3df290991be87835cdc003e0b62e4e +SIZE (apple-swift-cmark-swift-3.1.1-RELEASE_GH0.tar.gz) = 214437 +SHA256 (apple-swift-llbuild-swift-3.1.1-RELEASE_GH0.tar.gz) = ea59fd6603fe5d71598895832d6eef9314f1af99a72050536e473e9bb08a57df +SIZE (apple-swift-llbuild-swift-3.1.1-RELEASE_GH0.tar.gz) = 4734687 +SHA256 (apple-swift-package-manager-swift-3.1.1-RELEASE_GH0.tar.gz) = 5f98dd6fd41170e2f51f85131ca50cba3d50a187ce94b7a1db7a776c2815c778 +SIZE (apple-swift-package-manager-swift-3.1.1-RELEASE_GH0.tar.gz) = 382717 +SHA256 (apple-swift-corelibs-xctest-swift-3.1.1-RELEASE_GH0.tar.gz) = 188272552bf35c411c73ad35345e0e8893e67d8d098a805fb26ad220291421e3 +SIZE (apple-swift-corelibs-xctest-swift-3.1.1-RELEASE_GH0.tar.gz) = 55326 +SHA256 (apple-swift-corelibs-foundation-swift-3.1.1-RELEASE_GH0.tar.gz) = 86f1d57a38661a8186104440369a1e3657093ebc37716a31a0e539eadfad60e3 +SIZE (apple-swift-corelibs-foundation-swift-3.1.1-RELEASE_GH0.tar.gz) = 3290006 diff --git a/lang/swift/files/patch-llbuild_CMakeLists.txt b/lang/swift/files/patch-llbuild_CMakeLists.txt deleted file mode 100644 index ba29fbc..0000000 --- a/lang/swift/files/patch-llbuild_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- llbuild/CMakeLists.txt.orig 2016-03-15 20:15:59 UTC -+++ llbuild/CMakeLists.txt -@@ -128,7 +128,7 @@ else () - endif () - - # On Linux, always build with PIC. --if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - endif () diff --git a/lang/swift/files/patch-llbuild_lib_llvm_Support_CMakeLists.txt b/lang/swift/files/patch-llbuild_lib_llvm_Support_CMakeLists.txt deleted file mode 100644 index ff9a9cd..0000000 --- a/lang/swift/files/patch-llbuild_lib_llvm_Support_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- llbuild/lib/llvm/Support/CMakeLists.txt.orig 2016-03-15 20:15:59 UTC -+++ llbuild/lib/llvm/Support/CMakeLists.txt -@@ -41,3 +41,7 @@ raw_ostream.cpp - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - target_link_libraries(llvmSupport pthread dl) - endif() -+ -+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ target_link_libraries(llvmSupport pthread execinfo) -+endif() diff --git a/lang/swift/files/patch-llbuild_lib_llvm_Support_Unix_Process.inc b/lang/swift/files/patch-llbuild_lib_llvm_Support_Unix_Process.inc deleted file mode 100644 index 9fc789f..0000000 --- a/lang/swift/files/patch-llbuild_lib_llvm_Support_Unix_Process.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- llbuild/lib/llvm/Support/Unix/Process.inc.orig 2016-03-15 20:15:59 UTC -+++ llbuild/lib/llvm/Support/Unix/Process.inc -@@ -36,7 +36,7 @@ - // DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for - // <stdlib.h> instead. Unix.h includes this for us already. - #if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \ -- !defined(__OpenBSD__) && !defined(__Bitrig__) -+ !defined(__OpenBSD__) && !defined(__Bitrig__) && !defined(__FreeBSD__) - #include <malloc.h> - #endif - #if defined(HAVE_MALLCTL) diff --git a/lang/swift/files/patch-llvm_lib_Support_Unix_Process.inc b/lang/swift/files/patch-llvm_lib_Support_Unix_Process.inc deleted file mode 100644 index 8d21a2b..0000000 --- a/lang/swift/files/patch-llvm_lib_Support_Unix_Process.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- llvm/lib/Support/Unix/Process.inc.orig 2016-02-26 00:51:43 UTC -+++ llvm/lib/Support/Unix/Process.inc -@@ -36,7 +36,7 @@ - // DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for - // <stdlib.h> instead. Unix.h includes this for us already. - #if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \ -- !defined(__OpenBSD__) && !defined(__Bitrig__) -+ !defined(__OpenBSD__) && !defined(__Bitrig__) && !defined(__FreeBSD__) - #include <malloc.h> - #endif - #if defined(HAVE_MALLCTL) diff --git a/lang/swift/files/patch-swift-corelibs-foundation_lib_target.py b/lang/swift/files/patch-swift-corelibs-foundation_lib_target.py new file mode 100644 index 0000000..67d4c73 --- /dev/null +++ b/lang/swift/files/patch-swift-corelibs-foundation_lib_target.py @@ -0,0 +1,20 @@ +--- swift-corelibs-foundation/lib/target.py.orig 2017-04-13 07:34:00 UTC ++++ swift-corelibs-foundation/lib/target.py +@@ -204,6 +204,8 @@ class ArchType: + return ArchType.x86 + if string == "x86_64": + return ArchType.x86_64 ++ if string == "amd64": ++ return ArchType.x86_64 + if string == "xcore": + return ArchType.xcore + if string == "nvptx": +@@ -370,7 +372,7 @@ class Target: + triple += "-apple-darwin" + elif platform.system() == "FreeBSD": + # Make this work on 10 as well. +- triple += "-freebsd11.0" ++ triple += "-v11.0-freebsd11.0" + elif platform.system() == "CYGWIN_NT-10.0": + triple += "-windows-cygnus" + else: diff --git a/lang/swift/files/patch-swift_cmake_modules_SwiftSharedCMakeConfig.cmake b/lang/swift/files/patch-swift_cmake_modules_SwiftSharedCMakeConfig.cmake deleted file mode 100644 index 3432b33..0000000 --- a/lang/swift/files/patch-swift_cmake_modules_SwiftSharedCMakeConfig.cmake +++ /dev/null @@ -1,20 +0,0 @@ ---- swift/cmake/modules/SwiftSharedCMakeConfig.cmake.orig 2016-03-21 17:35:26 UTC -+++ swift/cmake/modules/SwiftSharedCMakeConfig.cmake -@@ -236,7 +236,8 @@ macro(swift_common_standalone_build_conf - set(CMARK_BUILD_INCLUDE_DIR "${PATH_TO_CMARK_BUILD}/src") - - set(CMAKE_INCLUDE_CURRENT_DIR ON) -- include_directories("${PATH_TO_LLVM_BUILD}/include" -+ include_directories("/usr/local/include" -+ "${PATH_TO_LLVM_BUILD}/include" - "${LLVM_MAIN_INCLUDE_DIR}" - "${CLANG_BUILD_INCLUDE_DIR}" - "${CLANG_MAIN_INCLUDE_DIR}" -@@ -244,6 +245,7 @@ macro(swift_common_standalone_build_conf - "${CMARK_BUILD_INCLUDE_DIR}") - - link_directories( -+ "/usr/local/lib" - "${LLVM_LIBRARY_DIR}" - # FIXME: if we want to support separate Clang builds and mix different - # build configurations of Clang and Swift, this line should be adjusted. diff --git a/lang/swift/files/patch-swift_docs_CMakeLists.txt b/lang/swift/files/patch-swift_docs_CMakeLists.txt deleted file mode 100644 index 8f4fdeb..0000000 --- a/lang/swift/files/patch-swift_docs_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- swift/docs/CMakeLists.txt.orig 2016-03-21 17:35:26 UTC -+++ swift/docs/CMakeLists.txt -@@ -10,7 +10,6 @@ SET(SWIFT_SPHINX_PAPER_SIZE "letter" - CACHE STRING "Paper size for generated documentation") - - SET(SPHINX_ARGS -- -W - -D latex_paper_size=${SWIFT_SPHINX_PAPER_SIZE} - -d ${CMAKE_BINARY_DIR}/doctrees) - diff --git a/lang/swift/files/patch-swift_lib_ClangImporter_ClangImporter.cpp b/lang/swift/files/patch-swift_lib_ClangImporter_ClangImporter.cpp deleted file mode 100644 index ade06fb..0000000 --- a/lang/swift/files/patch-swift_lib_ClangImporter_ClangImporter.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- swift/lib/ClangImporter/ClangImporter.cpp.orig 2016-03-21 17:35:26 UTC -+++ swift/lib/ClangImporter/ClangImporter.cpp -@@ -332,7 +332,7 @@ getNormalInvocationArguments(std::vector - // not import Objective-C modules. - // - // Just use the most feature-rich C language mode. -- "-x", "c", "-std=gnu11", -+ "-x", "c", "-std=gnu11", "-I/usr/include" - }); - } - -@@ -376,7 +376,7 @@ getNormalInvocationArguments(std::vector - } else { - // On Darwin, Clang uses -isysroot to specify the include - // system root. On other targets, it seems to use --sysroot. -- if (triple.isOSDarwin()) { -+ if (triple.isOSDarwin() || triple.isOSFreeBSD()) { - invocationArgStrs.push_back("-isysroot"); - } else { - invocationArgStrs.push_back("--sysroot"); diff --git a/lang/swift/files/patch-swift_utils_build-presets.ini b/lang/swift/files/patch-swift_utils_build-presets.ini new file mode 100644 index 0000000..6cb2b82 --- /dev/null +++ b/lang/swift/files/patch-swift_utils_build-presets.ini @@ -0,0 +1,44 @@ +--- swift/utils/build-presets.ini.orig 2017-04-21 21:18:29 UTC ++++ swift/utils/build-presets.ini +@@ -676,6 +676,41 @@ dash-dash + swift-enable-ast-verifier=0 + + #===------------------------------------------------------------------------===# ++# FreeBSD Builders ++#===------------------------------------------------------------------------===# ++[preset: mixin_freebsd_installation] ++mixin-preset=mixin_lightweight_assertions ++ ++llbuild ++#swiftpm ++release ++#xctest ++dash-dash ++ ++install-swift ++install-lldb ++install-llbuild ++install-xctest ++#install-swiftpm ++install-prefix=/usr/local ++swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license;tools;editor-integration ++skip-build-libdispatch ++build-swift-static-stdlib ++build-swift-static-sdk-overlay ++build-swift-stdlib-unittest-extra ++ ++# Executes the lit tests for the installable package that is created ++# Assumes the swift-integration-tests repo is checked out ++#test-installable-package ++ ++# Path to the root of the installation filesystem. ++install-destdir=%(install_destdir)s ++ ++# Path to the .tar.gz package we would create. ++#installable-package=%(installable_package)s ++ ++ ++#===------------------------------------------------------------------------===# + # Linux Builders + #===------------------------------------------------------------------------===# + [preset: mixin_linux_installation] diff --git a/lang/swift/files/patch-swift_utils_build-script-impl b/lang/swift/files/patch-swift_utils_build-script-impl new file mode 100644 index 0000000..cfb7bd8 --- /dev/null +++ b/lang/swift/files/patch-swift_utils_build-script-impl @@ -0,0 +1,16 @@ +--- swift/utils/build-script-impl.orig 2017-03-28 05:42:53.000000000 +0000 ++++ swift/utils/build-script-impl 2017-04-23 23:59:13.869062000 +0000 +@@ -1948,8 +1948,11 @@ for host in "${ALL_HOSTS[@]}"; do + # gold linker support. + cmake_options=( + "${cmake_options[@]}" +- -DCMAKE_EXE_LINKER_FLAGS:STRING="-fuse-ld=gold" +- -DCMAKE_SHARED_LINKER_FLAGS:STRING="-fuse-ld=gold" ++ -DCMAKE_EXE_LINKER_FLAGS:STRING="-L/usr/local/lib -fuse-ld=gold" ++ -DCMAKE_SHARED_LINKER_FLAGS:STRING="-L/usr/local/lib -fuse-ld=gold" ++ -DCMAKE_CPP_COMPILER=%%CPP_ONLY%% ++ -DCMAKE_C_COMPILER=%%CC_ONLY%% ++ -DCMAKE_CXX_COMPILER=%%CXX_ONLY%% + ) + fi + else diff --git a/lang/swift/files/patch-swiftpm_Sources_PackageDescription_Package.swift b/lang/swift/files/patch-swiftpm_Sources_PackageDescription_Package.swift deleted file mode 100644 index 5a920f8..0000000 --- a/lang/swift/files/patch-swiftpm_Sources_PackageDescription_Package.swift +++ /dev/null @@ -1,11 +0,0 @@ ---- swiftpm/Sources/PackageDescription/Package.swift.orig 2016-03-16 18:28:14 UTC -+++ swiftpm/Sources/PackageDescription/Package.swift -@@ -10,6 +10,8 @@ - - #if os(Linux) - import Glibc -+#elseif os(FreeBSD) -+import Glibc - #else - import Darwin.C - #endif diff --git a/lang/swift/files/patch-swiftpm_Sources_libc_libc.swift b/lang/swift/files/patch-swiftpm_Sources_libc_libc.swift deleted file mode 100644 index d898055..0000000 --- a/lang/swift/files/patch-swiftpm_Sources_libc_libc.swift +++ /dev/null @@ -1,11 +0,0 @@ ---- swiftpm/Sources/libc/libc.swift.orig 2016-03-16 18:28:14 UTC -+++ swiftpm/Sources/libc/libc.swift -@@ -10,6 +10,8 @@ - - #if os(Linux) - @_exported import Glibc -+#elseif os(FreeBSD) -+@_exported import Glibc - #else - @_exported import Darwin.C - #endif diff --git a/lang/swift/pkg-plist b/lang/swift/pkg-plist index e0c3ab2..b463a5e 100644 --- a/lang/swift/pkg-plist +++ b/lang/swift/pkg-plist @@ -1,13 +1,23 @@ -bin/sil-extract +bin/sil-func-extractor +bin/sil-nm bin/sil-opt +bin/sil-passpipeline-dumper bin/swift -bin/swift-compress +bin/swift-api-digester +bin/swift-api-dump.py +bin/swift-autolink-extract +bin/swift-build-tool bin/swift-demangle +bin/swift-format bin/swift-ide-test bin/swift-llvm-opt +bin/swift-reflection-dump +bin/swift-remoteast-test bin/swiftc -bin/swift-build-tool -lib/swift/clang/include/Intrin.h +lib/swift/clang/include/__clang_cuda_cmath.h +lib/swift/clang/include/__clang_cuda_intrinsics.h +lib/swift/clang/include/__clang_cuda_math_forward_declares.h +lib/swift/clang/include/__clang_cuda_runtime_wrapper.h lib/swift/clang/include/__stddef_max_align_t.h lib/swift/clang/include/__wmmintrin_aes.h lib/swift/clang/include/__wmmintrin_pclmul.h @@ -16,18 +26,26 @@ lib/swift/clang/include/altivec.h lib/swift/clang/include/ammintrin.h lib/swift/clang/include/arm_acle.h lib/swift/clang/include/arm_neon.h +lib/swift/clang/include/armintr.h lib/swift/clang/include/avx2intrin.h lib/swift/clang/include/avx512bwintrin.h lib/swift/clang/include/avx512cdintrin.h lib/swift/clang/include/avx512dqintrin.h lib/swift/clang/include/avx512erintrin.h lib/swift/clang/include/avx512fintrin.h +lib/swift/clang/include/avx512ifmaintrin.h +lib/swift/clang/include/avx512ifmavlintrin.h +lib/swift/clang/include/avx512pfintrin.h +lib/swift/clang/include/avx512vbmiintrin.h +lib/swift/clang/include/avx512vbmivlintrin.h lib/swift/clang/include/avx512vlbwintrin.h +lib/swift/clang/include/avx512vlcdintrin.h lib/swift/clang/include/avx512vldqintrin.h lib/swift/clang/include/avx512vlintrin.h lib/swift/clang/include/avxintrin.h lib/swift/clang/include/bmi2intrin.h lib/swift/clang/include/bmiintrin.h +lib/swift/clang/include/clflushoptintrin.h lib/swift/clang/include/cpuid.h lib/swift/clang/include/cuda_builtin_vars.h lib/swift/clang/include/emmintrin.h @@ -40,6 +58,7 @@ lib/swift/clang/include/htmintrin.h lib/swift/clang/include/htmxlintrin.h lib/swift/clang/include/ia32intrin.h lib/swift/clang/include/immintrin.h +lib/swift/clang/include/intrin.h lib/swift/clang/include/inttypes.h lib/swift/clang/include/iso646.h lib/swift/clang/include/limits.h @@ -48,7 +67,10 @@ lib/swift/clang/include/mm3dnow.h lib/swift/clang/include/mm_malloc.h lib/swift/clang/include/mmintrin.h lib/swift/clang/include/module.modulemap +lib/swift/clang/include/mwaitxintrin.h lib/swift/clang/include/nmmintrin.h +lib/swift/clang/include/opencl-c.h +lib/swift/clang/include/pkuintrin.h lib/swift/clang/include/pmmintrin.h lib/swift/clang/include/popcntintrin.h lib/swift/clang/include/prfchwintrin.h @@ -82,30 +104,44 @@ lib/swift/clang/include/xsavesintrin.h lib/swift/clang/include/xtestintrin.h lib/swift/freebsd/libswiftCore.so lib/swift/freebsd/libswiftGlibc.so +lib/swift/freebsd/libswiftRemoteMirror.so +lib/swift/freebsd/libswiftSwiftOnoneSupport.so lib/swift/freebsd/x86_64/Glibc.swiftdoc lib/swift/freebsd/x86_64/Glibc.swiftmodule lib/swift/freebsd/x86_64/Swift.swiftdoc lib/swift/freebsd/x86_64/Swift.swiftmodule -lib/swift/freebsd/x86_64/swift.ld -lib/swift/glibc/module.map +lib/swift/freebsd/x86_64/SwiftOnoneSupport.swiftdoc +lib/swift/freebsd/x86_64/SwiftOnoneSupport.swiftmodule +lib/swift/freebsd/x86_64/glibc.modulemap +lib/swift/freebsd/x86_64/swift_begin.o +lib/swift/freebsd/x86_64/swift_end.o +lib/swift/shims/AssertionReporting.h lib/swift/shims/CoreFoundationShims.h +lib/swift/shims/DispatchOverlayShims.h lib/swift/shims/FoundationShims.h lib/swift/shims/GlobalObjects.h lib/swift/shims/HeapObject.h lib/swift/shims/LibcShims.h +lib/swift/shims/OSOverlayShims.h +lib/swift/shims/ObjectiveCOverlayShims.h lib/swift/shims/RefCount.h lib/swift/shims/RuntimeShims.h lib/swift/shims/RuntimeStubs.h +lib/swift/shims/SafariServicesOverlayShims.h +lib/swift/shims/SwiftStdbool.h lib/swift/shims/SwiftStddef.h lib/swift/shims/SwiftStdint.h lib/swift/shims/UnicodeShims.h -lib/swift/shims/module.map +lib/swift/shims/Visibility.h +lib/swift/shims/XCTestOverlayShims.h +lib/swift/shims/XPCOverlayShims.h +lib/swift/shims/module.modulemap lib/swift_static/freebsd/libswiftCore.a lib/swift_static/freebsd/libswiftGlibc.a -lib/swift_static/freebsd/libswiftRuntime.a -lib/swift_static/freebsd/libswiftStdlibStubs.a -share/emacs/site-lisp/swift-mode.el +lib/swift_static/freebsd/libswiftSwiftOnoneSupport.a +lib/swift_static/freebsd/static-stdlib-args.lnk man/man1/swift.1.gz +share/emacs/site-lisp/swift-mode.el share/vim/vim73/ftdetect/sil.vim share/vim/vim73/ftdetect/swift.vim share/vim/vim73/ftdetect/swiftgyb.vim diff --git a/mail/dovecot2-antispam-plugin/Makefile b/mail/dovecot2-antispam-plugin/Makefile index 20d9fd0..04a52c9 100644 --- a/mail/dovecot2-antispam-plugin/Makefile +++ b/mail/dovecot2-antispam-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= dovecot2-antispam-plugin PORTVERSION= 20130429 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= mail MASTER_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ LOCAL/olgeni diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile index 2f80b35..93c27c3 100644 --- a/mail/dovecot2-pigeonhole/Makefile +++ b/mail/dovecot2-pigeonhole/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.4.17 +PORTVERSION= 0.4.18 PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ diff --git a/mail/dovecot2-pigeonhole/distinfo b/mail/dovecot2-pigeonhole/distinfo index 6042c9b..63bfb81 100644 --- a/mail/dovecot2-pigeonhole/distinfo +++ b/mail/dovecot2-pigeonhole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488163544 -SHA256 (dovecot-2.2-pigeonhole-0.4.17.tar.gz) = 74d869c7532cbf4fe41e3cc95a1aa6ce32e98f4d423f0d099da1e0fba022dae3 -SIZE (dovecot-2.2-pigeonhole-0.4.17.tar.gz) = 1787177 +TIMESTAMP = 1491958585 +SHA256 (dovecot-2.2-pigeonhole-0.4.18.tar.gz) = dd871bb57fad22795460f613f3c9484a8bf229272ac00956d837a34444f1c3a9 +SIZE (dovecot-2.2-pigeonhole-0.4.18.tar.gz) = 1742357 diff --git a/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c b/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c new file mode 100644 index 0000000..e1ebc85 --- /dev/null +++ b/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c @@ -0,0 +1,42 @@ +From 3e1a17a286ab0e084577fc267a442cb12aed1cbc Mon Sep 17 00:00:00 2001 +From: Stephan Bosch <stephan.bosch@dovecot.fi> +Date: Fri, 28 Apr 2017 00:02:39 +0200 +Subject: [PATCH] lib-sieve: Fixed bug in handling of deferred implicit keep + with implicit side-effects. + +Upon continuing the deferred implicit keep, the implicit side-effects (such as imap flags) were not applied. +--- + src/lib-sieve/sieve-result.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c +index 3c896f2..fc75063 100644 +--- src/lib-sieve/sieve-result.c ++++ src/lib-sieve/sieve-result.c +@@ -969,7 +969,14 @@ static int _sieve_result_implicit_keep + + rac = rac->next; + } ++ } else if ( !rollback ) { ++ act_keep.location = kac->action.location; ++ act_keep.mail = kac->action.mail; ++ if ( kac->seffects != NULL ) ++ rsef_first = kac->seffects->first_effect; ++ } + ++ if (rsef_first == NULL) { + /* Apply any implicit side effects if applicable */ + if ( !rollback && hash_table_is_created(result->action_contexts) ) { + struct sieve_result_action_context *actctx; +@@ -980,11 +987,6 @@ static int _sieve_result_implicit_keep + if ( actctx != NULL && actctx->seffects != NULL ) + rsef_first = actctx->seffects->first_effect; + } +- } else if ( !rollback ) { +- act_keep.location = kac->action.location; +- act_keep.mail = kac->action.mail; +- if ( kac->seffects != NULL ) +- rsef_first = kac->seffects->first_effect; + } + + /* Start keep action */ diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile index e2a61ae..2d6b168 100644 --- a/mail/dovecot2/Makefile +++ b/mail/dovecot2/Makefile @@ -13,10 +13,10 @@ ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.2.28 -PORTREVISION= 2 +PORTVERSION= 2.2.29.1 +PORTREVISION= 1 CATEGORIES= mail ipv6 -MASTER_SITES= https://www.dovecot.org/releases/${PORTVERSION:R}/ +MASTER_SITES= https://www.dovecot.org/releases/${PORTVERSION:R:R}/ PKGNAMESUFFIX= 2 MAINTAINER= adamw@FreeBSD.org diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo index d2fdc3d..372956b 100644 --- a/mail/dovecot2/distinfo +++ b/mail/dovecot2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487948861 -SHA256 (dovecot-2.2.28.tar.gz) = e0288f59e326ab87cb3881fdabadafe542f4dc7ab9996db13863a439ebbc1f25 -SIZE (dovecot-2.2.28.tar.gz) = 5921992 +TIMESTAMP = 1492013710 +SHA256 (dovecot-2.2.29.1.tar.gz) = ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388 +SIZE (dovecot-2.2.29.1.tar.gz) = 5972119 diff --git a/mail/dovecot2/files/patch-fix-ntlm_auth b/mail/dovecot2/files/patch-fix-ntlm_auth new file mode 100644 index 0000000..28e1040 --- /dev/null +++ b/mail/dovecot2/files/patch-fix-ntlm_auth @@ -0,0 +1,36 @@ +From a319c3201bff1ea7bae3e7ab1fae42e9c4759056 Mon Sep 17 00:00:00 2001 +From: Andriy Syrovenko <andriys@gmail.com> +Date: Mon, 17 Apr 2017 01:14:02 +0300 +Subject: [PATCH] auth: Fixed dovecot/auth hanging when child ntlm_auth crashes + while processing an authentication request + +--- + src/auth/mech-winbind.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/auth/mech-winbind.c b/src/auth/mech-winbind.c +index 4a65696..c12fb5e 100644 +--- src/auth/mech-winbind.c ++++ src/auth/mech-winbind.c +@@ -187,12 +187,18 @@ do_auth_continue(struct auth_request *auth_request, + request->continued = FALSE; + + while ((answer = i_stream_read_next_line(in_pipe)) == NULL) { +- if (in_pipe->stream_errno != 0) ++ if (in_pipe->stream_errno != 0 || in_pipe->eof) + break; + } + if (answer == NULL) { +- auth_request_log_error(auth_request, AUTH_SUBSYS_MECH, +- "read(in_pipe) failed: %m"); ++ if (in_pipe->stream_errno != 0) { ++ auth_request_log_error(auth_request, AUTH_SUBSYS_MECH, ++ "read(in_pipe) failed: %m"); ++ } else { ++ auth_request_log_error(auth_request, AUTH_SUBSYS_MECH, ++ "read(in_pipe) failed: " ++ "unexpected end of file"); ++ } + return HR_RESTART; + } + diff --git a/mail/dovecot2/files/patch-src_plugins_fts_fts-parser-tika.c b/mail/dovecot2/files/patch-src_plugins_fts_fts-parser-tika.c deleted file mode 100644 index 8a7404e..0000000 --- a/mail/dovecot2/files/patch-src_plugins_fts_fts-parser-tika.c +++ /dev/null @@ -1,30 +0,0 @@ -From 3751b61dfbc6c141731a740d982fc59918db2482 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martti=20Rannanj=C3=A4rvi?= <martti.rannanjarvi@dovecot.fi> -Date: Wed, 1 Mar 2017 12:29:17 +0200 -Subject: [PATCH] fts: Don't add NULL content disposition or type to HTTP - header - ---- - src/plugins/fts/fts-parser-tika.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/fts/fts-parser-tika.c b/src/plugins/fts/fts-parser-tika.c -index 8457f28..385f1d0 100644 ---- src/plugins/fts/fts-parser-tika.c -+++ src/plugins/fts/fts-parser-tika.c -@@ -158,9 +158,12 @@ fts_parser_tika_try_init(struct mail_user *user, const char *content_type, - fts_tika_parser_response, parser); - http_client_request_set_port(http_req, http_url->port); - http_client_request_set_ssl(http_req, http_url->have_ssl); -- http_client_request_add_header(http_req, "Content-Type", content_type); -- http_client_request_add_header(http_req, "Content-Disposition", -- content_disposition); -+ if (content_type != NULL) -+ http_client_request_add_header(http_req, "Content-Type", -+ content_type); -+ if (content_disposition != NULL) -+ http_client_request_add_header(http_req, "Content-Disposition", -+ content_disposition); - http_client_request_add_header(http_req, "Accept", "text/plain"); - - parser->http_req = http_req; diff --git a/mail/dovecot2/files/patch-trash_plugin b/mail/dovecot2/files/patch-trash_plugin deleted file mode 100644 index 065d3d0..0000000 --- a/mail/dovecot2/files/patch-trash_plugin +++ /dev/null @@ -1,48 +0,0 @@ -From 326fb016a23480e4ff8dcc03dc80e76812859bd6 Mon Sep 17 00:00:00 2001 -From: Aki Tuomi <aki.tuomi@dovecot.fi> -Date: Wed, 1 Mar 2017 09:15:29 +0200 -Subject: [PATCH] trash: Read settings after namespaces are loaded - -Fixes Panic: file mail-namespace.c: line 709 (mail_namespace_find): assertion failed: (ns != NULL) ---- - src/plugins/trash/trash-plugin.c | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/src/plugins/trash/trash-plugin.c b/src/plugins/trash/trash-plugin.c -index 7129d3d..2e12578 100644 ---- src/plugins/trash/trash-plugin.c -+++ src/plugins/trash/trash-plugin.c -@@ -348,17 +348,27 @@ trash_mail_user_created(struct mail_user *user) - } else { - tuser = p_new(user->pool, struct trash_user, 1); - MODULE_CONTEXT_SET(user, trash_user_module, tuser); -+ } -+} - -- if (read_configuration(user, env) == 0) { -- trash_next_quota_test_alloc = -- quser->quota->set->test_alloc; -- quser->quota->set->test_alloc = trash_quota_test_alloc; -- } -+static void -+trash_mail_namespaces_created(struct mail_namespace *namespaces) -+{ -+ struct mail_user *user = namespaces->user; -+ struct trash_user *tuser = TRASH_USER_CONTEXT(user); -+ struct quota_user *quser = QUOTA_USER_CONTEXT(user); -+ const char *env = mail_user_plugin_getenv(user, "trash"); -+ -+ if (tuser != NULL && read_configuration(user, env) == 0) { -+ trash_next_quota_test_alloc = -+ quser->quota->set->test_alloc; -+ quser->quota->set->test_alloc = trash_quota_test_alloc; - } - } - - static struct mail_storage_hooks trash_mail_storage_hooks = { -- .mail_user_created = trash_mail_user_created -+ .mail_user_created = trash_mail_user_created, -+ .mail_namespaces_created = trash_mail_namespaces_created, - }; - - void trash_plugin_init(struct module *module) diff --git a/mail/dovecot2/files/pkg-message.in b/mail/dovecot2/files/pkg-message.in index ea7220e..1c57ad1 100644 --- a/mail/dovecot2/files/pkg-message.in +++ b/mail/dovecot2/files/pkg-message.in @@ -15,6 +15,14 @@ dovecot_enable="YES" +--------------------------------------------------------------------- + +To avoid a risk of mailbox corruption, do not enable the +security.bsd.see_other_uids or .see_other_guids sysctls if Dovecot +is storing mail for multiple concurrent users (PR 218392). + +--------------------------------------------------------------------- + If you want to be able to search within attachments using the decode2text plugin, you'll need to install textproc/catdoc, and one of graphics/xpdf or graphics/poppler-utils. diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist index 1d146e3..d2d8a41 100644 --- a/mail/dovecot2/pkg-plist +++ b/mail/dovecot2/pkg-plist @@ -179,6 +179,7 @@ include/dovecot/hex-dec.h include/dovecot/hmac-cram-md5.h include/dovecot/hmac.h include/dovecot/home-expand.h +include/dovecot/hook-build.h include/dovecot/hostpid.h include/dovecot/http-auth.h include/dovecot/http-client-private.h @@ -567,9 +568,12 @@ include/dovecot/userdb-vpopmail.h include/dovecot/userdb.h include/dovecot/utc-mktime.h include/dovecot/utc-offset.h +include/dovecot/var-expand-private.h include/dovecot/var-expand.h include/dovecot/wildcard-match.h include/dovecot/write-full.h +lib/dovecot/auth/lib20_auth_var_expand_crypt.a +lib/dovecot/auth/lib20_auth_var_expand_crypt.so lib/dovecot/auth/libauthdb_imap.a lib/dovecot/auth/libauthdb_imap.so lib/dovecot/doveadm/lib10_doveadm_acl_plugin.a @@ -627,6 +631,8 @@ lib/dovecot/lib20_quota_clone_plugin.a lib/dovecot/lib20_quota_clone_plugin.so lib/dovecot/lib20_replication_plugin.a lib/dovecot/lib20_replication_plugin.so +lib/dovecot/lib20_var_expand_crypt.a +lib/dovecot/lib20_var_expand_crypt.so lib/dovecot/lib20_virtual_plugin.a lib/dovecot/lib20_virtual_plugin.so lib/dovecot/lib20_zlib_plugin.a diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index 51112b4..e590fa5 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 52.0.1 +PORTVERSION= 52.1.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build4/linux-i686/xpi diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo index 50a21bb..ce08ced 100644 --- a/mail/thunderbird-i18n/distinfo +++ b/mail/thunderbird-i18n/distinfo @@ -1,117 +1,117 @@ -TIMESTAMP = 1492182146 -SHA256 (xpi/thunderbird-i18n-52.0.1/ar.xpi) = 0fc0782a81939ae8d3e618162516081a6a91143701932b221dc7a5de20fabdcf -SIZE (xpi/thunderbird-i18n-52.0.1/ar.xpi) = 604235 -SHA256 (xpi/thunderbird-i18n-52.0.1/ast.xpi) = af64b2e231212b45ee9369ce1fcf7c37392edc354e3c81f12279db6a097b868a -SIZE (xpi/thunderbird-i18n-52.0.1/ast.xpi) = 541173 -SHA256 (xpi/thunderbird-i18n-52.0.1/be.xpi) = 33a9cdcd1fcd7837636d238a567acfaf1fd9dddae28621ba779ada3309a42f1e -SIZE (xpi/thunderbird-i18n-52.0.1/be.xpi) = 570931 -SHA256 (xpi/thunderbird-i18n-52.0.1/bg.xpi) = ed32ed033b6253ef78f02b2d31d41a7cd12a14c65258da47c347088348c64e7a -SIZE (xpi/thunderbird-i18n-52.0.1/bg.xpi) = 634897 -SHA256 (xpi/thunderbird-i18n-52.0.1/bn-BD.xpi) = 6fdd4c7324f08e75c59375097c4c1ebdfa797b38df36968ae14719d5f7b9d452 -SIZE (xpi/thunderbird-i18n-52.0.1/bn-BD.xpi) = 676900 -SHA256 (xpi/thunderbird-i18n-52.0.1/br.xpi) = 100003de0c8970a3a180fd0cae2a4520dc5751472a8ee3eb1d5a416231662606 -SIZE (xpi/thunderbird-i18n-52.0.1/br.xpi) = 559380 -SHA256 (xpi/thunderbird-i18n-52.0.1/ca.xpi) = 0b9bf170b8f13eeb91c28c4279b611664cf8ba0594586e43900208a4d4fd138c -SIZE (xpi/thunderbird-i18n-52.0.1/ca.xpi) = 569910 -SHA256 (xpi/thunderbird-i18n-52.0.1/cs.xpi) = 93b473a55ed4c282d8e7d66118be7fe0d0c998c3f0661661d6f59549bcd27ae7 -SIZE (xpi/thunderbird-i18n-52.0.1/cs.xpi) = 579149 -SHA256 (xpi/thunderbird-i18n-52.0.1/cy.xpi) = 70c5a3c15f40b616c395ef407078d3818a8dd0358afdebace7ab1a695c983b47 -SIZE (xpi/thunderbird-i18n-52.0.1/cy.xpi) = 554857 -SHA256 (xpi/thunderbird-i18n-52.0.1/da.xpi) = 861bbddb9d16ccfc9b425bc85b0170779c09c4f3b39dfaa3ff1f4b102e117617 -SIZE (xpi/thunderbird-i18n-52.0.1/da.xpi) = 543334 -SHA256 (xpi/thunderbird-i18n-52.0.1/de.xpi) = 1fbf7af9b42d1a5952ee1d6c3138dae59e544f5a58d8e5e73788479b2267120d -SIZE (xpi/thunderbird-i18n-52.0.1/de.xpi) = 555743 -SHA256 (xpi/thunderbird-i18n-52.0.1/dsb.xpi) = b1800554c2a5ae1dd42f91cc8f9c8f20dc5f49fe2f705fc3ff7754a60f99cf4c -SIZE (xpi/thunderbird-i18n-52.0.1/dsb.xpi) = 584582 -SHA256 (xpi/thunderbird-i18n-52.0.1/el.xpi) = 44cb14189af91e19aa2b087c8cba2d01b460f4498a943642331d67fea3edf2f8 -SIZE (xpi/thunderbird-i18n-52.0.1/el.xpi) = 662964 -SHA256 (xpi/thunderbird-i18n-52.0.1/en-GB.xpi) = fb3b293483bc456db764bf1ca66dc98e98998ce88e9d508a49e1c2be48fe7a82 -SIZE (xpi/thunderbird-i18n-52.0.1/en-GB.xpi) = 531233 -SHA256 (xpi/thunderbird-i18n-52.0.1/en-US.xpi) = dc47e69dbeb11a358acb88b5a6ad07959f1de64b96d9eb67e3ea8eb09a64d814 -SIZE (xpi/thunderbird-i18n-52.0.1/en-US.xpi) = 529123 -SHA256 (xpi/thunderbird-i18n-52.0.1/es-AR.xpi) = 5a444089d0b6c9ba99a4aff9273522781e51a4455a67c645f98d076ea8f92887 -SIZE (xpi/thunderbird-i18n-52.0.1/es-AR.xpi) = 565995 -SHA256 (xpi/thunderbird-i18n-52.0.1/es-ES.xpi) = 0437548fec6a907618cfce5ffa7654b05942bb345fce6d280e16ed909087f646 -SIZE (xpi/thunderbird-i18n-52.0.1/es-ES.xpi) = 445464 -SHA256 (xpi/thunderbird-i18n-52.0.1/et.xpi) = 88faa4f5d910d765e7e3758e990b7accf5432971efa2b4eb26d221b6d7ba49b3 -SIZE (xpi/thunderbird-i18n-52.0.1/et.xpi) = 551661 -SHA256 (xpi/thunderbird-i18n-52.0.1/eu.xpi) = 9d93f4974044daf38c301048e57045d868fe5054b6ba157b1fbb2e281884d408 -SIZE (xpi/thunderbird-i18n-52.0.1/eu.xpi) = 555536 -SHA256 (xpi/thunderbird-i18n-52.0.1/fi.xpi) = 4100732602e478285143b34732397a674806f26a597d202b492a624bac706f4d -SIZE (xpi/thunderbird-i18n-52.0.1/fi.xpi) = 550669 -SHA256 (xpi/thunderbird-i18n-52.0.1/fr.xpi) = b2779f8257aaff4d3e889c8380000d23b4b60b5a2c570d694867d07bd00aba63 -SIZE (xpi/thunderbird-i18n-52.0.1/fr.xpi) = 577560 -SHA256 (xpi/thunderbird-i18n-52.0.1/fy-NL.xpi) = 93719ced46467b9b13bbb4a9ec13e1e82124c084bb0e6dde717eaa6d36346417 -SIZE (xpi/thunderbird-i18n-52.0.1/fy-NL.xpi) = 563632 -SHA256 (xpi/thunderbird-i18n-52.0.1/ga-IE.xpi) = dfbc5a27fca6f189bcf7bbe6a459c31f3f24617c06163d5f03f03c250e98dedb -SIZE (xpi/thunderbird-i18n-52.0.1/ga-IE.xpi) = 583556 -SHA256 (xpi/thunderbird-i18n-52.0.1/gd.xpi) = 5109b924de2f1e2a2841933d45ef44db3fda5a4c9f081ca123f64c6e0fdac56f -SIZE (xpi/thunderbird-i18n-52.0.1/gd.xpi) = 574065 -SHA256 (xpi/thunderbird-i18n-52.0.1/gl.xpi) = d09b3271dad710ea6fb596ed0c26c94a3760c6e1f3f64a76e8368cc4e7c0aa19 -SIZE (xpi/thunderbird-i18n-52.0.1/gl.xpi) = 575150 -SHA256 (xpi/thunderbird-i18n-52.0.1/he.xpi) = 29e1734fb60fe54427a86c5442d33edb2be55495d9919a537e5cbacb02a7b40a -SIZE (xpi/thunderbird-i18n-52.0.1/he.xpi) = 592566 -SHA256 (xpi/thunderbird-i18n-52.0.1/hr.xpi) = 765894566e687401ba237469db261af64d10c0db4ddf35bb6a9ff7d8a89050f1 -SIZE (xpi/thunderbird-i18n-52.0.1/hr.xpi) = 564778 -SHA256 (xpi/thunderbird-i18n-52.0.1/hsb.xpi) = e2fca54bd25160d7799c8187fab1bf768fce838b0f6abaf4e91e09fcb040a3d8 -SIZE (xpi/thunderbird-i18n-52.0.1/hsb.xpi) = 582241 -SHA256 (xpi/thunderbird-i18n-52.0.1/hu.xpi) = 634366ce43ffda750daa2416fb34962e9201f6e826913574ea59c4a01b63db74 -SIZE (xpi/thunderbird-i18n-52.0.1/hu.xpi) = 586446 -SHA256 (xpi/thunderbird-i18n-52.0.1/hy-AM.xpi) = dfa2cfaed3fa783b6155c1763c242bf7f6150ead0ffc9b81597aad0e2915fc17 -SIZE (xpi/thunderbird-i18n-52.0.1/hy-AM.xpi) = 629879 -SHA256 (xpi/thunderbird-i18n-52.0.1/id.xpi) = acc56d41abdc522da128fc9cc4dcdbc42b20105f44229156042647bd34822eaf -SIZE (xpi/thunderbird-i18n-52.0.1/id.xpi) = 546526 -SHA256 (xpi/thunderbird-i18n-52.0.1/is.xpi) = dea3b6dcc9d930d5a1346308bfb2f6c55afa5f79790bc4b9908af783a0b4ab96 -SIZE (xpi/thunderbird-i18n-52.0.1/is.xpi) = 555712 -SHA256 (xpi/thunderbird-i18n-52.0.1/it.xpi) = bb462ca0274a700163a056197ac74bfccfd8249a7af51955a761f48c1e8cfece -SIZE (xpi/thunderbird-i18n-52.0.1/it.xpi) = 455407 -SHA256 (xpi/thunderbird-i18n-52.0.1/ja.xpi) = 1b3a4cb82f30fb2c459c9b82d957c9157aad7c7b5fb3eb4d7aa0c4f1dd1327ee -SIZE (xpi/thunderbird-i18n-52.0.1/ja.xpi) = 630052 -SHA256 (xpi/thunderbird-i18n-52.0.1/ko.xpi) = 3a956209a9f03bcb6bb4553831de3701e6d7585829d0b400de9616825dbbe5a0 -SIZE (xpi/thunderbird-i18n-52.0.1/ko.xpi) = 595516 -SHA256 (xpi/thunderbird-i18n-52.0.1/lt.xpi) = e6dd8ec6b6b45ca32b6bc6e5dcd9af3c8d06488f017c319e5d210e8242417e96 -SIZE (xpi/thunderbird-i18n-52.0.1/lt.xpi) = 580598 -SHA256 (xpi/thunderbird-i18n-52.0.1/nb-NO.xpi) = 5d3b07b37964e570f659e6a7e8877a14cb0f31fbc78d9c1a256a25f37f141dd3 -SIZE (xpi/thunderbird-i18n-52.0.1/nb-NO.xpi) = 551103 -SHA256 (xpi/thunderbird-i18n-52.0.1/nl.xpi) = 7f652d11c06765829e54b2947efbeab2a28520a7055bff8416ee3b4de2f2d2f4 -SIZE (xpi/thunderbird-i18n-52.0.1/nl.xpi) = 557956 -SHA256 (xpi/thunderbird-i18n-52.0.1/nn-NO.xpi) = 183f7f54505e9758a7006fd05d7c5746052df32fba2f9a64e1dc6b73ab85f87d -SIZE (xpi/thunderbird-i18n-52.0.1/nn-NO.xpi) = 551891 -SHA256 (xpi/thunderbird-i18n-52.0.1/pa-IN.xpi) = b5591cad7182b16cac8c6edee2140db6b7b6763ab1c3bb19bdd101900e1a88b2 -SIZE (xpi/thunderbird-i18n-52.0.1/pa-IN.xpi) = 646567 -SHA256 (xpi/thunderbird-i18n-52.0.1/pl.xpi) = 34561c89cf01794b0b9798f7c9b7ff1c91dc69b7413a73aa9a45a40ef3ac8ae6 -SIZE (xpi/thunderbird-i18n-52.0.1/pl.xpi) = 469901 -SHA256 (xpi/thunderbird-i18n-52.0.1/pt-BR.xpi) = 17aa3a09efa5280bcffa58589e5d7b233868ceb0d1f9d40c1ae72eed3c904646 -SIZE (xpi/thunderbird-i18n-52.0.1/pt-BR.xpi) = 558223 -SHA256 (xpi/thunderbird-i18n-52.0.1/pt-PT.xpi) = 210a70e2231d569189dae2e9faf2440040366b0f7574fba2fd75f29da690edd9 -SIZE (xpi/thunderbird-i18n-52.0.1/pt-PT.xpi) = 565623 -SHA256 (xpi/thunderbird-i18n-52.0.1/rm.xpi) = 1f319506286427c5b0f0ca37928216cd0338dd94852f443fbd0fb8c5e9154bd8 -SIZE (xpi/thunderbird-i18n-52.0.1/rm.xpi) = 557605 -SHA256 (xpi/thunderbird-i18n-52.0.1/ro.xpi) = b202828134d3aa0880ac205b24f2b42958d08abd2a9c8d394cd48973a703095a -SIZE (xpi/thunderbird-i18n-52.0.1/ro.xpi) = 570529 -SHA256 (xpi/thunderbird-i18n-52.0.1/ru.xpi) = ba6076ee387dbac1f911e78d03360a47fcb9e9d7e302dac29b4f91f8660f5e00 -SIZE (xpi/thunderbird-i18n-52.0.1/ru.xpi) = 530670 -SHA256 (xpi/thunderbird-i18n-52.0.1/si.xpi) = 91bdcbf70a8e74921350501bd86d59b39a6936328d25747679b9b292cb2718a8 -SIZE (xpi/thunderbird-i18n-52.0.1/si.xpi) = 649010 -SHA256 (xpi/thunderbird-i18n-52.0.1/sk.xpi) = 3054eae03bcfb3e4d5baa779fb621b5b052792aa25a8b13c7f02ff9eb386161e -SIZE (xpi/thunderbird-i18n-52.0.1/sk.xpi) = 583881 -SHA256 (xpi/thunderbird-i18n-52.0.1/sl.xpi) = 0ed11399cddbfc88eabb9c51609065ed56c6605006acdfa62980f3e46276711e -SIZE (xpi/thunderbird-i18n-52.0.1/sl.xpi) = 562833 -SHA256 (xpi/thunderbird-i18n-52.0.1/sq.xpi) = 3b933be76fc42e6bee8e501f858b33e3a69d324f9fa97b4bd75dc711a2f5a4ec -SIZE (xpi/thunderbird-i18n-52.0.1/sq.xpi) = 570616 -SHA256 (xpi/thunderbird-i18n-52.0.1/sr.xpi) = 4d3fa7e2f4e24760ca14324bd3552d7d2e9d31315ce4296a589c83f537aba920 -SIZE (xpi/thunderbird-i18n-52.0.1/sr.xpi) = 609019 -SHA256 (xpi/thunderbird-i18n-52.0.1/sv-SE.xpi) = c32a477bdda5cad814f446183df2fd2157eb40566e52f7ac329c71318ba09840 -SIZE (xpi/thunderbird-i18n-52.0.1/sv-SE.xpi) = 565777 -SHA256 (xpi/thunderbird-i18n-52.0.1/ta-LK.xpi) = f8dd44dfed27bc2ff3a1d651080ba809ba451eb01b31ff4c5b40af1372fc2e4d -SIZE (xpi/thunderbird-i18n-52.0.1/ta-LK.xpi) = 675039 -SHA256 (xpi/thunderbird-i18n-52.0.1/tr.xpi) = 359365e851c761a405834079e0dbd7e4e8b7c0a05452999fa1a8985e48a258df -SIZE (xpi/thunderbird-i18n-52.0.1/tr.xpi) = 569926 -SHA256 (xpi/thunderbird-i18n-52.0.1/uk.xpi) = 7854d30a8b6f83db5e312ce7a8f1d0f2df1debe8ae10e16e59158769f0e94fbf -SIZE (xpi/thunderbird-i18n-52.0.1/uk.xpi) = 652854 -SHA256 (xpi/thunderbird-i18n-52.0.1/vi.xpi) = ef981e7ac35ed52ae0bd57f4893aa26679eb802eb28d1e4dcb486b2cd6a1f66e -SIZE (xpi/thunderbird-i18n-52.0.1/vi.xpi) = 637163 -SHA256 (xpi/thunderbird-i18n-52.0.1/zh-CN.xpi) = 5cd323280af4670ab568ff1b16cd8dd8c62bae14a12464b9a10eac96add630d3 -SIZE (xpi/thunderbird-i18n-52.0.1/zh-CN.xpi) = 593611 -SHA256 (xpi/thunderbird-i18n-52.0.1/zh-TW.xpi) = f2509eadb69cac8b0bf1cf387284cbeb0a0e9e57abc73e171319173c0ca10020 -SIZE (xpi/thunderbird-i18n-52.0.1/zh-TW.xpi) = 595728 +TIMESTAMP = 1493665677 +SHA256 (xpi/thunderbird-i18n-52.1.0/ar.xpi) = cd1d424120449b922d970b3fee89d753ae231354e4181a4d4700dc807504f6d1 +SIZE (xpi/thunderbird-i18n-52.1.0/ar.xpi) = 604235 +SHA256 (xpi/thunderbird-i18n-52.1.0/ast.xpi) = d920be2b1070c04a806745a91e15ab1139d5d2e97480755dd62642bc15222c40 +SIZE (xpi/thunderbird-i18n-52.1.0/ast.xpi) = 541172 +SHA256 (xpi/thunderbird-i18n-52.1.0/be.xpi) = 9da12e3f1b9bccddddb673c7e8b613badecd2e71b28aaaccf16ea6ec4a64e095 +SIZE (xpi/thunderbird-i18n-52.1.0/be.xpi) = 570931 +SHA256 (xpi/thunderbird-i18n-52.1.0/bg.xpi) = 151a7deaddafcdfd704abf7f933daafcc1f1465624b01a856f7c0ff02e3b8701 +SIZE (xpi/thunderbird-i18n-52.1.0/bg.xpi) = 634897 +SHA256 (xpi/thunderbird-i18n-52.1.0/bn-BD.xpi) = f281a18cbd823db0331e351f02543249b90d414f9146579b52d45f2826463403 +SIZE (xpi/thunderbird-i18n-52.1.0/bn-BD.xpi) = 676900 +SHA256 (xpi/thunderbird-i18n-52.1.0/br.xpi) = b31c85a62f99cc6f8e043f52b16f977124f3ba89a0539b064b0b751910496689 +SIZE (xpi/thunderbird-i18n-52.1.0/br.xpi) = 559380 +SHA256 (xpi/thunderbird-i18n-52.1.0/ca.xpi) = 5bb06005edc6dc5cad1836abf4bf2a79a71912a841ea5dcede9ee04c50410e3f +SIZE (xpi/thunderbird-i18n-52.1.0/ca.xpi) = 569909 +SHA256 (xpi/thunderbird-i18n-52.1.0/cs.xpi) = 41d2fcc1cc5aed3f6036f6337bf93aaa9b37a32e99bd9145f4921a6a927b451b +SIZE (xpi/thunderbird-i18n-52.1.0/cs.xpi) = 579149 +SHA256 (xpi/thunderbird-i18n-52.1.0/cy.xpi) = 28321a38846a06bed47996fe5f68c5579baa6c8804138866c307df0d26147fd5 +SIZE (xpi/thunderbird-i18n-52.1.0/cy.xpi) = 554857 +SHA256 (xpi/thunderbird-i18n-52.1.0/da.xpi) = ee813026f6312a6f11572422f0bdac9bb866eb820d8fef917bde943747df18c1 +SIZE (xpi/thunderbird-i18n-52.1.0/da.xpi) = 543334 +SHA256 (xpi/thunderbird-i18n-52.1.0/de.xpi) = bfa9265887d64317841f85222638ec901cc95ec230670994f2231e65d4952836 +SIZE (xpi/thunderbird-i18n-52.1.0/de.xpi) = 555743 +SHA256 (xpi/thunderbird-i18n-52.1.0/dsb.xpi) = e29a9433a9f7b9b8d17bc4be1f95ebfd2c4982fefc3ca90372ae2d627f20ad71 +SIZE (xpi/thunderbird-i18n-52.1.0/dsb.xpi) = 584581 +SHA256 (xpi/thunderbird-i18n-52.1.0/el.xpi) = eedb7abd583f2a4b7a61f81ad79d5ff02159535faba07fc30088776e75837207 +SIZE (xpi/thunderbird-i18n-52.1.0/el.xpi) = 662964 +SHA256 (xpi/thunderbird-i18n-52.1.0/en-GB.xpi) = b916e3be5c5529e321a8defb0397dadc45116d9d06378e86d7007d7babe9fb45 +SIZE (xpi/thunderbird-i18n-52.1.0/en-GB.xpi) = 531233 +SHA256 (xpi/thunderbird-i18n-52.1.0/en-US.xpi) = 803d67f5d6729116b2d1d3ad619c174c122cbe57a51d36f96390f2b563405fa8 +SIZE (xpi/thunderbird-i18n-52.1.0/en-US.xpi) = 529123 +SHA256 (xpi/thunderbird-i18n-52.1.0/es-AR.xpi) = 1140407c98f609ddcfeef4ad9a3538e3c68da86b3fa8a138ab042453e737645b +SIZE (xpi/thunderbird-i18n-52.1.0/es-AR.xpi) = 565995 +SHA256 (xpi/thunderbird-i18n-52.1.0/es-ES.xpi) = 1dad4a61a98a594304708eb8c3056463b07482210cf404a1cc5ab96736eb9c94 +SIZE (xpi/thunderbird-i18n-52.1.0/es-ES.xpi) = 445464 +SHA256 (xpi/thunderbird-i18n-52.1.0/et.xpi) = b54d1f3692b492ae7792ee42ba6c15e668e3ea76021496464feac0414bfcae52 +SIZE (xpi/thunderbird-i18n-52.1.0/et.xpi) = 551660 +SHA256 (xpi/thunderbird-i18n-52.1.0/eu.xpi) = 552f2943a37ec9a3f997d904bd5b852d7cdf9977f0b8fbb87b511662f944e986 +SIZE (xpi/thunderbird-i18n-52.1.0/eu.xpi) = 555536 +SHA256 (xpi/thunderbird-i18n-52.1.0/fi.xpi) = aeb4bdb8cd8a5e1933b784e16ce121c6653b4aaa05c2c6f9b056309933521475 +SIZE (xpi/thunderbird-i18n-52.1.0/fi.xpi) = 550669 +SHA256 (xpi/thunderbird-i18n-52.1.0/fr.xpi) = f41fde901cc9210967ec39e3d258ad568d889f07a1f2fb1e10747ef933631cf0 +SIZE (xpi/thunderbird-i18n-52.1.0/fr.xpi) = 577560 +SHA256 (xpi/thunderbird-i18n-52.1.0/fy-NL.xpi) = a7e856a42d8e021f1e1385857525e5ea751ff143ff725aa15eb6e1c6b78c76cd +SIZE (xpi/thunderbird-i18n-52.1.0/fy-NL.xpi) = 563631 +SHA256 (xpi/thunderbird-i18n-52.1.0/ga-IE.xpi) = 78aa1c4f60ffc943b4541d8ebf08a9c804c7f8c0dad3264e6f09aacb1d5c9e74 +SIZE (xpi/thunderbird-i18n-52.1.0/ga-IE.xpi) = 583555 +SHA256 (xpi/thunderbird-i18n-52.1.0/gd.xpi) = d27cd41dd6595ee588e18ed10736d84b2587f192b84efcaa99a172c055513f11 +SIZE (xpi/thunderbird-i18n-52.1.0/gd.xpi) = 574064 +SHA256 (xpi/thunderbird-i18n-52.1.0/gl.xpi) = 8ea7ae7a48e45854e194ff300510a7f10fb064a68bf0c9fa5cc8c54bb860fa44 +SIZE (xpi/thunderbird-i18n-52.1.0/gl.xpi) = 575150 +SHA256 (xpi/thunderbird-i18n-52.1.0/he.xpi) = 100b0da1c56554c496cf93f1489aff171a6794371e0f2336206f408dc5dbb862 +SIZE (xpi/thunderbird-i18n-52.1.0/he.xpi) = 592565 +SHA256 (xpi/thunderbird-i18n-52.1.0/hr.xpi) = 5161640824d3cd84dafe08f7fef762dbe00c6ec0cc0ada9669c72e42869804e6 +SIZE (xpi/thunderbird-i18n-52.1.0/hr.xpi) = 564779 +SHA256 (xpi/thunderbird-i18n-52.1.0/hu.xpi) = e8264f71facb7aa89aa73ba19253d7d37b247d01bc98399c1bfcb9749b9b8e57 +SIZE (xpi/thunderbird-i18n-52.1.0/hu.xpi) = 586446 +SHA256 (xpi/thunderbird-i18n-52.1.0/hsb.xpi) = d32e7b469905e2831a311bf3b541330b530d57d7bc618d9e2f1e01d4fdf337e2 +SIZE (xpi/thunderbird-i18n-52.1.0/hsb.xpi) = 582241 +SHA256 (xpi/thunderbird-i18n-52.1.0/hy-AM.xpi) = 3fcf04ae1c549aa2408b131389bbbf7d96b3f5ae80ee51fbabcaf57f9af73581 +SIZE (xpi/thunderbird-i18n-52.1.0/hy-AM.xpi) = 629879 +SHA256 (xpi/thunderbird-i18n-52.1.0/id.xpi) = b258b88c3618cf03258e1f2a88b58ed8a9ac8d6f510cbedc65d30fd0d1833a5f +SIZE (xpi/thunderbird-i18n-52.1.0/id.xpi) = 546525 +SHA256 (xpi/thunderbird-i18n-52.1.0/is.xpi) = 9a9ac947b7fa56ad90940214a383d1a2e284f1fae723683fdc03cc5cc044a7f9 +SIZE (xpi/thunderbird-i18n-52.1.0/is.xpi) = 555712 +SHA256 (xpi/thunderbird-i18n-52.1.0/it.xpi) = 81439f2a46fc2fcbaba27a790d13371bb29944dbce536adf3a4bc88c57c58708 +SIZE (xpi/thunderbird-i18n-52.1.0/it.xpi) = 455407 +SHA256 (xpi/thunderbird-i18n-52.1.0/ja.xpi) = c614414408bd3ef96c0acae40c01cef76af07457f73ba3388f96ed646d0e93fb +SIZE (xpi/thunderbird-i18n-52.1.0/ja.xpi) = 630052 +SHA256 (xpi/thunderbird-i18n-52.1.0/ko.xpi) = 3f652698258901e7dfc05751b9c44e6c6cb303b9580b8393b85aa5ba532a5145 +SIZE (xpi/thunderbird-i18n-52.1.0/ko.xpi) = 595516 +SHA256 (xpi/thunderbird-i18n-52.1.0/lt.xpi) = 6800858ccd1722bb805a899af954a62cff97feb6645648ee75cfcb8948628cef +SIZE (xpi/thunderbird-i18n-52.1.0/lt.xpi) = 580598 +SHA256 (xpi/thunderbird-i18n-52.1.0/nb-NO.xpi) = dc7703816f06360432c9f7d69eb4db6524db38605bb43dc33fa61be0582ada08 +SIZE (xpi/thunderbird-i18n-52.1.0/nb-NO.xpi) = 551103 +SHA256 (xpi/thunderbird-i18n-52.1.0/nl.xpi) = cc1bf83672eba56775988c6671ac0101330df302ff7d3b34e3f8d84a3486ee2a +SIZE (xpi/thunderbird-i18n-52.1.0/nl.xpi) = 557956 +SHA256 (xpi/thunderbird-i18n-52.1.0/nn-NO.xpi) = 557458360291cf1b69634329b58e9f8d59f0e235ea23fe04c83692784aa05956 +SIZE (xpi/thunderbird-i18n-52.1.0/nn-NO.xpi) = 551891 +SHA256 (xpi/thunderbird-i18n-52.1.0/pa-IN.xpi) = a7fbb749c6222a020cc50ddd11428c16c3fc9b1349b757426b9d2e2204e2356d +SIZE (xpi/thunderbird-i18n-52.1.0/pa-IN.xpi) = 646568 +SHA256 (xpi/thunderbird-i18n-52.1.0/pl.xpi) = 0ecfed322da41c4e6b21a7fab03d61a2436f0f4e0898928f19eac28b52da8a05 +SIZE (xpi/thunderbird-i18n-52.1.0/pl.xpi) = 469901 +SHA256 (xpi/thunderbird-i18n-52.1.0/pt-BR.xpi) = d5b5bec393b299367610794958ac2d7bef54ad2cc9a29ca2559c8c230bf6564b +SIZE (xpi/thunderbird-i18n-52.1.0/pt-BR.xpi) = 558223 +SHA256 (xpi/thunderbird-i18n-52.1.0/pt-PT.xpi) = 998587a0074de0b0a26206c7de2cb83ff5bebd194e7ce184783fcc2d58eefe97 +SIZE (xpi/thunderbird-i18n-52.1.0/pt-PT.xpi) = 565623 +SHA256 (xpi/thunderbird-i18n-52.1.0/rm.xpi) = 33a1c4dc8cee63c7640f7b492c171015b391f88b2629660b83845726925d1604 +SIZE (xpi/thunderbird-i18n-52.1.0/rm.xpi) = 557604 +SHA256 (xpi/thunderbird-i18n-52.1.0/ro.xpi) = f59e4ac38e6f60808bc7552da66a74a9b059f3e6fd8d1aef2999cac3b157de5a +SIZE (xpi/thunderbird-i18n-52.1.0/ro.xpi) = 570529 +SHA256 (xpi/thunderbird-i18n-52.1.0/ru.xpi) = d152fa89d2e6769b00ef8a7c04debc6da8e8a7013a5faf92038651a99172bec9 +SIZE (xpi/thunderbird-i18n-52.1.0/ru.xpi) = 530669 +SHA256 (xpi/thunderbird-i18n-52.1.0/si.xpi) = f4d0a47bef66689b53506078e961547c0100e7104a5960c9eec2341facad27d5 +SIZE (xpi/thunderbird-i18n-52.1.0/si.xpi) = 649009 +SHA256 (xpi/thunderbird-i18n-52.1.0/sk.xpi) = 5d57f3e86f4e19daf5fa0fc5cb63aaff646d4cbd47a742c04ba77259c25dffb7 +SIZE (xpi/thunderbird-i18n-52.1.0/sk.xpi) = 583881 +SHA256 (xpi/thunderbird-i18n-52.1.0/sl.xpi) = 56dda066bd8e6367351d0790a2765a05813bf19b65aeab27cbdc133609a30b2c +SIZE (xpi/thunderbird-i18n-52.1.0/sl.xpi) = 562830 +SHA256 (xpi/thunderbird-i18n-52.1.0/sq.xpi) = 8a2773b55f020278f658b7254dcedf0d17154b6f5d63400943cd15bf902c9019 +SIZE (xpi/thunderbird-i18n-52.1.0/sq.xpi) = 570615 +SHA256 (xpi/thunderbird-i18n-52.1.0/sr.xpi) = 09f3de38925c36734471ec2694094211236d1edae433280e7547ec57c8040826 +SIZE (xpi/thunderbird-i18n-52.1.0/sr.xpi) = 609019 +SHA256 (xpi/thunderbird-i18n-52.1.0/sv-SE.xpi) = 5f3705d4270357b3e57fd26131155516fc51a47886a20ef143905e15334dd86a +SIZE (xpi/thunderbird-i18n-52.1.0/sv-SE.xpi) = 565777 +SHA256 (xpi/thunderbird-i18n-52.1.0/ta-LK.xpi) = bb585f6cc8166e5445e84220cd432a99489ea898e58edcd7a0b0f2134ba73acd +SIZE (xpi/thunderbird-i18n-52.1.0/ta-LK.xpi) = 675038 +SHA256 (xpi/thunderbird-i18n-52.1.0/tr.xpi) = d95eeadbf12ae6e554a7f9a1453befc6dc3530b3e441491db4ed96aa7c355463 +SIZE (xpi/thunderbird-i18n-52.1.0/tr.xpi) = 569926 +SHA256 (xpi/thunderbird-i18n-52.1.0/uk.xpi) = 124146d36b56811e02c1f6a849611e4977a2189fd95b793b71347532caf76070 +SIZE (xpi/thunderbird-i18n-52.1.0/uk.xpi) = 652854 +SHA256 (xpi/thunderbird-i18n-52.1.0/vi.xpi) = 8e3c84b436a9d0465507bdf42dd42c9b26d23987fd7f7a46cad8dd9f6ad0afcc +SIZE (xpi/thunderbird-i18n-52.1.0/vi.xpi) = 637163 +SHA256 (xpi/thunderbird-i18n-52.1.0/zh-CN.xpi) = e372440fcafc54328c5df328fc22642924eec67fd05e33f8ad5a15cfdbef878b +SIZE (xpi/thunderbird-i18n-52.1.0/zh-CN.xpi) = 593611 +SHA256 (xpi/thunderbird-i18n-52.1.0/zh-TW.xpi) = 2ba552e364815ddebef45de1e7442add05bd81d34516a512b4f6f59b9c3cfdfa +SIZE (xpi/thunderbird-i18n-52.1.0/zh-TW.xpi) = 595728 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index be0c04f..52acedb 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 52.0.1 +DISTVERSION= 52.1.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index f936b11..49b6735 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492181434 -SHA256 (thunderbird-52.0.1.source.tar.xz) = a1cede97e836c728d3157b9e043f3724f7aff83f92ba1f3796e9cc7299402cab -SIZE (thunderbird-52.0.1.source.tar.xz) = 228422924 +TIMESTAMP = 1493583865 +SHA256 (thunderbird-52.1.0.source.tar.xz) = c33ca35b6acd1a0dc0d0f4b1df16745a33144c5d3d3715fe05454a5e9eefd48b +SIZE (thunderbird-52.1.0.source.tar.xz) = 228493044 diff --git a/mail/thunderbird/files/patch-bug1322660 b/mail/thunderbird/files/patch-bug1322660 deleted file mode 100644 index 9944ae4..0000000 --- a/mail/thunderbird/files/patch-bug1322660 +++ /dev/null @@ -1,80 +0,0 @@ ---- mozilla/modules/woff2/src/store_bytes.h -+++ mozilla/modules/woff2/src/store_bytes.h -@@ -29,41 +29,44 @@ inline size_t StoreU32(uint8_t* dst, size_t offset, uint32_t x) { - dst[offset + 1] = x >> 16; - dst[offset + 2] = x >> 8; - dst[offset + 3] = x; - return offset + 4; - } - - inline size_t Store16(uint8_t* dst, size_t offset, int x) { - #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) -- *reinterpret_cast<uint16_t*>(dst + offset) = -- ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8); -+ uint16_t v = ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8); -+ memcpy(dst + offset, &v, 2); - #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) -- *reinterpret_cast<uint16_t*>(dst + offset) = static_cast<uint16_t>(x); -+ uint16_t v = static_cast<uint16_t>(x); -+ memcpy(dst + offset, &v, 2); - #else - dst[offset] = x >> 8; - dst[offset + 1] = x; - #endif - return offset + 2; - } - - inline void StoreU32(uint32_t val, size_t* offset, uint8_t* dst) { - dst[(*offset)++] = val >> 24; - dst[(*offset)++] = val >> 16; - dst[(*offset)++] = val >> 8; - dst[(*offset)++] = val; - } - - inline void Store16(int val, size_t* offset, uint8_t* dst) { - #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) -- *reinterpret_cast<uint16_t*>(dst + *offset) = -+ uint16_t v = ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8); -+ memcpy(dst + *offset, &v, 2); - ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8); - *offset += 2; - #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) -- *reinterpret_cast<uint16_t*>(dst + *offset) = static_cast<uint16_t>(val); -+ uint16_t v = static_cast<uint16_t>(val); -+ memcpy(dst + *offset, &v, 2); - *offset += 2; - #else - dst[(*offset)++] = val >> 8; - dst[(*offset)++] = val; - #endif - } - - inline void StoreBytes(const uint8_t* data, size_t len, ---- mozilla/modules/woff2/src/woff2_common.cc -+++ mozilla/modules/woff2/src/woff2_common.cc -@@ -20,22 +20,23 @@ - - namespace woff2 { - - - uint32_t ComputeULongSum(const uint8_t* buf, size_t size) { - uint32_t checksum = 0; - size_t aligned_size = size & ~3; - for (size_t i = 0; i < aligned_size; i += 4) { -+ uint32_t v; -+ memcpy(&v, buf + i, 4); - #if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) -- uint32_t v = *reinterpret_cast<const uint32_t*>(buf + i); - checksum += (((v & 0xFF) << 24) | ((v & 0xFF00) << 8) | - ((v & 0xFF0000) >> 8) | ((v & 0xFF000000) >> 24)); - #elif (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) -- checksum += *reinterpret_cast<const uint32_t*>(buf + i); -+ checksum += v; - #else - checksum += (buf[i] << 24) | (buf[i + 1] << 16) | - (buf[i + 2] << 8) | buf[i + 3]; - #endif - } - - // treat size not aligned on 4 as if it were padded to 4 with 0's - if (size != aligned_size) { diff --git a/mail/thunderbird/files/patch-bug1359051 b/mail/thunderbird/files/patch-bug1359051 new file mode 100644 index 0000000..b3dcbb4 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1359051 @@ -0,0 +1,31 @@ +commit fe7592e16fcc +Author: Sean Stangl <sstangl@mozilla.com> +Date: Mon Apr 24 07:10:58 2017 -0700 + + Bug 1359051 - Define cacheFlush for non-Simulator ARM64 builds. r=tcampbell +--- + js/src/jit/ExecutableAllocator.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h +index 3a42918142ef..570a25ff0dc3 100644 +--- mozilla/js/src/jit/ExecutableAllocator.h ++++ mozilla/js/src/jit/ExecutableAllocator.h +@@ -259,7 +259,7 @@ class ExecutableAllocator + { + __clear_cache(code, reinterpret_cast<char*>(code) + size); + } +-#elif defined(JS_CODEGEN_ARM) && defined(XP_IOS) ++#elif (defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)) && defined(XP_IOS) + static void cacheFlush(void* code, size_t size) + { + sys_icache_invalidate(code, size); +@@ -297,7 +297,7 @@ class ExecutableAllocator + : "r0", "r1", "r2"); + } + } +-#elif defined(JS_CODEGEN_ARM64) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__) ++#elif defined(JS_CODEGEN_ARM64) + static void cacheFlush(void* code, size_t size) + { + __clear_cache(code, (void *)((size_t)code + size)); diff --git a/mail/thunderbird/files/patch-bug1359142 b/mail/thunderbird/files/patch-bug1359142 new file mode 100644 index 0000000..d6f5563 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1359142 @@ -0,0 +1,57 @@ +Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64|MIPS) on BSDs + +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index 1ab76eeb4bd9..bcdff0487837 100644 +--- mozilla/js/src/wasm/WasmSignalHandlers.cpp ++++ mozilla/js/src/wasm/WasmSignalHandlers.cpp +@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault + # define R12_sig(p) ((p)->sc_r12) + # define R13_sig(p) ((p)->sc_r13) + # define R14_sig(p) ((p)->sc_r14) +-# define R15_sig(p) ((p)->sc_r15) ++# if defined(__arm__) ++# define R15_sig(p) ((p)->sc_pc) ++# else ++# define R15_sig(p) ((p)->sc_r15) ++# endif ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->sc_elr) ++# define RFP_sig(p) ((p)->sc_x[29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->sc_pc) ++# define RFP_sig(p) ((p)->sc_regs[30]) ++# endif + #elif defined(__linux__) || defined(SOLARIS) + # if defined(__linux__) + # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) +@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault + # define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13]) + # define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14]) + # define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15]) ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) ++# endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + # if defined(__DragonFly__) + # define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i]) +@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault + # else + # define R15_sig(p) ((p)->uc_mcontext.mc_r15) + # endif ++# if defined(__FreeBSD__) && defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29]) ++# endif ++# if defined(__FreeBSD__) && defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_pc) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++# endif + #elif defined(XP_DARWIN) + # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip) + # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp) diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile index 10c3e42..9dc8c7c 100644 --- a/net/openntpd/Makefile +++ b/net/openntpd/Makefile @@ -2,7 +2,7 @@ PORTNAME= openntpd PORTVERSION= 6.0p1 -PORTREVISION= 4 +PORTREVISION= 6 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile index 12ac00b..1c866e6 100644 --- a/print/harfbuzz/Makefile +++ b/print/harfbuzz/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= harfbuzz -PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTVERSION= 1.4.6 CATEGORIES= print MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ @@ -23,6 +22,6 @@ CONFIGURE_ARGS= --with-graphite2 --with-gobject=yes INSTALL_TARGET= install-strip TEST_TARGET= check -PLIST_SUB+= LIBVER=0.10400.5 +PLIST_SUB+= LIBVER=0.10400.6 .include <bsd.port.mk> diff --git a/print/harfbuzz/distinfo b/print/harfbuzz/distinfo index 38c2754..efe63c3 100644 --- a/print/harfbuzz/distinfo +++ b/print/harfbuzz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489215708 -SHA256 (harfbuzz-1.4.5.tar.bz2) = d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711 -SIZE (harfbuzz-1.4.5.tar.bz2) = 1474461 +TIMESTAMP = 1491399519 +SHA256 (harfbuzz-1.4.6.tar.bz2) = 21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293 +SIZE (harfbuzz-1.4.6.tar.bz2) = 1475086 diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile index 18881cd..a287f4a 100644 --- a/security/acme-client/Makefile +++ b/security/acme-client/Makefile @@ -3,6 +3,7 @@ PORTNAME= acme-client PORTVERSION= 0.1.16 +PORTREVISION= 1 DISTVERSIONPREFIX= portable- CATEGORIES= security MASTER_SITES= https://kristaps.bsd.lv/${PORTNAME}/snapshots/ \ diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 2856bee..ee0589f 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stunnel -PORTVERSION= 5.40 +PORTVERSION= 5.41 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.stunnel.org/downloads/%SUBDIR%/ \ diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 0a60a57..bc18d61 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485624002 -SHA256 (stunnel-5.40.tar.gz) = 23acdb390326ffd507d90f8984ecc90e0d9993f6bd6eac1d0a642456565c45ff -SIZE (stunnel-5.40.tar.gz) = 648828 +TIMESTAMP = 1493225335 +SHA256 (stunnel-5.41.tar.gz) = f05c6321ee1f6ddebacc234ccf20825971941e831b5beea6d0ce0b8e1668148f +SIZE (stunnel-5.41.tar.gz) = 649807 diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile index 40a871c..7e3e4c0 100644 --- a/textproc/ibus/Makefile +++ b/textproc/ibus/Makefile @@ -3,7 +3,7 @@ PORTNAME= ibus PORTVERSION= 1.5.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/:DEFAULT \ https://raw.githubusercontent.com/Ranks/emojione/${EMOJIONE_TAG}/:emojione @@ -110,9 +110,6 @@ PLIST_SUB+= COMPDIR="@comment " post-extract-EMOJI-on: ${CP} ${DISTDIR}/emoji.json ${WRKSRC}/ -post-patch: - ${REINPLACE_CMD} -e 's|/var/lib/dbus|/var/db/dbus|g' ${WRKSRC}/src/ibusshare.c - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart ${INSTALL_DATA} ${PATCHDIR}/ibus.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 2c9c9b3..68246ac 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 57.0.2987.133 +PORTVERSION= 58.0.3029.81 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -20,6 +20,7 @@ BUILD_DEPENDS= gperf:devel/gperf \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ bash:shells/bash \ flock:sysutils/flock \ + node:www/node \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ @@ -88,7 +89,8 @@ GN_ARGS+= is_clang=true \ toolkit_views=true \ use_allocator="none" \ use_aura=true \ - use_experimental_allocator_shim=true \ + use_cups=true \ + use_experimental_allocator_shim=false \ treat_warnings_as_errors=false \ use_sysroot=false \ use_system_libjpeg=true \ @@ -196,16 +198,10 @@ MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ # TODO: move this big extra to small ones EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang -.if ${OPSYS} == FreeBSD -.if ${OSVERSION} < 1100000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 -.endif - # Work around base r261801 -.if ${OSVERSION} < 1100508 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1" .endif -.endif pre-everything:: @${ECHO_MSG} @@ -217,9 +213,6 @@ pre-everything:: @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} - @${ECHO_MSG} "Make sure you have Python build with the SEM option ON" - @${ECHO_MSG} "(default in python27-2.7.8 since r361735)" - @${ECHO_MSG} pre-configure: # We used to remove bundled libraries to be sure that chromium uses @@ -238,6 +231,10 @@ do-configure: cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} + # Setup nodejs dependency + @${MKDIR} ${WRKSRC}/third_party/node/linux/node-linux-x64/bin + ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/linux/node-linux-x64/bin/node + test regression-test: build .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 2530768..269159a 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1490878091 -SHA256 (chromium-57.0.2987.133.tar.xz) = 70011770a7e522c92826a3af48d3fd28a46bf8042897d072d20c748cbf828cf7 -SIZE (chromium-57.0.2987.133.tar.xz) = 525240460 -SHA256 (chromium-57.0.2987.133-testdata.tar.xz) = 16188e40b7dccbbce4f20dd0a2c5dafabc98c4fd55bbbc85d1458a736e2d8084 -SIZE (chromium-57.0.2987.133-testdata.tar.xz) = 124080256 +TIMESTAMP = 1492682402 +SHA256 (chromium-58.0.3029.81.tar.xz) = 5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb +SIZE (chromium-58.0.3029.81.tar.xz) = 509252204 +SHA256 (chromium-58.0.3029.81-testdata.tar.xz) = 8fa8d18c5ccfa8cbb067c4d88a0b8ed0dfd52b5d784c2cf48b91d1cb3a2fb264 +SIZE (chromium-58.0.3029.81-testdata.tar.xz) = 124158512 diff --git a/www/chromium/files/extra-patch-10 b/www/chromium/files/extra-patch-10 deleted file mode 100644 index f0ea2ae..0000000 --- a/www/chromium/files/extra-patch-10 +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/skia/src/core/SkSmallAllocator.h.orig 2017-02-01 20:16:14.715097000 +0100 -+++ third_party/skia/src/core/SkSmallAllocator.h 2017-02-01 20:24:56.680605000 +0100 -@@ -20,7 +20,7 @@ - // abstract type. The complication with max_align_t is that it is defined differently for - // different builds. - namespace { --#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) -+#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) || defined(__FreeBSD__) - // Use std::max_align_t for compiles that follow the standard. - #include <cstddef> - using SystemAlignment = std::max_align_t; diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index c5f7f8f..1d9997e 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -52,6 +52,17 @@ EXPECT_CALL(callback_, OnError(_)) .Times(2); +--- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2017-04-19 19:06:52 UTC ++++ third_party/libjingle_xmpp/task_runner/taskrunner.cc +@@ -95,7 +95,7 @@ void TaskRunner::InternalRunTasks(bool i + std::vector<Task *>::iterator it; + it = std::remove(tasks_.begin(), + tasks_.end(), +- reinterpret_cast<Task *>(NULL)); ++ static_cast<Task *>(NULL)); + + tasks_.erase(it, tasks_.end()); + --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 @@ -439,7 +439,7 @@ @@ -99,13 +110,3 @@ CMapFormat::kFormat4, cmap_id) { } ---- third_party/webrtc/base/taskrunner.cc.orig 2017-03-09 21:05:29.000000000 +0100 -+++ third_party/webrtc/base/taskrunner.cc 2017-03-10 13:19:54.203141000 +0100 -@@ -96,7 +96,7 @@ - std::vector<Task *>::iterator it; - it = std::remove(tasks_.begin(), - tasks_.end(), -- reinterpret_cast<Task *>(NULL)); -+ static_cast<Task *>(NULL)); - - tasks_.erase(it, tasks_.end()); diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index f16e1e8..7ca8be9 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2017-03-09 20:04:26 UTC +--- BUILD.gn.orig 2017-04-19 19:06:27 UTC +++ BUILD.gn -@@ -221,7 +221,7 @@ group("both_gn_and_gyp") { +@@ -220,7 +220,7 @@ group("both_gn_and_gyp") { ] } @@ -9,7 +9,7 @@ deps += [ "//chrome", "//chrome/test:browser_tests", -@@ -281,7 +281,7 @@ group("both_gn_and_gyp") { +@@ -277,7 +277,7 @@ group("both_gn_and_gyp") { ] } @@ -18,7 +18,7 @@ # TODO(GYP): Figure out which of these should actually build on iOS, # and whether there should be other targets that are iOS-only and missing. deps += [ -@@ -325,7 +325,7 @@ group("both_gn_and_gyp") { +@@ -322,7 +322,7 @@ group("both_gn_and_gyp") { "//ui/touch_selection:ui_touch_selection_unittests", "//url/ipc:url_ipc_unittests", ] @@ -27,7 +27,7 @@ deps += [ "//ios:all" ] } -@@ -495,7 +495,7 @@ group("both_gn_and_gyp") { +@@ -482,7 +482,7 @@ group("both_gn_and_gyp") { ] } @@ -36,7 +36,7 @@ # The following are definitely linux-only. deps += [ "//chrome:manpage", -@@ -518,9 +518,16 @@ group("both_gn_and_gyp") { +@@ -505,9 +505,16 @@ group("both_gn_and_gyp") { # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } @@ -54,7 +54,7 @@ deps += [ "//base:base_i18n_perftests", "//base:base_perftests", -@@ -592,7 +599,7 @@ group("both_gn_and_gyp") { +@@ -578,7 +585,7 @@ group("both_gn_and_gyp") { if (enable_nacl) { deps += [ "//components/nacl/loader:nacl_loader_unittests" ] @@ -63,7 +63,7 @@ # TODO(dpranke): Figure out what platforms should actually have this. deps += [ "//components/nacl/loader:nacl_helper" ] -@@ -700,7 +707,7 @@ group("both_gn_and_gyp") { +@@ -684,7 +691,7 @@ group("both_gn_and_gyp") { deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } @@ -72,7 +72,7 @@ deps += [ "//breakpad:symupload($host_toolchain)" ] } -@@ -745,7 +752,7 @@ group("gn_only") { +@@ -728,7 +735,7 @@ group("gn_only") { deps += [ "//components/proximity_auth:proximity_auth_unittests" ] } @@ -81,7 +81,7 @@ deps += [ "//mash:all", "//media/mojo/services:media_service_unittests", -@@ -771,7 +778,7 @@ group("gn_only") { +@@ -754,7 +761,7 @@ group("gn_only") { } } @@ -90,7 +90,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps += [ -@@ -826,7 +833,7 @@ group("gn_only") { +@@ -794,7 +801,7 @@ group("gn_only") { } if (target_cpu == "x86" || target_cpu == "x64") { @@ -99,7 +99,7 @@ deps += [ "//chrome/test:load_library_perf_tests" ] } deps += [ -@@ -834,7 +841,7 @@ group("gn_only") { +@@ -802,7 +809,7 @@ group("gn_only") { "//third_party/libjpeg_turbo:simd_asm", ] } @@ -108,7 +108,7 @@ deps += [ "//v8:v8_shell" ] } } -@@ -844,7 +851,7 @@ group("gn_only") { +@@ -812,7 +819,7 @@ group("gn_only") { } if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || @@ -117,7 +117,7 @@ deps += [ "//testing/libfuzzer/fuzzers", "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -876,7 +883,7 @@ group("gn_only") { +@@ -844,7 +851,7 @@ group("gn_only") { group("gn_mojo_targets") { testonly = true @@ -126,7 +126,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps = [ -@@ -902,7 +909,7 @@ group("gn_visibility") { +@@ -870,7 +877,7 @@ group("gn_visibility") { } } @@ -135,7 +135,7 @@ # This group includes all of the targets needed to build and test Blink, # including running the layout tests (see below). group("blink_tests") { -@@ -948,7 +955,7 @@ if (!is_ios) { +@@ -935,7 +942,7 @@ if (!is_ios) { data_deps += [ "//content/shell:content_shell_crash_service" ] } @@ -144,7 +144,7 @@ data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -956,7 +963,7 @@ if (!is_ios) { +@@ -943,7 +950,7 @@ if (!is_ios) { data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } @@ -153,7 +153,7 @@ data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } -@@ -978,7 +985,7 @@ group("chromium_swarm_tests") { +@@ -979,7 +986,7 @@ group("chromium_swarm_tests") { group("chromium_builder_perf") { testonly = true @@ -162,7 +162,7 @@ data_deps = [ "//cc:cc_perftests", "//chrome/test:load_library_perf_tests", -@@ -1008,7 +1015,7 @@ group("chromium_builder_perf") { +@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") { "//chrome/installer/mini_installer:mini_installer", "//chrome/test:angle_perftests", ] diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc index 451590e..debd179 100644 --- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,4 +1,4 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2017-02-02 02:02:46 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2017-04-19 19:06:27 UTC +++ apps/ui/views/app_window_frame_view.cc @@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsF gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index 26559e1..b70a8c5 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2017-01-26 00:49:06 UTC +--- ash/display/mirror_window_controller.cc.orig 2017-04-19 19:06:27 UTC +++ ash/display/mirror_window_controller.cc -@@ -250,7 +250,11 @@ void MirrorWindowController::UpdateWindo +@@ -251,7 +251,11 @@ void MirrorWindowController::UpdateWindo return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index eedcb50..58fb5db 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,7 +1,17 @@ ---- base/BUILD.gn.orig 2017-03-09 20:04:26 UTC +--- base/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ base/BUILD.gn -@@ -1116,6 +1116,35 @@ component("base") { - public_deps += [ "//base/allocator:unified_allocator_shim" ] +@@ -1156,6 +1156,9 @@ component("base") { + deps += [ "//base/allocator:tcmalloc" ] + } else if (is_linux && use_allocator == "none") { + sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] ++ } else if (is_bsd && use_allocator == "none") { ++ # TODO move the code to "allocator_shim_default_dispatch_to_glibc.cc" ++ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] + } else if (is_android && use_allocator == "none") { + sources += [ + "allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc", +@@ -1171,6 +1174,34 @@ component("base") { + } } + if (is_bsd) { @@ -15,11 +25,10 @@ + "sys_info_linux.cc", + "trace_event/malloc_dump_provider.cc", + "trace_event/malloc_dump_provider.h", -+ "debug/proc_maps_linux.cc", -+ "debug/proc_maps_linux.h", + ] + sources += [ + "files/file_path_watcher_stub.cc", ++ "process/memory_stubs.cc", + "process/process_handle_freebsd.cc", + "process/process_iterator_freebsd.cc", + "process/process_metrics_freebsd.cc", @@ -36,7 +45,7 @@ # Allow more direct string conversions on platforms with native utf8 # strings if (is_mac || is_ios || is_chromeos || is_chromecast) { -@@ -1416,7 +1445,7 @@ component("base") { +@@ -1467,7 +1498,7 @@ component("base") { } # Linux. @@ -45,7 +54,7 @@ if (is_asan || is_lsan || is_msan || is_tsan) { # For llvm-sanitizer. data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] -@@ -1441,7 +1470,7 @@ component("base") { +@@ -1492,7 +1523,7 @@ component("base") { "//base/third_party/xdg_user_dirs", ] } else { @@ -54,7 +63,7 @@ sources -= [ "nix/mime_util_xdg.cc", "nix/mime_util_xdg.h", -@@ -1457,6 +1486,13 @@ component("base") { +@@ -1508,6 +1539,13 @@ component("base") { } } @@ -68,7 +77,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2245,6 +2281,12 @@ test("base_unittests") { +@@ -2309,6 +2347,12 @@ test("base_unittests") { set_sources_assignment_filter(sources_assignment_filter) } diff --git a/www/chromium/files/patch-base__trace_event__process_memory_dump.h b/www/chromium/files/patch-base__trace_event__process_memory_dump.h index 1f65c35..b92550a 100644 --- a/www/chromium/files/patch-base__trace_event__process_memory_dump.h +++ b/www/chromium/files/patch-base__trace_event__process_memory_dump.h @@ -1,4 +1,4 @@ ---- base/trace_event/process_memory_dump.h.orig 2017-01-26 00:49:07 UTC +--- base/trace_event/process_memory_dump.h.orig 2017-04-19 19:06:28 UTC +++ base/trace_event/process_memory_dump.h @@ -24,7 +24,7 @@ diff --git a/www/chromium/files/patch-base_allocator_BUILD.gn b/www/chromium/files/patch-base_allocator_BUILD.gn deleted file mode 100644 index 316bc3b..0000000 --- a/www/chromium/files/patch-base_allocator_BUILD.gn +++ /dev/null @@ -1,12 +0,0 @@ ---- base/allocator/BUILD.gn.orig 2017-01-26 00:49:07 UTC -+++ base/allocator/BUILD.gn -@@ -338,6 +338,9 @@ if (use_experimental_allocator_shim) { - ] - } else if (is_linux && use_allocator == "none") { - sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ] -+ } else if (is_bsd && use_allocator == "none") { -+ # TODO move the code to allocator_shim_default_dispatch_to_libc.cc" -+ sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ] - } else if (is_android && use_allocator == "none") { - sources += [ - "allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc", diff --git a/www/chromium/files/patch-base_allocator_allocator__shim.cc b/www/chromium/files/patch-base_allocator_allocator__shim.cc index 33cf887..511d90c 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim.cc @@ -1,6 +1,6 @@ ---- base/allocator/allocator_shim.cc.orig 2017-02-02 02:02:47 UTC +--- base/allocator/allocator_shim.cc.orig 2017-04-19 19:06:28 UTC +++ base/allocator/allocator_shim.cc -@@ -89,7 +89,7 @@ inline const allocator::AllocatorDispatc +@@ -81,7 +81,7 @@ inline const allocator::AllocatorDispatc // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully // barriered on Linux+Clang, and that causes visible perf regressons. return reinterpret_cast<const allocator::AllocatorDispatch*>( diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index ea29f59..3c57e65 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-01-26 00:49:07 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-04-19 19:06:28 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc @@ -3,19 +3,28 @@ // found in the LICENSE file. @@ -37,32 +37,41 @@ } // extern "C" namespace { -@@ -23,23 +32,23 @@ namespace { +@@ -23,32 +32,32 @@ namespace { using base::allocator::AllocatorDispatch; - void* GlibcMalloc(const AllocatorDispatch*, size_t size) { + void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { - return __libc_malloc(size); + return __malloc(size); } - void* GlibcCalloc(const AllocatorDispatch*, size_t n, size_t size) { + void* GlibcCalloc(const AllocatorDispatch*, + size_t n, + size_t size, + void* context) { - return __libc_calloc(n, size); + return __calloc(n, size); } - void* GlibcRealloc(const AllocatorDispatch*, void* address, size_t size) { + void* GlibcRealloc(const AllocatorDispatch*, + void* address, + size_t size, + void* context) { - return __libc_realloc(address, size); + return __realloc(address, size); } - void* GlibcMemalign(const AllocatorDispatch*, size_t alignment, size_t size) { + void* GlibcMemalign(const AllocatorDispatch*, + size_t alignment, + size_t size, + void* context) { - return __libc_memalign(alignment, size); + return __memalign(alignment, size); } - void GlibcFree(const AllocatorDispatch*, void* address) { + void GlibcFree(const AllocatorDispatch*, void* address, void* context) { - __libc_free(address); + __free(address); } - size_t GlibcGetSizeEstimate(const AllocatorDispatch*, void* address) { + size_t GlibcGetSizeEstimate(const AllocatorDispatch*, diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h index 15c93d8..ee8a836 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h +++ b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_override_libc_symbols.h.orig 2017-01-26 00:49:07 UTC +--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2017-04-19 19:06:28 UTC +++ base/allocator/allocator_shim_override_libc_symbols.h @@ -10,7 +10,7 @@ #endif diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc index d5e9bc70..a27e4d2 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,61 +1,36 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2017-03-09 20:04:26 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2017-04-19 19:06:28 UTC +++ base/allocator/allocator_shim_unittest.cc -@@ -4,7 +4,6 @@ - - #include "base/allocator/allocator_shim.h" - --#include <malloc.h> - #include <stdlib.h> - #include <string.h> - -@@ -196,11 +195,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS - ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u); +@@ -289,7 +289,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS + ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); + #endif // !OS_WIN - #if !defined(OS_WIN) -+#if !defined(OS_BSD) +-#if !defined(OS_WIN) && !defined(OS_MACOSX) ++#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD) void* memalign_ptr = memalign(128, 53); ASSERT_NE(nullptr, memalign_ptr); ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128); - ASSERT_GE(aligned_allocs_intercepted_by_alignment[128], 1u); - ASSERT_GE(aligned_allocs_intercepted_by_size[53], 1u); -+#endif - - void* posix_memalign_ptr = nullptr; - int res = posix_memalign(&posix_memalign_ptr, 256, 59); -@@ -217,12 +218,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS - ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); - ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); - -+#if !defined(OS_BSD) - void* pvalloc_ptr = pvalloc(67); - ASSERT_NE(nullptr, pvalloc_ptr); - ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(pvalloc_ptr) % kPageSize); +@@ -302,7 +302,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); // pvalloc rounds the size up to the next page. ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); -+#endif - #endif // OS_WIN +-#endif // !OS_WIN && !OS_MACOSX ++#endif // !OS_WIN && !OS_MACOSX && !OS_BSD - char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71)); -@@ -243,8 +246,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS + char* realloc_ptr = static_cast<char*>(malloc(10)); + strcpy(realloc_ptr, "foobar"); +@@ -318,13 +318,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS + free(zero_alloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); - #if !defined(OS_WIN) -+#if !defined(OS_BSD) +-#if !defined(OS_WIN) && !defined(OS_MACOSX) ++#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD) free(memalign_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u); -+#endif - free(posix_memalign_ptr); - ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u); -@@ -252,8 +257,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS - free(valloc_ptr); - ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u); - -+#if !defined(OS_BSD) free(pvalloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); -+#endif - #endif // OS_WIN +-#endif // !OS_WIN && !OS_MACOSX ++#endif // !OS_WIN && !OS_MACOSX && !OS_BSD - free(realloc_ptr); + #if !defined(OS_WIN) + free(posix_memalign_ptr); diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc index cdbf70a..9eded9c 100644 --- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -1,4 +1,4 @@ ---- base/debug/proc_maps_linux.cc.orig 2017-01-26 00:49:07 UTC +--- base/debug/proc_maps_linux.cc.orig 2017-04-19 19:06:28 UTC +++ base/debug/proc_maps_linux.cc @@ -12,7 +12,7 @@ #include "base/strings/string_split.h" diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 7e2f27d..6b2420b 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace_posix.cc.orig 2017-03-09 20:04:26 UTC +--- base/debug/stack_trace_posix.cc.orig 2017-04-19 19:06:28 UTC +++ base/debug/stack_trace_posix.cc -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #include <AvailabilityMacros.h> #endif @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -574,6 +574,10 @@ class SandboxSymbolizeHelper { +@@ -575,6 +575,10 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -20,7 +20,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -589,6 +593,7 @@ class SandboxSymbolizeHelper { +@@ -590,6 +594,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc b/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc index 3678de1..3c59be9 100644 --- a/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc +++ b/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc @@ -1,6 +1,6 @@ ---- base/debug/thread_heap_usage_tracker.cc.orig 2017-01-26 00:49:07 UTC +--- base/debug/thread_heap_usage_tracker.cc.orig 2017-04-19 19:06:28 UTC +++ base/debug/thread_heap_usage_tracker.cc -@@ -14,11 +14,13 @@ +@@ -16,11 +16,13 @@ #include "base/threading/thread_local_storage.h" #include "build/build_config.h" diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc index 61892b2..167644a 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_unittest.cc.orig 2017-01-26 00:49:07 UTC +--- base/files/file_path_unittest.cc.orig 2017-04-19 19:06:28 UTC +++ base/files/file_path_unittest.cc @@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_ "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, diff --git a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h index d8f64ce..e8e9425 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h +++ b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2017-01-26 00:49:07 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2017-04-19 19:06:28 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index d6ce76c..9600826 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2017-01-26 00:49:07 UTC +--- base/files/file_util.h.orig 2017-04-19 19:06:28 UTC +++ base/files/file_util.h -@@ -404,7 +404,7 @@ BASE_EXPORT bool VerifyPathControlledByA +@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByA // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 50717f7..1d8fc3e 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,4 +1,4 @@ ---- base/linux_util.cc.orig 2017-01-26 00:49:07 UTC +--- base/linux_util.cc.orig 2017-04-19 19:06:28 UTC +++ base/linux_util.cc @@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] = "CrOS"; diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index ef6cb339..b1db681 100644 --- a/www/chromium/files/patch-base_native__library__posix.cc +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -1,4 +1,4 @@ ---- base/native_library_posix.cc.orig 2017-01-26 00:49:07 UTC +--- base/native_library_posix.cc.orig 2017-04-19 19:06:28 UTC +++ base/native_library_posix.cc @@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio // further investigation, as it might vary across versions. Crash here to diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc index 13b9d6e..997b59b 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2017-01-26 00:49:07 UTC +--- base/posix/unix_domain_socket_linux.cc.orig 2017-04-19 19:06:28 UTC +++ base/posix/unix_domain_socket_linux.cc @@ -23,6 +23,15 @@ diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc index 63cebea..388ab54 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2017-01-26 00:49:07 UTC +--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2017-04-19 19:06:28 UTC +++ base/posix/unix_domain_socket_linux_unittest.cc @@ -2,10 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index 933476b..eabb22e 100644 --- a/www/chromium/files/patch-base_process_internal__linux.h +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 2017-01-26 00:49:07 UTC +--- base/process/internal_linux.h.orig 2017-04-19 19:06:28 UTC +++ base/process/internal_linux.h @@ -14,6 +14,8 @@ diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc index 074b23e..2dca0a6 100644 --- a/www/chromium/files/patch-base_process_launch.cc +++ b/www/chromium/files/patch-base_process_launch.cc @@ -1,4 +1,4 @@ ---- base/process/launch.cc.orig 2017-01-26 00:49:07 UTC +--- base/process/launch.cc.orig 2017-04-19 19:06:28 UTC +++ base/process/launch.cc @@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 3f59591..5489c61 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,4 +1,4 @@ ---- base/process/launch.h.orig 2017-01-26 00:49:07 UTC +--- base/process/launch.h.orig 2017-04-19 19:06:28 UTC +++ base/process/launch.h @@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions { // will be the same as its pid. diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index 87cf64b..7d93979 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,4 +1,4 @@ ---- base/process/launch_posix.cc.orig 2017-01-26 00:49:07 UTC +--- base/process/launch_posix.cc.orig 2017-04-19 19:06:28 UTC +++ base/process/launch_posix.cc @@ -64,6 +64,7 @@ #include "base/feature_list.h" diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc new file mode 100644 index 0000000..bb441fd --- /dev/null +++ b/www/chromium/files/patch-base_process_memory.cc @@ -0,0 +1,11 @@ +--- base/process/memory.cc.orig 2017-04-19 19:06:28 UTC ++++ base/process/memory.cc +@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t + #endif + + // Defined in memory_mac.mm for Mac. +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + + bool UncheckedCalloc(size_t num_items, size_t size, void** result) { + const size_t alloc_size = num_items * size; diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index 952ad87..f2b7f52 100644 --- a/www/chromium/files/patch-base_process_memory.h +++ b/www/chromium/files/patch-base_process_memory.h @@ -1,4 +1,4 @@ ---- base/process/memory.h.orig 2017-01-26 00:49:07 UTC +--- base/process/memory.h.orig 2017-04-19 19:06:28 UTC +++ base/process/memory.h @@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO // Crash reporting classifies such crashes as OOM. diff --git a/www/chromium/files/patch-base_process_memory__stubs.cc b/www/chromium/files/patch-base_process_memory__stubs.cc index 4cddbcf..80d7a0c 100644 --- a/www/chromium/files/patch-base_process_memory__stubs.cc +++ b/www/chromium/files/patch-base_process_memory__stubs.cc @@ -1,4 +1,4 @@ ---- base/process/memory_stubs.cc.orig 2017-01-26 00:49:07 UTC +--- base/process/memory_stubs.cc.orig 2017-04-19 19:06:28 UTC +++ base/process/memory_stubs.cc @@ -31,6 +31,8 @@ void TerminateBecauseOutOfMemory(size_t // their respective stdlib function since those functions will return null on a diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 3e0539f..41f8b29 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/memory_unittest.cc.orig 2017-01-26 00:49:07 UTC +--- base/process/memory_unittest.cc.orig 2017-04-19 19:06:28 UTC +++ base/process/memory_unittest.cc -@@ -82,10 +82,10 @@ TEST(MemoryTest, AllocatorShimWorking) { +@@ -93,10 +93,10 @@ TEST(MemoryTest, AllocatorShimWorking) { ASSERT_TRUE(base::allocator::IsAllocatorInitialized()); } @@ -13,7 +13,7 @@ BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -@@ -439,5 +439,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked +@@ -488,5 +488,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); EXPECT_TRUE(value_ == NULL); } diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc index 67ffd9e..4115ed2 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_freebsd.cc.orig 2017-01-26 00:49:07 UTC +--- base/process/process_handle_freebsd.cc.orig 2017-04-19 19:06:28 UTC +++ base/process/process_handle_freebsd.cc @@ -16,7 +16,7 @@ namespace base { diff --git a/www/chromium/files/patch-base_process_process__info__linux.cc b/www/chromium/files/patch-base_process_process__info__linux.cc index 2ce0f8e..ce71cfc 100644 --- a/www/chromium/files/patch-base_process_process__info__linux.cc +++ b/www/chromium/files/patch-base_process_process__info__linux.cc @@ -1,4 +1,4 @@ ---- base/process/process_info_linux.cc.orig 2017-01-26 00:49:07 UTC +--- base/process/process_info_linux.cc.orig 2017-04-19 19:06:28 UTC +++ base/process/process_info_linux.cc @@ -11,10 +11,28 @@ #include "base/process/process_handle.h" @@ -26,10 +26,10 @@ + return Time::FromTimeVal(proc.ki_start); +#endif +#else - ProcessHandle pid = GetCurrentProcessHandle(); int64_t start_ticks = - internal::ReadProcStatsAndGetFieldAsInt64(pid, internal::VM_STARTTIME); -@@ -23,6 +41,7 @@ const Time CurrentProcessInfo::CreationT + internal::ReadProcSelfStatsAndGetFieldAsInt64(internal::VM_STARTTIME); + DCHECK(start_ticks); +@@ -22,6 +40,7 @@ const Time CurrentProcessInfo::CreationT Time boot_time = internal::GetBootTime(); DCHECK(!boot_time.is_null()); return Time(boot_time + start_offset); diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc index 9062d3c..2ac07ce 100644 --- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2017-01-26 00:49:07 UTC +--- base/process/process_iterator_freebsd.cc.orig 2017-04-19 19:06:28 UTC +++ base/process/process_iterator_freebsd.cc @@ -10,6 +10,10 @@ #include <sys/sysctl.h> diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 8f98ccd..b40a0e8 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2017-03-09 20:04:26 UTC +--- base/process/process_metrics.h.orig 2017-04-19 19:06:28 UTC +++ base/process/process_metrics.h @@ -22,6 +22,12 @@ #include "base/values.h" diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index d18ef69..89aa3be 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2017-01-26 00:49:07 UTC +--- base/process/process_metrics_freebsd.cc.orig 2017-04-19 19:06:28 UTC +++ base/process/process_metrics_freebsd.cc @@ -13,6 +13,9 @@ #include "base/memory/ptr_util.h" diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc index a67e3bf..cfaca45 100644 --- a/www/chromium/files/patch-base_process_process__posix.cc +++ b/www/chromium/files/patch-base_process_process__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_posix.cc.orig 2017-01-26 00:49:07 UTC +--- base/process/process_posix.cc.orig 2017-04-19 19:06:28 UTC +++ base/process/process_posix.cc @@ -21,8 +21,18 @@ #include <sys/event.h> @@ -53,9 +53,9 @@ +} +#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) - bool Process::IsValid() const { - return process_ != kNullProcessHandle; -@@ -365,15 +379,32 @@ bool Process::WaitForExitWithTimeout(Tim + // static + void Process::TerminateCurrentProcessImmediately(int exit_code) { +@@ -370,15 +384,32 @@ bool Process::WaitForExitWithTimeout(Tim bool Process::IsProcessBackgrounded() const { // See SetProcessBackgrounded(). DCHECK(IsValid()); diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 9e4f597..b1d245a6 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-01-26 00:49:07 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-04-19 19:06:28 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -31,7 +31,7 @@ +@@ -33,7 +33,7 @@ #include <intrin.h> #include <malloc.h> #include <windows.h> diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc index df3c397..46151b5 100644 --- a/www/chromium/files/patch-base_security__unittest.cc +++ b/www/chromium/files/patch-base_security__unittest.cc @@ -1,4 +1,4 @@ ---- base/security_unittest.cc.orig 2017-01-26 00:49:07 UTC +--- base/security_unittest.cc.orig 2017-04-19 19:06:28 UTC +++ base/security_unittest.cc @@ -74,7 +74,7 @@ bool IsTcMallocBypassed() { // FAILS_ is too clunky. diff --git a/www/chromium/files/patch-base_sys__info__freebsd.cc b/www/chromium/files/patch-base_sys__info__freebsd.cc index f65a768..3010800 100644 --- a/www/chromium/files/patch-base_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_sys__info__freebsd.cc @@ -1,4 +1,4 @@ ---- base/sys_info_freebsd.cc.orig 2017-01-26 00:49:07 UTC +--- base/sys_info_freebsd.cc.orig 2017-04-19 19:06:28 UTC +++ base/sys_info_freebsd.cc @@ -12,12 +12,34 @@ diff --git a/www/chromium/files/patch-base_sys__info__posix.cc b/www/chromium/files/patch-base_sys__info__posix.cc index 2d278c0..90ecf30 100644 --- a/www/chromium/files/patch-base_sys__info__posix.cc +++ b/www/chromium/files/patch-base_sys__info__posix.cc @@ -1,4 +1,4 @@ ---- base/sys_info_posix.cc.orig 2017-01-26 00:49:07 UTC +--- base/sys_info_posix.cc.orig 2017-04-19 19:06:28 UTC +++ base/sys_info_posix.cc @@ -35,7 +35,7 @@ diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index 7ba56dd..2bc772b 100644 --- a/www/chromium/files/patch-base_test_BUILD.gn +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -1,4 +1,4 @@ ---- base/test/BUILD.gn.orig 2017-03-09 20:04:26 UTC +--- base/test/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ base/test/BUILD.gn @@ -312,7 +312,7 @@ static_library("run_all_base_unittests") ] diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index 9dbbc6d..0d81c98 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,4 +1,4 @@ ---- base/test/launcher/test_launcher.cc.orig 2017-03-09 20:04:26 UTC +--- base/test/launcher/test_launcher.cc.orig 2017-04-19 19:06:28 UTC +++ base/test/launcher/test_launcher.cc @@ -60,6 +60,10 @@ #include "base/win/windows_version.h" diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc index 8e5366e..be8a681 100644 --- a/www/chromium/files/patch-base_test_test__file__util__posix.cc +++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc @@ -1,4 +1,4 @@ ---- base/test/test_file_util_posix.cc.orig 2017-01-26 00:49:07 UTC +--- base/test/test_file_util_posix.cc.orig 2017-04-19 19:06:28 UTC +++ base/test/test_file_util_posix.cc @@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bo return DeleteFile(file, recurse); diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn index fd49b29..5128622 100644 --- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn +++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn @@ -1,4 +1,4 @@ ---- base/third_party/libevent/BUILD.gn.orig 2017-03-09 20:04:26 UTC +--- base/third_party/libevent/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ base/third_party/libevent/BUILD.gn @@ -50,6 +50,9 @@ static_library("libevent") { "linux/event-config.h", diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index df2bdfc..85bdf78 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- base/threading/platform_thread.h.orig 2017-01-26 00:49:07 UTC +--- base/threading/platform_thread.h.orig 2017-04-19 19:06:28 UTC +++ base/threading/platform_thread.h -@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread { +@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformThread { static ThreadPriority GetCurrentThreadPriority(); diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc index 43c7bb9..dc0070c 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2017-01-26 00:49:07 UTC +--- base/threading/platform_thread_linux.cc.orig 2017-04-19 19:06:28 UTC +++ base/threading/platform_thread_linux.cc @@ -19,7 +19,9 @@ diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc index 579b894..936d327 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_posix.cc.orig 2017-01-26 00:49:07 UTC +--- base/threading/platform_thread_posix.cc.orig 2017-04-19 19:06:28 UTC +++ base/threading/platform_thread_posix.cc @@ -56,7 +56,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc new file mode 100644 index 0000000..468a4f2 --- /dev/null +++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc @@ -0,0 +1,26 @@ +--- base/threading/thread_task_runner_handle.cc.orig 2017-04-19 19:06:28 UTC ++++ base/threading/thread_task_runner_handle.cc +@@ -7,6 +7,7 @@ + #include <utility> + + #include "base/bind.h" ++#include "base/callback_helpers.h" + #include "base/lazy_instance.h" + #include "base/logging.h" + #include "base/memory/ptr_util.h" +@@ -34,6 +35,7 @@ bool ThreadTaskRunnerHandle::IsSet() { + return !!lazy_tls_ptr.Pointer()->Get(); + } + ++#if defined(OS_BSD) + // static + ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting( + scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) { +@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHand + base::Passed(&overriding_task_runner), + base::Unretained(ttrh->task_runner_.get()))); + } ++#endif + + ThreadTaskRunnerHandle::ThreadTaskRunnerHandle( + scoped_refptr<SingleThreadTaskRunner> task_runner) diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index 144f57c..e8a0513 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2017-01-26 00:49:07 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2017-04-19 19:06:28 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -21,7 +21,7 @@ #if defined(OS_MACOSX) diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index b1bff14..446490d 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,4 +1,4 @@ ---- base/trace_event/process_memory_dump.cc.orig 2017-01-26 00:49:07 UTC +--- base/trace_event/process_memory_dump.cc.orig 2017-04-19 19:06:28 UTC +++ base/trace_event/process_memory_dump.cc @@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB const size_t kMaxChunkSize = 8 * 1024 * 1024; diff --git a/www/chromium/files/patch-breakpad_BUILD.gn b/www/chromium/files/patch-breakpad_BUILD.gn index 3b41b9a..9bc9d65 100644 --- a/www/chromium/files/patch-breakpad_BUILD.gn +++ b/www/chromium/files/patch-breakpad_BUILD.gn @@ -1,4 +1,4 @@ ---- breakpad/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- breakpad/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ breakpad/BUILD.gn @@ -468,7 +468,7 @@ if (is_mac) { } diff --git a/www/chromium/files/patch-breakpad_src_common_simple__string__dictionary.h b/www/chromium/files/patch-breakpad_src_common_simple__string__dictionary.h new file mode 100644 index 0000000..307f136 --- /dev/null +++ b/www/chromium/files/patch-breakpad_src_common_simple__string__dictionary.h @@ -0,0 +1,11 @@ +--- breakpad/src/common/simple_string_dictionary.h.orig 2017-04-19 19:07:40 UTC ++++ breakpad/src/common/simple_string_dictionary.h +@@ -33,7 +33,7 @@ + #include <assert.h> + #include <string.h> + +-#include "common/basictypes.h" ++#include "breakpad/src/common/basictypes.h" + + namespace google_breakpad { + diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index c8ddb0ec..2f85025 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2017-03-09 20:04:27 UTC +--- build/config/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ build/config/BUILD.gn -@@ -196,7 +196,7 @@ config("debug") { +@@ -193,7 +193,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,7 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -279,7 +279,7 @@ config("default_libs") { +@@ -276,7 +276,7 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] @@ -18,7 +18,7 @@ libs = [ "dl", "rt", -@@ -310,7 +310,7 @@ config("executable_config") { +@@ -307,7 +307,7 @@ config("executable_config") { ] } else if (is_ios) { configs += [ "//build/config/ios:ios_dynamic_flags" ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index d870ac2..841b49d 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2017-03-09 20:04:27 UTC +--- build/config/BUILDCONFIG.gn.orig 2017-04-19 19:06:28 UTC +++ build/config/BUILDCONFIG.gn @@ -131,12 +131,13 @@ declare_args() { is_official_build = false diff --git a/www/chromium/files/patch-build_config_allocator.gni b/www/chromium/files/patch-build_config_allocator.gni index 519f651..ad40417 100644 --- a/www/chromium/files/patch-build_config_allocator.gni +++ b/www/chromium/files/patch-build_config_allocator.gni @@ -1,11 +1,16 @@ ---- build/config/allocator.gni.orig 2017-01-26 00:49:07 UTC +--- build/config/allocator.gni.orig 2017-04-19 19:06:28 UTC +++ build/config/allocator.gni -@@ -44,7 +44,7 @@ assert(use_allocator == "none" || use_al +@@ -45,10 +45,10 @@ assert(use_allocator == "none" || use_al assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.") + assert(!is_mac || use_allocator == "none", "Tcmalloc doesn't work on macOS.") - assert( -- !use_experimental_allocator_shim || is_linux || is_android || is_win, -+ !use_experimental_allocator_shim || is_linux || is_android || is_win || is_bsd, - "use_experimental_allocator_shim supported only on Linux, Android and Windows targets") +-assert(!use_experimental_allocator_shim || is_linux || is_android || is_win || +- is_mac, ++assert(!use_experimental_allocator_shim || is_linux || is_android || is_win || ++ is_mac || is_bsd, + "use_experimental_allocator_shim supported only on Linux, Android, " + +- "Windows and macOS targets") ++ "Windows, macOS and BSD targets") if (is_win && use_experimental_allocator_shim) { + assert(!is_component_build, diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn index 4d41b6c..9a30eeb 100644 --- a/www/chromium/files/patch-build_config_clang_BUILD.gn +++ b/www/chromium/files/patch-build_config_clang_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/clang/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/clang/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ build/config/clang/BUILD.gn @@ -20,7 +20,7 @@ config("find_bad_constructs") { rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib", @@ -9,8 +9,8 @@ cflags += [ "-Xclang", "-load", -@@ -37,7 +37,7 @@ config("find_bad_constructs") { - "find-bad-constructs", +@@ -41,7 +41,7 @@ config("find_bad_constructs") { + "check-auto-raw-pointer", ] - if ((is_linux || is_android) && !is_chromecast) { diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 897e05c..9709580 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2017-03-09 20:04:27 UTC +--- build/config/compiler/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ build/config/compiler/BUILD.gn -@@ -155,7 +155,7 @@ config("compiler") { +@@ -158,7 +158,7 @@ config("compiler") { configs += [ "//build/config/win:compiler" ] } else if (is_android) { configs += [ "//build/config/android:compiler" ] @@ -9,7 +9,7 @@ configs += [ "//build/config/linux:compiler" ] } else if (is_nacl) { configs += [ "//build/config/nacl:compiler" ] -@@ -282,7 +282,7 @@ config("compiler") { +@@ -301,7 +301,7 @@ config("compiler") { # Linux/Android common flags setup. # --------------------------------- @@ -18,12 +18,12 @@ cflags += [ "-fPIC", "-pipe", # Use pipes for communicating between sub-processes. Faster. -@@ -409,14 +409,14 @@ config("compiler") { +@@ -428,14 +428,14 @@ config("compiler") { # clang-cl (used if is_win) doesn't expose this flag. # Currently disabled for nacl since its toolchain lacks this flag (too old). # TODO(zforman): Once nacl's toolchain is updated, remove check. -- if (is_clang && is_linux) { -+ if (is_clang && (is_linux || is_bsd)) { +- if (is_clang && is_linux && strip_absolute_paths_from_debug_symbols) { ++ if (is_clang && (is_linux || is_bsd) && strip_absolute_paths_from_debug_symbols) { absolute_path = rebase_path("//.") cflags += [ "-fdebug-prefix-map=$absolute_path=." ] } @@ -35,7 +35,7 @@ # gnu++11 instead of c++11 is needed because some code uses typeof() (a # GNU extension). # TODO(thakis): Eventually switch this to c++11 instead, -@@ -469,7 +469,7 @@ config("compiler") { +@@ -488,7 +488,7 @@ config("compiler") { ] # Apply a lower LTO optimization level as the default is too slow. @@ -44,7 +44,7 @@ if (use_lld) { ldflags += [ "-Wl,--lto-O1" ] } else { -@@ -489,7 +489,7 @@ config("compiler") { +@@ -508,7 +508,7 @@ config("compiler") { # targeting ARM, without this flag, LTO produces a .text section that is # larger than the maximum call displacement, preventing the linker from # relocating calls (http://llvm.org/PR22999). @@ -53,7 +53,7 @@ ldflags += [ "-Wl,-plugin-opt,-function-sections" ] } } -@@ -757,7 +757,7 @@ config("compiler_codegen") { +@@ -776,7 +776,7 @@ config("compiler_codegen") { # configs -= [ "//build/config/compiler:clang_stackrealign" ] # See https://crbug.com/556393 for details of where it must be avoided. config("clang_stackrealign") { @@ -62,7 +62,7 @@ cflags = [ # Align the stack on 16-byte boundaries, http://crbug.com/418554. "-mstack-alignment=16", -@@ -811,7 +811,7 @@ config("runtime_library") { +@@ -830,7 +830,7 @@ config("runtime_library") { # smaller. if (is_win) { configs += [ "//build/config/win:runtime_library" ] @@ -71,16 +71,16 @@ configs += [ "//build/config/linux:runtime_library" ] } else if (is_ios) { configs += [ "//build/config/ios:runtime_library" ] -@@ -1076,7 +1076,7 @@ config("default_warnings") { - "-Wno-nonportable-include-path", +@@ -1087,7 +1087,7 @@ config("default_warnings") { - # TODO(hans): https://crbug.com/637306 -- "-Wno-address-of-packed-member", -+ # "-Wno-address-of-packed-member", - ] - if (llvm_force_head_revision) { - cflags += [ -@@ -1119,7 +1119,7 @@ config("chromium_code") { + # use_xcode_clang only refers to the iOS toolchain, host binaries use + # chromium's clang always. +- if (!is_nacl && (!use_xcode_clang || current_toolchain == host_toolchain)) { ++ if (!is_nacl && !is_bsd && (!use_xcode_clang || current_toolchain == host_toolchain)) { + # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not + # recognize. + cflags += [ +@@ -1144,7 +1144,7 @@ config("chromium_code") { ] if (!is_debug && !using_sanitizer && @@ -89,7 +89,7 @@ # _FORTIFY_SOURCE isn't really supported by Clang now, see # http://llvm.org/bugs/show_bug.cgi?id=16821. # It seems to work fine with Ubuntu 12 headers though, so use it in -@@ -1178,7 +1178,7 @@ config("no_chromium_code") { +@@ -1203,7 +1203,7 @@ config("no_chromium_code") { ] } diff --git a/www/chromium/files/patch-build_config_crypto.gni b/www/chromium/files/patch-build_config_crypto.gni index 65d4f30..29f38a6 100644 --- a/www/chromium/files/patch-build_config_crypto.gni +++ b/www/chromium/files/patch-build_config_crypto.gni @@ -1,4 +1,4 @@ ---- build/config/crypto.gni.orig 2017-01-26 00:49:07 UTC +--- build/config/crypto.gni.orig 2017-04-19 19:06:28 UTC +++ build/config/crypto.gni @@ -20,4 +20,4 @@ use_openssl_certs = is_android || is_nac diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni index 5da4cd2..bb7ef35 100644 --- a/www/chromium/files/patch-build_config_features.gni +++ b/www/chromium/files/patch-build_config_features.gni @@ -1,6 +1,6 @@ ---- build/config/features.gni.orig 2017-03-09 20:04:27 UTC +--- build/config/features.gni.orig 2017-04-19 19:06:28 UTC +++ build/config/features.gni -@@ -57,13 +57,13 @@ declare_args() { +@@ -60,13 +60,13 @@ declare_args() { # libudev usage. This currently only affects the content layer. use_udev = is_linux && !is_chromecast diff --git a/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn index 811a678..9943c13 100644 --- a/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/linux/gtk2/BUILD.gn.orig 2017-03-09 20:04:27 UTC +--- build/config/linux/gtk2/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ build/config/linux/gtk2/BUILD.gn @@ -4,7 +4,7 @@ diff --git a/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn index df669cf..e9bc6f5 100644 --- a/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/linux/gtk3/BUILD.gn.orig 2017-03-09 20:04:27 UTC +--- build/config/linux/gtk3/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ build/config/linux/gtk3/BUILD.gn @@ -4,7 +4,7 @@ diff --git a/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn index 722dcf6..b7ad225 100644 --- a/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/linux/gtk/BUILD.gn.orig 2017-03-09 20:04:27 UTC +--- build/config/linux/gtk/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ build/config/linux/gtk/BUILD.gn @@ -5,7 +5,7 @@ import("//build/config/linux/gtk/gtk.gni") diff --git a/www/chromium/files/patch-build_config_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py index 7441f2c..f8a75c9 100644 --- a/www/chromium/files/patch-build_config_linux_pkg-config.py +++ b/www/chromium/files/patch-build_config_linux_pkg-config.py @@ -1,4 +1,4 @@ ---- build/config/linux/pkg-config.py.orig 2017-01-26 00:49:07 UTC +--- build/config/linux/pkg-config.py.orig 2017-04-19 19:06:28 UTC +++ build/config/linux/pkg-config.py @@ -57,8 +57,12 @@ def SetConfigPath(options): print "You must specify an architecture via -a if using a sysroot." diff --git a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn index 4483782..e385f3e 100644 --- a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn +++ b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/sanitizers/BUILD.gn.orig 2017-03-09 20:04:27 UTC +--- build/config/sanitizers/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ build/config/sanitizers/BUILD.gn -@@ -420,7 +420,7 @@ config("lsan_flags") { +@@ -428,7 +428,7 @@ config("lsan_flags") { config("msan_flags") { if (is_msan) { @@ -9,7 +9,7 @@ if (!defined(msan_blacklist_path)) { msan_blacklist_path = rebase_path("//tools/msan/blacklist.txt", root_build_dir) -@@ -435,7 +435,7 @@ config("msan_flags") { +@@ -443,7 +443,7 @@ config("msan_flags") { config("tsan_flags") { if (is_tsan) { diff --git a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni index 87b6705..f7eeffb 100644 --- a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni +++ b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni @@ -1,4 +1,4 @@ ---- build/config/sanitizers/sanitizers.gni.orig 2017-03-09 20:04:27 UTC +--- build/config/sanitizers/sanitizers.gni.orig 2017-04-19 19:06:28 UTC +++ build/config/sanitizers/sanitizers.gni @@ -54,8 +54,8 @@ declare_args() { # See http://clang.llvm.org/docs/ControlFlowIntegrity.html diff --git a/www/chromium/files/patch-build_config_ui.gni b/www/chromium/files/patch-build_config_ui.gni index aff42ac..47d20b7 100644 --- a/www/chromium/files/patch-build_config_ui.gni +++ b/www/chromium/files/patch-build_config_ui.gni @@ -1,4 +1,4 @@ ---- build/config/ui.gni.orig 2017-03-09 20:04:27 UTC +--- build/config/ui.gni.orig 2017-04-19 19:06:28 UTC +++ build/config/ui.gni @@ -31,10 +31,10 @@ declare_args() { diff --git a/www/chromium/files/patch-build_linux_libpci_BUILD.gn b/www/chromium/files/patch-build_linux_libpci_BUILD.gn index 04196ef..e5e16ca 100644 --- a/www/chromium/files/patch-build_linux_libpci_BUILD.gn +++ b/www/chromium/files/patch-build_linux_libpci_BUILD.gn @@ -1,4 +1,4 @@ ---- build/linux/libpci/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/linux/libpci/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ build/linux/libpci/BUILD.gn @@ -3,20 +3,36 @@ # found in the LICENSE file. diff --git a/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn b/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn index 1bba778..509d611 100644 --- a/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn +++ b/www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn @@ -1,4 +1,4 @@ ---- build/secondary/third_party/nss/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/secondary/third_party/nss/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ build/secondary/third_party/nss/BUILD.gn @@ -4,7 +4,7 @@ diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 827ceba..9c4b56c 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2017-01-26 00:49:07 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2017-04-19 19:06:28 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -11,6 +11,11 @@ import("//build/toolchain/cc_wrapper.gni +@@ -12,6 +12,11 @@ import("//build/toolchain/clang_static_a import("//build/toolchain/goma.gni") import("//build/toolchain/toolchain.gni") @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -482,14 +487,23 @@ template("clang_toolchain") { +@@ -483,10 +488,22 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { @@ -32,14 +32,21 @@ + cc = "$prefix/clang" + cxx = "$prefix/clang++" + ld = cxx - -- readelf = "${toolprefix}readelf" -- ar = "${toolprefix}ar" -- nm = "${toolprefix}nm" + readelf = "${toolprefix}readelf" + ar = "${toolprefix}ar" + nm = "${toolprefix}nm" + } + if (use_clang_static_analyzer) { + # Static analysis isn't supported under GOMA. See crbug.com/687245 +@@ -507,10 +524,6 @@ template("clang_toolchain") { + root_build_dir) + } + +- readelf = "${toolprefix}readelf" +- ar = "${toolprefix}ar" +- nm = "${toolprefix}nm" +- forward_variables_from(invoker, [ "strip" ]) + toolchain_args = { diff --git a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py index fe6a3c8..925ab06 100644 --- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py +++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py @@ -1,4 +1,4 @@ ---- build/toolchain/get_concurrent_links.py.orig 2017-01-26 00:49:07 UTC +--- build/toolchain/get_concurrent_links.py.orig 2017-04-19 19:06:28 UTC +++ build/toolchain/get_concurrent_links.py @@ -45,6 +45,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index 62876e4..de6cc4a 100644 --- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,4 +1,4 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2017-01-26 00:49:07 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2017-04-19 19:06:28 UTC +++ cc/layers/scrollbar_layer_impl_base.cc @@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput int thumb_offset = TrackStart(); diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 4a8bcfa..3aeb9ed 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2017-03-09 20:04:27 UTC +--- cc/trees/property_tree.cc.orig 2017-04-19 19:06:28 UTC +++ cc/trees/property_tree.cc -@@ -1196,13 +1196,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO +@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id); diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index 15a0bc3..c2b3e91 100644 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/BUILD.gn.orig 2017-03-09 20:04:27 UTC +--- chrome/BUILD.gn.orig 2017-04-19 19:06:28 UTC +++ chrome/BUILD.gn -@@ -143,7 +143,7 @@ if (!is_android && !is_mac) { +@@ -142,7 +142,7 @@ if (!is_android && !is_mac) { data = [ "$root_out_dir/resources.pak", ] @@ -9,7 +9,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/locales/en-US.pak", -@@ -222,7 +222,7 @@ if (!is_android && !is_mac) { +@@ -223,7 +223,7 @@ if (!is_android && !is_mac) { sources += [ "app/chrome_exe_main_aura.cc" ] } @@ -18,7 +18,7 @@ sources += [ "app/chrome_dll_resource.h", "app/chrome_main.cc", -@@ -1521,7 +1521,7 @@ if (enable_resource_whitelist_generation +@@ -1647,7 +1647,7 @@ if (enable_resource_whitelist_generation } } diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index 8a41dfd..804bba9 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2017-01-26 00:49:07 UTC +--- chrome/app/chrome_command_ids.h.orig 2017-04-19 19:06:28 UTC +++ chrome/app/chrome_command_ids.h -@@ -75,7 +75,7 @@ +@@ -71,7 +71,7 @@ #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049 #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050 diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index a618134..80cc63a 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2017-03-09 20:04:27 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2017-04-19 19:06:28 UTC +++ chrome/app/chrome_main_delegate.cc @@ -89,7 +89,7 @@ #include "chrome/app/chrome_crash_reporter_client.h" @@ -95,7 +95,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -898,7 +898,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -899,7 +899,7 @@ void ChromeMainDelegate::PreSandboxStart breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -104,12 +104,12 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -1008,7 +1008,7 @@ bool ChromeMainDelegate::DelaySandboxIni +@@ -1005,7 +1005,7 @@ bool ChromeMainDelegate::DelaySandboxIni #endif return process_type == switches::kRelauncherProcess; } -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) void ChromeMainDelegate::ZygoteStarting( - ScopedVector<content::ZygoteForkDelegate>* delegates) { + std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.h b/www/chromium/files/patch-chrome_app_chrome__main__delegate.h index 1fd5ea7..0d28e5d 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.h +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.h @@ -1,11 +1,11 @@ ---- chrome/app/chrome_main_delegate.h.orig 2017-01-26 00:49:07 UTC +--- chrome/app/chrome_main_delegate.h.orig 2017-04-19 19:06:28 UTC +++ chrome/app/chrome_main_delegate.h -@@ -44,7 +44,7 @@ class ChromeMainDelegate : public conten +@@ -42,7 +42,7 @@ class ChromeMainDelegate : public conten const std::string& process_type) override; bool ShouldSendMachPort(const std::string& process_type) override; bool DelaySandboxInitialization(const std::string& process_type) override; -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - void ZygoteStarting( - ScopedVector<content::ZygoteForkDelegate>* delegates) override; + void ZygoteStarting(std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* + delegates) override; void ZygoteForked() override; diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index fcaf7c1..9982377 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2017-03-09 20:04:27 UTC +--- chrome/app/chromium_strings.grd.orig 2017-04-19 19:06:28 UTC +++ chrome/app/chromium_strings.grd -@@ -887,7 +887,7 @@ Signing in anyway will merge Chromium in +@@ -891,7 +891,7 @@ Signing in anyway will merge Chromium in </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 569270b..0cb8a46 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2017-03-09 20:04:27 UTC +--- chrome/app/generated_resources.grd.orig 2017-04-19 19:06:28 UTC +++ chrome/app/generated_resources.grd -@@ -6868,7 +6868,7 @@ Keep your key file in a safe place. You +@@ -6535,7 +6535,7 @@ Keep your key file in a safe place. You <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode."> Right-to-left </message> @@ -9,7 +9,7 @@ <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API."> Enable Input IME API </message> -@@ -10122,7 +10122,7 @@ I don't think this site should be blocke +@@ -9629,7 +9629,7 @@ I don't think this site should be blocke <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group"> Appearance </message> @@ -18,7 +18,7 @@ <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group"> Themes </message> -@@ -10130,7 +10130,7 @@ I don't think this site should be blocke +@@ -9637,7 +9637,7 @@ I don't think this site should be blocke <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme"> Reset to default theme </message> @@ -27,7 +27,7 @@ <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme."> Use GTK+ theme </message> -@@ -11455,7 +11455,7 @@ Tell us what happened exactly before you +@@ -10903,7 +10903,7 @@ Tell us what happened exactly before you Set as default </message> diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index 68c9d34..28c9099 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2017-03-09 20:04:27 UTC +--- chrome/app/google_chrome_strings.grd.orig 2017-04-19 19:06:28 UTC +++ chrome/app/google_chrome_strings.grd -@@ -888,7 +888,7 @@ Signing in anyway will merge Chrome info +@@ -892,7 +892,7 @@ Signing in anyway will merge Chrome info </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_mash_mash__runner.cc b/www/chromium/files/patch-chrome_app_mash_mash__runner.cc index 74b467c..29251db 100644 --- a/www/chromium/files/patch-chrome_app_mash_mash__runner.cc +++ b/www/chromium/files/patch-chrome_app_mash_mash__runner.cc @@ -1,6 +1,6 @@ ---- chrome/app/mash/mash_runner.cc.orig 2017-03-09 20:04:27 UTC +--- chrome/app/mash/mash_runner.cc.orig 2017-04-19 19:06:28 UTC +++ chrome/app/mash/mash_runner.cc -@@ -249,7 +249,7 @@ int MashMain() { +@@ -263,7 +263,7 @@ int MashMain() { // TODO(sky): wire this up correctly. service_manager::InitializeLogging(); diff --git a/www/chromium/files/patch-chrome_app_resources_locale__settings.grd b/www/chromium/files/patch-chrome_app_resources_locale__settings.grd index 3cdce81..367c458 100644 --- a/www/chromium/files/patch-chrome_app_resources_locale__settings.grd +++ b/www/chromium/files/patch-chrome_app_resources_locale__settings.grd @@ -1,4 +1,4 @@ ---- chrome/app/resources/locale_settings.grd.orig 2017-01-26 00:49:08 UTC +--- chrome/app/resources/locale_settings.grd.orig 2017-04-19 19:06:29 UTC +++ chrome/app/resources/locale_settings.grd @@ -151,7 +151,7 @@ 55 diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 23c04b6..8a79a33 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2017-03-09 20:04:27 UTC +--- chrome/app/settings_strings.grdp.orig 2017-04-19 19:06:29 UTC +++ chrome/app/settings_strings.grdp -@@ -225,7 +225,7 @@ +@@ -240,7 +240,7 @@ <message name="IDS_SETTINGS_THEMES" desc="Name of the control which allows the user to get a theme for the browser."> Themes </message> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -239,7 +239,7 @@ +@@ -254,7 +254,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc new file mode 100644 index 0000000..ed25b0f --- /dev/null +++ b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc @@ -0,0 +1,22 @@ +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2017-04-19 19:06:29 UTC ++++ chrome/app/shutdown_signal_handlers_posix.cc +@@ -183,6 +183,11 @@ void InstallShutdownSignalHandlers( + g_pipe_pid = getpid(); + g_shutdown_pipe_read_fd = pipefd[0]; + g_shutdown_pipe_write_fd = pipefd[1]; ++#if defined(OS_BSD) ++ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD, ++ // we request the default pthread stack size by specifying 0 here. ++ const size_t kShutdownDetectorThreadStackSize = 0; ++#else + #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; + #else +@@ -191,6 +196,7 @@ void InstallShutdownSignalHandlers( + // size to avoid hitting the guard page. + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; + #endif ++#endif + ShutdownDetector* detector = new ShutdownDetector( + g_shutdown_pipe_read_fd, shutdown_callback, task_runner); + // PlatformThread does not delete its delegate. diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 2377b1c..5d12d99 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2017-03-09 20:04:27 UTC +--- chrome/browser/BUILD.gn.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/BUILD.gn -@@ -2177,7 +2177,7 @@ split_static_library("browser") { +@@ -2219,7 +2219,7 @@ split_static_library("browser") { deps += [ "//device/udev_linux" ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/speech-dispatcher" ] } -@@ -3559,7 +3559,7 @@ split_static_library("browser") { +@@ -3606,7 +3606,7 @@ split_static_library("browser") { } } diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 69ae51a..9a4ca2a 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2017-03-09 20:04:27 UTC +--- chrome/browser/about_flags.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/about_flags.cc -@@ -820,7 +820,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -856,7 +856,7 @@ const FeatureEntry kFeatureEntries[] = { kOsLinux | kOsCrOS | kOsWin | kOsAndroid, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling, switches::kDisableSmoothScrolling)}, @@ -9,7 +9,7 @@ {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, // Uses the system preference on Mac (a different implementation). -@@ -1345,11 +1345,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1374,11 +1374,11 @@ const FeatureEntry kFeatureEntries[] = { ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, switches::kDisableTranslateNewUX)}, #endif // OS_MACOSX @@ -23,7 +23,7 @@ {"translate-lang-by-ulp", IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_NAME, IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll, FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)}, -@@ -1778,7 +1778,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1802,7 +1802,7 @@ const FeatureEntry kFeatureEntries[] = { IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop, FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif // ENABLE_EXTENSIONS diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index c89c536..b5a9b40 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2017-03-09 20:04:27 UTC +--- chrome/browser/browser_process_impl.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/browser_process_impl.cc -@@ -170,7 +170,7 @@ +@@ -171,7 +171,7 @@ #include "chrome/browser/media/webrtc/webrtc_log_uploader.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/memory/tab_manager.h" #endif -@@ -783,7 +783,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_ +@@ -789,7 +789,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_ memory::TabManager* BrowserProcessImpl::GetTabManager() { DCHECK(CalledOnValidThread()); diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h index 4d09299..aab0658 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2017-03-09 20:04:27 UTC +--- chrome/browser/browser_process_impl.h.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/browser_process_impl.h -@@ -341,7 +341,7 @@ class BrowserProcessImpl : public Browse +@@ -342,7 +342,7 @@ class BrowserProcessImpl : public Browse std::unique_ptr<ChromeDeviceClient> device_client_; diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index b522c6c..979666f 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2017-03-09 20:04:27 UTC +--- chrome/browser/browser_resources.grd.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/browser_resources.grd -@@ -384,7 +384,7 @@ +@@ -383,7 +383,7 @@ <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" /> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> </if> diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index a29a6f4..793212a 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -180,7 +180,7 @@ +@@ -181,7 +181,7 @@ #include "chrome/browser/lifetime/application_lifetime.h" #endif // defined(OS_ANDROID) @@ -9,7 +9,38 @@ #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -1173,11 +1173,11 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -276,7 +276,7 @@ + #endif + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) + #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" + #endif + +@@ -479,10 +479,10 @@ void RegisterComponentsForUpdate() { + + #if !defined(OS_ANDROID) + RegisterPepperFlashComponent(cus); +-#if !defined(OS_CHROMEOS) ++#if !defined(OS_CHROMEOS) && !defined(OS_BSD) + RegisterSwiftShaderComponent(cus); + RegisterWidevineCdmComponent(cus); +-#endif // !defined(OS_CHROMEOS) ++#endif // !defined(OS_CHROMEOS) && !defined(OS_BSD) + #endif // !defined(OS_ANDROID) + + #if !defined(DISABLE_NACL) && !defined(OS_ANDROID) +@@ -764,7 +764,7 @@ void ChromeBrowserMainParts::SetupFieldT + field_trial_synchronizer_ = new FieldTrialSynchronizer(); + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) + metrics::DesktopSessionDurationTracker::Initialize(); + #endif + +@@ -1194,11 +1194,11 @@ int ChromeBrowserMainParts::PreCreateThr } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) @@ -23,3 +54,12 @@ // Initialize tracking synchronizer system. tracking_synchronizer_ = new metrics::TrackingSynchronizer( +@@ -1387,7 +1387,7 @@ void ChromeBrowserMainParts::PreBrowserS + + // Start the tab manager here so that we give the most amount of time for the + // other services to start up before we start adjusting the oom priority. +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + g_browser_process->GetTabManager()->Start(); + #endif + diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 887d6c5..0cbc57b 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -75,12 +75,14 @@ void ChromeBrowserMainPartsLinux::PrePro +@@ -77,12 +77,14 @@ void ChromeBrowserMainPartsLinux::PrePro void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); @@ -16,7 +16,7 @@ bluez::DBusThreadManagerLinux::Initialize(); bluez::BluezDBusManager::Initialize( bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false); -@@ -90,7 +92,7 @@ void ChromeBrowserMainPartsLinux::PostMa +@@ -92,7 +94,7 @@ void ChromeBrowserMainPartsLinux::PostMa } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index b0a50e3..ee7a9e5 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,22 +1,11 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -275,6 +275,11 @@ void ChromeBrowserMainPartsPosix::PostMa - g_pipe_pid = getpid(); - g_shutdown_pipe_read_fd = pipefd[0]; - g_shutdown_pipe_write_fd = pipefd[1]; -+#if defined(OS_FREEBSD) -+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD, -+ // we request the default pthread stack size by specifying 0 here. -+ const size_t kShutdownDetectorThreadStackSize = 0; -+#else - #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; - #else -@@ -283,6 +288,7 @@ void ChromeBrowserMainPartsPosix::PostMa - // size to avoid hitting the guard page. - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; - #endif -+#endif // OS_FREEBSD - // TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so - // if you change this, you'll probably need to change the suppression. - if (!base::PlatformThread::CreateNonJoinable( +@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMa + void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { + #if defined(OS_CHROMEOS) + NOTREACHED(); // Should not ever happen on ChromeOS. +-#elif defined(OS_MACOSX) ++#elif defined(OS_MACOSX) || defined(OS_BSD) + // Not called on Mac because we load the locale files differently. + NOTREACHED(); + #elif defined(USE_AURA) diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index ace3fd5..5afc8b6 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,16 +1,16 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -242,7 +242,7 @@ - #include "chrome/browser/ui/browser_dialogs.h" - #include "chromeos/chromeos_switches.h" - #include "components/user_manager/user_manager.h" +@@ -244,7 +244,7 @@ + #include "mash/public/interfaces/launchable.mojom.h" + #include "services/service_manager/public/cpp/interface_factory.h" + #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) - #include "chrome/browser/chrome_browser_main_android.h" -@@ -258,7 +258,7 @@ - #include "chrome/browser/payments/payment_request_factory.h" + #include "chrome/browser/android/app_hooks.h" +@@ -265,7 +265,7 @@ + #include "chrome/browser/webshare/share_service_impl.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -18,7 +18,7 @@ #include "base/debug/leak_annotations.h" #include "components/crash/content/app/breakpad_linux.h" #include "components/crash/content/browser/crash_handler_host_linux.h" -@@ -281,7 +281,7 @@ +@@ -289,7 +289,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -576,7 +576,7 @@ bool CertMatchesFilter(const net::X509Ce +@@ -700,7 +700,7 @@ bool CertMatchesFilter(const net::X509Ce return false; } @@ -36,7 +36,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContent +@@ -1023,7 +1023,7 @@ content::BrowserMainParts* ChromeContent main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); @@ -45,7 +45,7 @@ main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -915,7 +915,7 @@ content::BrowserMainParts* ChromeContent +@@ -1039,7 +1039,7 @@ content::BrowserMainParts* ChromeContent // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -53,8 +53,8 @@ +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else - ChromeBrowserMainExtraPartsViews* extra_parts_views = -@@ -1552,7 +1552,7 @@ void ChromeContentBrowserClient::AppendE + main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); +@@ -1680,7 +1680,7 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -63,7 +63,7 @@ if (breakpad::IsCrashReporterEnabled()) { std::string switch_value; std::unique_ptr<metrics::ClientInfo> client_info = -@@ -2808,7 +2808,7 @@ void ChromeContentBrowserClient::GetAddi +@@ -2972,7 +2972,7 @@ void ChromeContentBrowserClient::GetAddi } } @@ -72,7 +72,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -2837,7 +2837,7 @@ void ChromeContentBrowserClient::GetAddi +@@ -3001,7 +3001,7 @@ void ChromeContentBrowserClient::GetAddi } #endif // defined(OS_ANDROID) } @@ -81,3 +81,12 @@ #if defined(OS_WIN) base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( +@@ -3193,6 +3193,8 @@ void ChromeContentBrowserClient::Registe + base::Bind(&ForwardShareServiceRequest, + web_contents->GetJavaInterfaces()->GetWeakPtr())); + } ++#elif defined(OS_BSD) ++ NOTREACHED(); + #else + if (AreExperimentalWebPlatformFeaturesEnabled() && + base::FeatureList::IsEnabled(features::kWebPayments)) { diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index e670357..6767afa 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -259,12 +259,12 @@ class ChromeContentBrowserClient : publi +@@ -270,12 +270,12 @@ class ChromeContentBrowserClient : publi content::RenderFrameHost* render_frame_host, blink::WebPageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index b401b268..096ac2c 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,4 +1,4 @@ ---- chrome/browser/defaults.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/defaults.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/defaults.cc @@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true; const bool kSyncAutoStarts = false; diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc index 78611ab..f3c2b2c 100644 --- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc +++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/diagnostics/diagnostics_writer.cc @@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool console_->SetColor(color); diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h index bc5fede..f882fdc 100644 --- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h +++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h @@ -19,7 +19,7 @@ class DiagnosticsWriter : public Diagnos public: diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 8d0344a..472e818 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc @@ -777,7 +777,7 @@ void ChromeDownloadManagerDelegate::OnDo target_info->is_filetype_handled_safely) diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index f323903..60d885a 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/download/download_commands.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/download/download_commands.cc -@@ -218,7 +218,7 @@ bool DownloadCommands::IsCommandChecked( +@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked( return download_item_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_item_); case ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ if (CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( download_item_->GetBrowserContext()); -@@ -262,7 +262,7 @@ void DownloadCommands::ExecuteCommand(Co +@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Co bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( download_item_->GetBrowserContext()); @@ -18,7 +18,7 @@ if (CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); DownloadItemModel(download_item_) -@@ -375,7 +375,7 @@ Browser* DownloadCommands::GetBrowser() +@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser() return browser_displayer.browser(); } @@ -27,7 +27,7 @@ bool DownloadCommands::IsDownloadPdf() const { base::FilePath path = download_item_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -392,7 +392,7 @@ bool DownloadCommands::CanOpenPdfInSyste +@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSyste return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index 9874814..dc8c7f4 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_commands.h.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/download/download_commands.h.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/download/download_commands.h @@ -43,7 +43,8 @@ class DownloadCommands { void ExecuteCommand(Command command); diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index e765972..e5fa2f1 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/download/download_prefs.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/download/download_prefs.cc @@ -56,7 +56,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h index 1a45355..fb35df5 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.h.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/download/download_prefs.h.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/download/download_prefs.h @@ -78,7 +78,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc index d4c3337..9bc543b 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__query.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_query.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/download/download_query.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/download/download_query.cc @@ -27,7 +27,11 @@ #include "components/url_formatter/url_formatter.h" diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc index 2228ce7..e06e08c 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/download/download_shelf_context_menu.cc @@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu: : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 120cc14..1b121b4 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1034,7 +1034,7 @@ static_library("extensions") { +@@ -1040,7 +1040,7 @@ static_library("extensions") { sources -= [ "global_shortcut_listener_ozone.cc" ] } @@ -9,7 +9,7 @@ deps += [ "//build/linux:fontconfig" ] if (use_dbus) { -@@ -1127,6 +1127,12 @@ static_library("extensions") { +@@ -1133,6 +1133,12 @@ static_library("extensions") { defines += [ "ENABLE_HOTWORDING" ] } @@ -21,4 +21,4 @@ + if (enable_service_discovery) { sources += [ - "api/gcd_private/gcd_private_api.cc", + "api/mdns/dns_sd_delegate.cc", diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc index 8f26d7d..7de12bc 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc @@ -48,7 +48,11 @@ #include "extensions/common/extension.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc index 97f89bbf..ea797b9 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc -@@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDe +@@ -167,10 +167,12 @@ ImageWriterPrivateListRemovableStorageDe } bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h index 0b97700..2983ece 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h +++ b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/api/input_ime/input_ime_api.h @@ -28,7 +28,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc index 985ad9d..03706ca 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/messaging/message_service.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/extensions/api/messaging/message_service.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/api/messaging/message_service.cc @@ -106,7 +106,7 @@ MessageService::PolicyPermission Message @@ -18,7 +18,7 @@ content::WebContents* web_contents = content::WebContents::FromRenderFrameHost(source); ExtensionWebContentsObserver* extension_web_contents_observer = -@@ -447,12 +447,12 @@ void MessageService::OpenChannelToNative +@@ -446,12 +446,12 @@ void MessageService::OpenChannelToNative channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc index 0a8997a..f8ed510 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,10 @@ diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 15cc6ff..9c87dd5 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2017-02-02 02:02:49 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc @@ -83,7 +83,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_private::PrefType::PREF_TYPE_BOOLEAN; diff --git a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc index a1464d3..9a5eb09 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/bookmark_app_helper.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/bookmark_app_helper.cc -@@ -716,7 +716,7 @@ void BookmarkAppHelper::FinishInstallati +@@ -721,7 +721,7 @@ void BookmarkAppHelper::FinishInstallati #if !defined(OS_MACOSX) #if !defined(USE_ASH) web_app::ShortcutLocations creation_locations; diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 9eb4d7b..6ec1bd9 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -63,7 +63,7 @@ #include "chrome/browser/chromeos/extensions/media_player_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -111,7 +111,7 @@ void EnsureBrowserContextKeyedServiceFac +@@ -107,7 +107,7 @@ void EnsureBrowserContextKeyedServiceFac #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 70f834f..253b102 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/extensions/external_provider_impl.cc @@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc index 0836059..b2b75f5 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2017-02-02 02:02:49 UTC +--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/first_run/first_run_internal_posix.cc @@ -24,7 +24,7 @@ namespace first_run { namespace internal { diff --git a/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc b/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc index 756b60a..8cd5dbb 100644 --- a/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc +++ b/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gpu/gl_string_manager.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/gpu/gl_string_manager.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/gpu/gl_string_manager.cc @@ -33,7 +33,7 @@ GLStringManager::~GLStringManager() { diff --git a/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc b/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc deleted file mode 100644 index 3de56b2..0000000 --- a/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/gpu/gpu_feature_checker.cc.orig 2017-01-26 00:49:08 UTC -+++ chrome/browser/gpu/gpu_feature_checker.cc -@@ -34,7 +34,7 @@ void GPUFeatureChecker::CheckGPUFeatureA - CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); - - bool finalized = true; --#if defined(OS_LINUX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) - // On Windows and Mac, so far we can always make the final WebGL blacklisting - // decision based on partial GPU info; on Linux, we need to launch the GPU - // process to collect full GPU info and make the final decision. diff --git a/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc b/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc index 144a08f..0a8e0dd 100644 --- a/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc +++ b/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/interstitials/chrome_controller_client.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/interstitials/chrome_controller_client.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/interstitials/chrome_controller_client.cc @@ -46,7 +46,7 @@ void LaunchDateAndTimeSettingsOnFileThre #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc index 01814d2..b768a3c 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc @@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFil // Note that this initializes the delegate asynchronously, but since diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 5fb0f23..0806713 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -757,7 +757,10 @@ class MediaFileSystemRegistry::MediaFile +@@ -758,7 +758,10 @@ class MediaFileSystemRegistry::MediaFile // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 55f04e8..4ad76ac 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc @@ -343,6 +343,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index c9717c5..760e08c 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/memory_details.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/memory_details.cc -@@ -33,7 +33,7 @@ +@@ -35,7 +35,7 @@ #include "extensions/features/features.h" #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host_linux.h" #endif -@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUI +@@ -337,7 +337,7 @@ void MemoryDetails::CollectChildInfoOnUI process.titles.push_back(title); } diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index d2e7aa5..ddb0520 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -42,12 +42,14 @@ diff --git a/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc b/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc index 6858ec0..d3bfbb0 100644 --- a/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc +++ b/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/async_dns_field_trial.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/net/async_dns_field_trial.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/net/async_dns_field_trial.cc @@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource sour } // namespace diff --git a/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc b/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc index cda191e..d96e823 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/notifications/message_center_notification_manager.cc -@@ -66,7 +66,7 @@ MessageCenterNotificationManager::Messag +@@ -63,7 +63,7 @@ MessageCenterNotificationManager::Messag base::MakeUnique<FullscreenNotificationBlocker>(message_center)); #if defined(OS_WIN) || defined(OS_MACOSX) \ diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 93d46b9..beef5ef 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,9 +1,9 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -57,7 +57,11 @@ - #include "content/public/common/origin_util.h" - #include "google_apis/gaia/gaia_urls.h" +@@ -62,7 +62,11 @@ #include "net/base/url_util.h" + #include "net/http/transport_security_state.h" + #include "net/url_request/url_request_context.h" +#if defined(OS_BSD) +#include <re2/re2.h> +#else diff --git a/www/chromium/files/patch-chrome_browser_platform__util.h b/www/chromium/files/patch-chrome_browser_platform__util.h index 4605835..89545d2 100644 --- a/www/chromium/files/patch-chrome_browser_platform__util.h +++ b/www/chromium/files/patch-chrome_browser_platform__util.h @@ -1,4 +1,4 @@ ---- chrome/browser/platform_util.h.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/platform_util.h.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/platform_util.h @@ -40,7 +40,7 @@ enum OpenOperationResult { enum OpenItemType { diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc index b93d22a..713560d 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -31,7 +31,7 @@ GURL GetPluginsServerURL() { std::string filename; diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc index effd627..1b61eb9 100644 --- a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc +++ b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc @@ -180,6 +180,8 @@ class PolicyTestCase { const std::string os("chromeos"); diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index e4f62ae..f6752e3 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/process_singleton_posix.cc @@ -93,11 +93,11 @@ #include "net/base/network_interfaces.h" diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc index ae716c0..ab79228 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl_io_data.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/profiles/profile_impl_io_data.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/profiles/profile_impl_io_data.cc -@@ -104,7 +104,7 @@ net::BackendType ChooseCacheBackendType( +@@ -103,7 +103,7 @@ net::BackendType ChooseCacheBackendType( } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index 4e8ebd4..139aab7 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1389,7 +1389,7 @@ void RenderViewContextMenu::AppendEditab +@@ -1390,7 +1390,7 @@ void RenderViewContextMenu::AppendEditab // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. @@ -9,7 +9,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1427,7 +1427,7 @@ void RenderViewContextMenu::AppendLangua +@@ -1428,7 +1428,7 @@ void RenderViewContextMenu::AppendLangua if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -1665,7 +1665,7 @@ bool RenderViewContextMenu::IsCommandIdE +@@ -1666,7 +1666,7 @@ bool RenderViewContextMenu::IsCommandIdE case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck); diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index 0ecb4fe..e7ba736 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2017-04-19 19:06:29 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -20,7 +20,7 @@ #include "third_party/WebKit/public/public_features.h" diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn index 5935415..bfe4f2c 100644 --- a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn @@ -1,4 +1,4 @@ ---- chrome/browser/resources/safe_browsing/BUILD.gn.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/resources/safe_browsing/BUILD.gn.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/resources/safe_browsing/BUILD.gn @@ -29,6 +29,8 @@ action("make_file_types_protobuf") { target_arch = "mac" diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py index d82e3a8..45859bf 100644 --- a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py +++ b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py @@ -1,4 +1,4 @@ ---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-03-09 20:04:28 UTC +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py @@ -31,6 +31,7 @@ def PlatformTypes(): "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID, diff --git a/www/chromium/files/patch-chrome_browser_resources_vulcanize.gni b/www/chromium/files/patch-chrome_browser_resources_vulcanize.gni new file mode 100644 index 0000000..13acbf1 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_vulcanize.gni @@ -0,0 +1,11 @@ +--- chrome/browser/resources/vulcanize.gni.orig 2017-04-19 19:06:30 UTC ++++ chrome/browser/resources/vulcanize.gni +@@ -13,7 +13,7 @@ template("node") { + "//third_party/node/node_modules.tar.gz.sha1", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + inputs += [ "//third_party/node/linux/node-linux-x64.tar.gz.sha1" ] + } + if (is_win) { diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc index 390c219..6bb5ded 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,12 @@ diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc new file mode 100644 index 0000000..84cc485 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2017-04-19 19:06:30 UTC ++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +@@ -720,7 +720,7 @@ void IncidentReportingService::OnEnviron + environment_collection_pending_ = false; + + // CurrentProcessInfo::CreationTime() is missing on some platforms. +-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + base::TimeDelta uptime = + first_incident_time_ - base::CurrentProcessInfo::CreationTime(); + environment_data->mutable_process()->set_uptime_msec(uptime.InMilliseconds()); diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc index c77519f..34f7084 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/permission_reporter.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/safe_browsing/permission_reporter.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/safe_browsing/permission_reporter.cc -@@ -193,7 +193,7 @@ bool PermissionReporter::BuildReport(con +@@ -188,7 +188,7 @@ bool PermissionReporter::BuildReport(con #if defined(OS_ANDROID) report.set_platform_type(PermissionReport::ANDROID_PLATFORM); #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc b/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc index 8a5b8c2..231ba4d 100644 --- a/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc +++ b/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc @@ -1,8 +1,8 @@ ---- chrome/browser/search/local_files_ntp_source.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/search/local_files_ntp_source.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/search/local_files_ntp_source.cc @@ -20,8 +20,13 @@ + #include "build/build_config.h" #include "chrome/common/url_constants.h" - #include "content/public/browser/browser_thread.h" #include "content/public/browser/url_data_source.h" +#if defined(OS_BSD) +#include <re2/re2.h> diff --git a/www/chromium/files/patch-chrome_browser_speech_tts__controller__impl.cc b/www/chromium/files/patch-chrome_browser_speech_tts__controller__impl.cc index aaa5325..d8a55b4 100644 --- a/www/chromium/files/patch-chrome_browser_speech_tts__controller__impl.cc +++ b/www/chromium/files/patch-chrome_browser_speech_tts__controller__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/speech/tts_controller_impl.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/speech/tts_controller_impl.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/speech/tts_controller_impl.cc @@ -347,9 +347,13 @@ int TtsControllerImpl::QueueSize() { } diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 64d3636..fcfd327 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -592,7 +592,7 @@ void ChromeSyncClient::RegisterDesktopDa +@@ -639,7 +639,7 @@ void ChromeSyncClient::RegisterDesktopDa } #endif diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 1ba6821..8d63165 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/task_manager/sampling/task_group.cc @@ -28,9 +28,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) @@ -9,11 +9,11 @@ REFRESH_TYPE_FD_COUNT | -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - REFRESH_TYPE_PRIORITY; - - #if defined(OS_WIN) -@@ -92,9 +92,9 @@ TaskGroup::TaskGroup( - nacl_debug_stub_port_(-1), + #if !defined(DISABLE_NACL) + REFRESH_TYPE_NACL | + #endif // !defined(DISABLE_NACL) +@@ -102,9 +102,9 @@ TaskGroup::TaskGroup( + nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // !defined(DISABLE_NACL) idle_wakeups_per_second_(-1), -#if defined(OS_LINUX) @@ -24,7 +24,7 @@ gpu_memory_has_duplicates_(false), is_backgrounded_(false), weak_ptr_factory_(this) { -@@ -107,10 +107,10 @@ TaskGroup::TaskGroup( +@@ -117,10 +117,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -37,7 +37,7 @@ base::Bind(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr()))); worker_thread_sampler_.swap(sampler); -@@ -313,14 +313,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone +@@ -333,14 +333,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone OnBackgroundRefreshTypeFinished(REFRESH_TYPE_IDLE_WAKEUPS); } diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 3199a81..eda8013 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/task_manager/sampling/task_group.h @@ -96,9 +96,9 @@ class TaskGroup { int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } @@ -12,7 +12,7 @@ int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } -@@ -121,9 +121,9 @@ class TaskGroup { +@@ -124,9 +124,9 @@ class TaskGroup { void OnIdleWakeupsRefreshDone(int idle_wakeups_per_second); @@ -24,7 +24,7 @@ void OnProcessPriorityDone(bool is_backgrounded); -@@ -171,10 +171,10 @@ class TaskGroup { +@@ -174,10 +174,10 @@ class TaskGroup { int nacl_debug_stub_port_; #endif // !defined(DISABLE_NACL) int idle_wakeups_per_second_; diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index 201eac4..a53900a 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2017-02-02 02:02:49 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc @@ -36,9 +36,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h index 0a8aaeb..cfb03a0 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2017-02-02 02:02:49 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h @@ -45,9 +45,9 @@ class TaskGroupSampler : public base::Re using OnCpuRefreshCallback = base::Callback<void(double)>; diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index 38a0037..bd8bfc4 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -184,11 +184,11 @@ void TaskManagerImpl::GetUSERHandles(Tas +@@ -180,11 +180,11 @@ void TaskManagerImpl::GetUSERHandles(Tas } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index b95a6ad..56461cf 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,16 +1,16 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/task_manager/task_manager_observer.h @@ -42,11 +42,11 @@ enum RefreshType { // or backgrounded. - REFRESH_TYPE_PRIORITY = 1 << 13, + REFRESH_TYPE_PRIORITY = 1 << 13, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // For observers interested in getting the number of open file descriptors of // processes. - REFRESH_TYPE_FD_COUNT = 1 << 14, + REFRESH_TYPE_FD_COUNT = 1 << 14, -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - REFRESH_TYPE_MEMORY_STATE = 1 << 15, - + REFRESH_TYPE_MEMORY_STATE = 1 << 15, + REFRESH_TYPE_KEEPALIVE_COUNT = 1 << 16, diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc index 10ee98b..9c927bb 100644 --- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -155,6 +155,8 @@ void TraceCrashServiceUploader::DoUpload +@@ -157,6 +157,8 @@ void TraceCrashServiceUploader::DoUpload const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index 5b82055..cd892fb 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/ui/BUILD.gn.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/BUILD.gn.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/BUILD.gn -@@ -3122,7 +3122,7 @@ split_static_library("ui") { +@@ -3135,7 +3135,7 @@ split_static_library("ui") { ] } } diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 36103e8..59c1d4f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -80,7 +80,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -202,7 +202,7 @@ bool BrowserCommandController::IsReserve +@@ -190,7 +190,7 @@ bool BrowserCommandController::IsReserve if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) return true; @@ -18,16 +18,16 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -405,7 +405,7 @@ void BrowserCommandController::ExecuteCo +@@ -395,7 +395,7 @@ void BrowserCommandController::ExecuteCo break; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) case IDC_USE_SYSTEM_TITLE_BAR: { - PrefService* prefs = browser_->profile()->GetPrefs(); + PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -765,7 +765,7 @@ void BrowserCommandController::InitComma +@@ -755,7 +755,7 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index 7544268..bbc50da 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/browser_view_prefs.cc @@ -10,7 +10,7 @@ #include "components/prefs/pref_registry_simple.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc index 5b0c956..15c9394 100644 --- a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc +++ b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc @@ -16,7 +16,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h index 9e45a6d..9061fbe 100644 --- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h +++ b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/input_method/input_method_engine.h.orig 2017-02-02 02:02:49 UTC +--- chrome/browser/ui/input_method/input_method_engine.h.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/input_method/input_method_engine.h @@ -27,7 +27,7 @@ class InputMethodEngine : public InputMe diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc index 7bb04cf..8dc37d0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/input_method/input_method_engine_base.cc @@ -35,7 +35,7 @@ #include "ui/base/ime/chromeos/ime_keymap.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn index 086b271..c43e4a1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn @@ -1,4 +1,4 @@ ---- chrome/browser/ui/libgtkui/BUILD.gn.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/libgtkui/BUILD.gn.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/libgtkui/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc index e33d1cc..7620e36 100644 --- a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc +++ b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc @@ -347,6 +347,7 @@ void PrintDialogGtk2::ShowDialog( // Since we only generate PDF, only show printers that support PDF. diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index cc8675d..1a55f41 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc @@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser // This flag gives extensions more powers. diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 32e805c..7cf4e11 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -95,7 +95,7 @@ +@@ -96,7 +96,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -657,9 +657,11 @@ bool StartupBrowserCreator::ProcessCmdLi +@@ -668,9 +668,11 @@ bool StartupBrowserCreator::ProcessCmdLi } #endif // OS_CHROMEOS diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc new file mode 100644 index 0000000..38719ce --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/tab_helpers.cc.orig 2017-04-19 19:06:30 UTC ++++ chrome/browser/ui/tab_helpers.cc +@@ -245,7 +245,7 @@ void TabHelpers::AttachTabHelpers(WebCon + #endif + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); + #endif + // --- Feature tab helpers behind flags --- diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc index ba1cfd3..c9c14de 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/task_manager/task_manager_columns.cc @@ -80,10 +80,10 @@ const TableColumnData kColumns[] = { - { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0, - arraysize("idlewakeups") * kCharWidth, -1, true, false, false }, + {IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0, + arraysize("idlewakeups") * kCharWidth, -1, true, false, false}, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - { IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, - arraysize("999") * kCharWidth, -1, true, false, false }, + {IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, + arraysize("999") * kCharWidth, -1, true, false, false}, -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - { IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0, - arraysize("background") * kCharWidth, -1, true, true, false }, - { IDS_TASK_MANAGER_MEMORY_STATE_COLUMN, ui::TableColumn::LEFT, -1, 0, + {IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0, + arraysize("background") * kCharWidth, -1, true, true, false}, + {IDS_TASK_MANAGER_MEMORY_STATE_COLUMN, ui::TableColumn::LEFT, -1, 0, diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index c87c278..a16ae99 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -443,13 +443,13 @@ base::string16 TaskManagerTableModel::Ge +@@ -454,13 +454,13 @@ base::string16 TaskManagerTableModel::Ge ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -16,7 +16,7 @@ case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: { return stringifier_->GetMemoryStateText( -@@ -607,7 +607,7 @@ int TaskManagerTableModel::CompareValues +@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -25,7 +25,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -615,7 +615,7 @@ int TaskManagerTableModel::CompareValues +@@ -631,7 +631,7 @@ int TaskManagerTableModel::CompareValues observed_task_manager()->GetOpenFdCount(tasks_[row2]); return ValueCompare(proc1_fd_count, proc2_fd_count); } @@ -34,8 +34,8 @@ default: NOTREACHED(); -@@ -778,11 +778,11 @@ void TaskManagerTableModel::UpdateRefres - type = REFRESH_TYPE_MEMORY_STATE; +@@ -799,11 +799,11 @@ void TaskManagerTableModel::UpdateRefres + type = REFRESH_TYPE_KEEPALIVE_COUNT; break; -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc index 69df53e..699a8f7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -632,7 +632,7 @@ bool AppMenuModel::IsCommandIdVisible(in +@@ -631,7 +631,7 @@ bool AppMenuModel::IsCommandIdVisible(in case IDC_UPGRADE_DIALOG: return browser_defaults::kShowUpgradeMenuItem && UpgradeDetector::GetInstance()->notify_upgrade(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 1835449..aeef0af 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -54,7 +54,7 @@ const AcceleratorMapping kAcceleratorMap { ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE }, diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc index a4ae6db..bd9f35a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc @@ -19,7 +19,7 @@ #include "ui/gfx/image/image_skia.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index 140e8dd..a121f95 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc @@ -26,14 +26,14 @@ #include "ui/wm/core/wm_state.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc deleted file mode 100644 index a6aaa0c..0000000 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2017-03-09 20:04:29 UTC -+++ chrome/browser/ui/views/chrome_views_delegate.cc -@@ -59,7 +59,7 @@ - #include "ui/views/widget/native_widget_aura.h" - #endif - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - #include "ui/views/linux_ui/linux_ui.h" - #endif - -@@ -329,7 +329,7 @@ HICON ChromeViewsDelegate::GetSmallWindo - return GetSmallAppIcon(); - } - --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { - ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); -@@ -468,7 +468,7 @@ void ChromeViewsDelegate::OnBeforeWidget - #endif - } - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) { - // On Ubuntu Unity, the system always provides a title bar for maximized - // windows. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index d35c658..365fb2f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,20 +1,11 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -37,7 +37,7 @@ class ChromeViewsDelegate : public views - #if defined(OS_WIN) - HICON GetDefaultWindowIcon() const override; +@@ -43,7 +43,7 @@ class ChromeViewsDelegate : public views HICON GetSmallWindowIcon() const override; + int GetAppbarAutohideEdges(HMONITOR monitor, + const base::Closure& callback) override; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) gfx::ImageSkia* GetDefaultWindowIcon() const override; - #endif - -@@ -50,7 +50,7 @@ class ChromeViewsDelegate : public views - void OnBeforeWidgetInit( - views::Widget::InitParams* params, - views::internal::NativeWidgetDelegate* delegate) override; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) bool WindowManagerProvidesTitleBar(bool maximized) override; #endif - ui::ContextFactory* GetContextFactory() override; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index 4af2fb2..5e6fab1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/first_run_dialog.cc @@ -40,8 +40,10 @@ using views::GridLayout; namespace { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 8a9fd73..94c956c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -37,11 +37,11 @@ - #include "ash/common/wm_shell.h" // nogncheck +@@ -36,11 +36,11 @@ + #include "components/user_manager/user_manager.h" #endif -#if defined(OS_LINUX) @@ -14,7 +14,7 @@ #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" #endif -@@ -98,7 +98,7 @@ void BrowserFrame::InitBrowserFrame() { +@@ -97,7 +97,7 @@ void BrowserFrame::InitBrowserFrame() { non_client_view()->set_context_menu_controller(this); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc deleted file mode 100644 index 298c7df..0000000 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2017-03-09 20:04:29 UTC -+++ chrome/browser/ui/views/frame/browser_view.cc -@@ -179,7 +179,7 @@ - #include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h" - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #endif - - using base::TimeDelta; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 8000b48..288c9c9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -38,7 +38,7 @@ #include "ui/views/window/frame_background.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc index b181c61..3e5cb4f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc @@ -20,7 +20,7 @@ namespace { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc index c8da5dc..55ae538 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc @@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpeci return false; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 3dc5eef..c7bdf78 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -85,7 +85,7 @@ void SystemMenuModelBuilder::BuildSystem +@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystem model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } @@ -9,7 +9,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -119,7 +119,7 @@ void SystemMenuModelBuilder::BuildSystem +@@ -118,7 +118,7 @@ void SystemMenuModelBuilder::BuildSystem model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index 4aa73b5..e13e940 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc @@ -13,7 +13,7 @@ #include "components/sessions/core/tab_restore_service.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc index b7da410..906206b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/message_center/message_center_frame_view.cc @@ -15,7 +15,7 @@ namespace message_center { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 876dda1..a7c9b7d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -251,7 +251,7 @@ void TabDragController::Init( // synchronous on desktop Linux, so use that. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc index 1276278..f682195 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/views/tabs/tab_strip.cc @@ -323,7 +323,7 @@ NewTabButton::NewTabButton(TabStrip* tab tab_strip_(tab_strip), diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index de5b15c..8121355 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -75,7 +75,7 @@ +@@ -76,7 +76,7 @@ #include "chrome/browser/ui/webui/theme_source.h" #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index a2431f1..0f035ec 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -289,7 +289,7 @@ bool IsAboutUI(const GURL& url) { +@@ -290,7 +290,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc index 29d92f0..a1510e6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc -@@ -27,7 +27,11 @@ +@@ -28,7 +28,11 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc index 1c53680..dbd7f1e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.cc -@@ -565,13 +565,13 @@ void BrowserOptionsHandler::GetLocalized +@@ -608,13 +608,13 @@ void BrowserOptionsHandler::GetLocalized { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, #endif // defined(OS_CHROMEOS) @@ -16,7 +16,7 @@ #if defined(OS_CHROMEOS) && defined(USE_ASH) { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, -@@ -814,7 +814,7 @@ void BrowserOptionsHandler::RegisterMess +@@ -859,7 +859,7 @@ void BrowserOptionsHandler::RegisterMess "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -25,7 +25,7 @@ web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1476,7 +1476,7 @@ void BrowserOptionsHandler::ObserveTheme +@@ -1519,7 +1519,7 @@ void BrowserOptionsHandler::ObserveTheme ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_system_theme = false; @@ -33,8 +33,8 @@ +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); - base::FundamentalValue native_theme_enabled(!is_system_theme && -@@ -1498,7 +1498,7 @@ void BrowserOptionsHandler::ThemesReset( + base::Value native_theme_enabled(!is_system_theme && !profile_is_supervised); +@@ -1540,7 +1540,7 @@ void BrowserOptionsHandler::ThemesReset( ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h index 79821e7..4187f58 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.h @@ -210,7 +210,7 @@ class BrowserOptionsHandler diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index 7eb5ea5..d8d7f6a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc @@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages "useDefaultTheme", diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h index b5ca309..06229fd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.h @@ -35,7 +35,7 @@ class AppearanceHandler : public Setting // Changes the UI theme of the browser to the default theme. diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc index ae346f7..0f7a628 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc -@@ -287,7 +287,7 @@ void AddAppearanceStrings(content::WebUI +@@ -301,7 +301,7 @@ void AddAppearanceStrings(content::WebUI {"appearancePageTitle", IDS_SETTINGS_APPEARANCE}, {"exampleDotCom", IDS_SETTINGS_EXAMPLE_DOT_COM}, {"themes", IDS_SETTINGS_THEMES}, @@ -9,7 +9,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -307,7 +307,7 @@ void AddAppearanceStrings(content::WebUI +@@ -321,7 +321,7 @@ void AddAppearanceStrings(content::WebUI {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, #endif diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc index deb1890..8d6d229 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/web_app.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/web_applications/web_app.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/web_applications/web_app.cc @@ -58,7 +58,7 @@ namespace { #if defined(OS_MACOSX) @@ -9,7 +9,7 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512}; -@@ -507,7 +507,7 @@ void GetIconsInfo(const WebApplicationIn +@@ -501,7 +501,7 @@ void GetIconsInfo(const WebApplicationIn } #endif diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app.h b/www/chromium/files/patch-chrome_browser_web__applications_web__app.h index ef82c2d..0a86966 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app.h.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/web_applications/web_app.h.orig 2017-04-19 19:06:30 UTC +++ chrome/browser/web_applications/web_app.h -@@ -224,7 +224,7 @@ typedef std::vector<WebApplicationInfo:: +@@ -208,7 +208,7 @@ typedef std::vector<WebApplicationInfo:: void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); #endif diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 08e01d6..b971961 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,13 +1,13 @@ ---- chrome/common/BUILD.gn.orig 2017-03-09 20:04:29 UTC +--- chrome/common/BUILD.gn.orig 2017-04-19 19:06:30 UTC +++ chrome/common/BUILD.gn -@@ -244,6 +244,13 @@ static_library("common") { +@@ -240,6 +240,13 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } + if (is_bsd) { + sources -= [ + "component_flash_hint_file_linux.cc", -+ "component_flash_hint_file_linux.h", ++ "component_flash_hint_file_linux.h" + ] + } + diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 7268a9f..a28c770 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/common/chrome_paths.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/common/chrome_paths.cc -@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePat +@@ -190,7 +190,7 @@ bool PathProvider(int key, base::FilePat return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index e46f5ae..7da5bb5 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.h.orig 2017-03-09 20:04:29 UTC +--- chrome/common/chrome_paths.h.orig 2017-04-19 19:06:30 UTC +++ 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 -@@ -111,7 +111,7 @@ enum { +@@ -113,7 +113,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h index 0836ae5..982b4f1 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths_internal.h.orig 2017-01-26 00:49:09 UTC +--- chrome/common/chrome_paths_internal.h.orig 2017-04-19 19:06:30 UTC +++ chrome/common/chrome_paths_internal.h -@@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::F +@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::F // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index d03ab86..9c68deb 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/common/chrome_switches.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/common/chrome_switches.cc -@@ -1165,7 +1165,7 @@ const char kAllowNaClSocketAPI[] +@@ -1138,7 +1138,7 @@ const char kAllowNaClSocketAPI[] const char kEnableWaylandServer[] = "enable-wayland-server"; #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 4bb2259..83825f9 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2017-03-09 20:04:29 UTC +--- chrome/common/chrome_switches.h.orig 2017-04-19 19:06:30 UTC +++ chrome/common/chrome_switches.h -@@ -355,7 +355,7 @@ extern const char kAllowNaClSocketAPI[]; +@@ -351,7 +351,7 @@ extern const char kAllowNaClSocketAPI[]; extern const char kEnableWaylandServer[]; #endif diff --git a/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc b/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc index a3e5a52..474ebd2 100644 --- a/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc +++ b/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc @@ -1,4 +1,4 @@ ---- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/common/extensions/chrome_extensions_client.cc @@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChann static base::LazyInstance<ChromeExtensionsClient> g_client = diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc index 2025c85..90c4ceb 100644 --- a/www/chromium/files/patch-chrome_common_extensions_command.cc +++ b/www/chromium/files/patch-chrome_common_extensions_command.cc @@ -1,4 +1,4 @@ ---- chrome/common/extensions/command.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/common/extensions/command.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/common/extensions/command.cc @@ -302,7 +302,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index c1427d5..714d870 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,4 +1,4 @@ ---- chrome/common/features.gni.orig 2017-03-09 20:04:29 UTC +--- chrome/common/features.gni.orig 2017-04-19 19:06:30 UTC +++ chrome/common/features.gni @@ -40,7 +40,7 @@ declare_args() { enable_hotwording = is_chrome_branded && is_chromeos diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 62a9e37..f1f0347 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/common/pref_names.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/common/pref_names.cc -@@ -983,7 +983,7 @@ const char kForceSessionSync[] = "settin +@@ -1013,7 +1013,7 @@ const char kForceSessionSync[] = "settin // only using an account that belongs to one of the domains from this pref. const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1070,7 +1070,7 @@ const char kShowUpdatePromotionInfoBar[] +@@ -1100,7 +1100,7 @@ const char kShowUpdatePromotionInfoBar[] "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1454,7 +1454,7 @@ const char kDownloadDefaultDirectory[] = +@@ -1476,7 +1476,7 @@ const char kDownloadDefaultDirectory[] = // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 15107d8..584e5bf 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2017-03-09 20:04:29 UTC +--- chrome/common/pref_names.h.orig 2017-04-19 19:06:30 UTC +++ chrome/common/pref_names.h -@@ -330,7 +330,7 @@ extern const char kForceGoogleSafeSearch +@@ -340,7 +340,7 @@ extern const char kForceGoogleSafeSearch extern const char kForceYouTubeRestrict[]; extern const char kForceSessionSync[]; extern const char kAllowedDomainsForApps[]; @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -363,7 +363,7 @@ extern const char kDefaultBrowserSetting +@@ -373,7 +373,7 @@ extern const char kDefaultBrowserSetting #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif extern const char kBackShortcutBubbleShownCount[]; -@@ -519,7 +519,7 @@ extern const char kAppWindowPlacement[]; +@@ -527,7 +527,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; diff --git a/www/chromium/files/patch-chrome_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc index fa08701..cb443e6 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.cc +++ b/www/chromium/files/patch-chrome_common_url__constants.cc @@ -1,4 +1,4 @@ ---- chrome/common/url_constants.cc.orig 2017-03-09 20:04:29 UTC +--- chrome/common/url_constants.cc.orig 2017-04-19 19:06:30 UTC +++ chrome/common/url_constants.cc @@ -143,7 +143,7 @@ const char kChromeUIMdCupsSettingsURL[] const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; @@ -9,7 +9,7 @@ const char kChromeUITabModalConfirmDialogURL[] = "chrome://tab-modal-confirm-dialog/"; #endif -@@ -336,7 +336,7 @@ const char kChromeOSAssetPath[] = "/usr/ +@@ -337,7 +337,7 @@ const char kChromeOSAssetPath[] = "/usr/ const char kChromeUIMetroFlowHost[] = "make-metro"; #endif diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h index 73ae674..69d2b1f 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.h +++ b/www/chromium/files/patch-chrome_common_url__constants.h @@ -1,4 +1,4 @@ ---- chrome/common/url_constants.h.orig 2017-03-09 20:04:29 UTC +--- chrome/common/url_constants.h.orig 2017-04-19 19:06:30 UTC +++ chrome/common/url_constants.h @@ -128,7 +128,7 @@ extern const char kChromeUIMdCupsSetting extern const char kChromeUIMetroFlowURL[]; @@ -9,7 +9,7 @@ extern const char kChromeUITabModalConfirmDialogURL[]; #endif -@@ -313,7 +313,7 @@ extern const char kChromeOSAssetPath[]; +@@ -314,7 +314,7 @@ extern const char kChromeOSAssetPath[]; extern const char kChromeUIMetroFlowHost[]; #endif diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc index d49e67c..09dadf1 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc @@ -1,4 +1,4 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2017-01-26 00:49:10 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2017-04-19 19:06:31 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -14,7 +14,7 @@ #include "ppapi/proxy/ppapi_messages.h" @@ -6,10 +6,10 @@ -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) - #include "content/public/common/child_process_sandbox_support_linux.h" + #include "content/public/child/child_process_sandbox_support_linux.h" + #include "content/public/common/common_sandbox_support_linux.h" #elif defined(OS_WIN) - #include "third_party/skia/include/ports/SkFontMgr.h" -@@ -27,7 +27,7 @@ PepperFlashFontFileHost::PepperFlashFont +@@ -28,7 +28,7 @@ PepperFlashFontFileHost::PepperFlashFont const ppapi::proxy::SerializedFontDescription& description, PP_PrivateFontCharset charset) : ResourceHost(host->GetPpapiHost(), instance, resource) { @@ -18,7 +18,7 @@ fd_.reset(content::MatchFontWithFallback( description.face, description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, -@@ -44,7 +44,7 @@ PepperFlashFontFileHost::PepperFlashFont +@@ -45,7 +45,7 @@ PepperFlashFontFileHost::PepperFlashFont sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault()); typeface_ = sk_sp<SkTypeface>( font_mgr->matchFamilyStyle(description.face.c_str(), style)); @@ -27,7 +27,7 @@ } PepperFlashFontFileHost::~PepperFlashFontFileHost() {} -@@ -63,7 +63,7 @@ bool PepperFlashFontFileHost::GetFontDat +@@ -64,7 +64,7 @@ bool PepperFlashFontFileHost::GetFontDat void* buffer, size_t* length) { bool result = false; diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h index 38978b4..84489c5 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h @@ -1,4 +1,4 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2017-01-26 00:49:10 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2017-04-19 19:06:31 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -14,7 +14,7 @@ #include "ppapi/c/private/pp_private_font_charset.h" diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 617c959..1cea591 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2017-03-09 20:04:30 UTC +--- chrome/test/BUILD.gn.orig 2017-04-19 19:06:31 UTC +++ chrome/test/BUILD.gn -@@ -193,7 +193,7 @@ static_library("test_support") { +@@ -190,7 +190,7 @@ static_library("test_support") { ] } @@ -9,7 +9,7 @@ public_deps += [ "//crypto:platform" ] } if (is_mac) { -@@ -451,7 +451,7 @@ if (!is_android) { +@@ -455,7 +455,7 @@ if (!is_android) { "$root_out_dir/test_page.css.mock-http-headers", "$root_out_dir/ui_test.pak", ] @@ -18,7 +18,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -460,7 +460,7 @@ if (!is_android) { +@@ -464,7 +464,7 @@ if (!is_android) { "$root_out_dir/resources.pak", ] } @@ -27,8 +27,8 @@ data += [ "$root_out_dir/libppapi_tests.so" ] } -@@ -577,7 +577,7 @@ if (!is_android) { - "../browser/ui/views/payments/payment_request_interactive_uitest_base.h", +@@ -584,7 +584,7 @@ if (!is_android) { + "../browser/ui/views/payments/payment_sheet_view_controller_interactive_uitest.cc", ] } - if (is_linux) { @@ -36,7 +36,7 @@ if (!is_chromeos) { # Desktop linux. sources -= [ -@@ -2041,14 +2041,14 @@ test("browser_tests") { +@@ -2048,14 +2048,14 @@ test("browser_tests") { sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ] deps += [ "//chrome/browser/chromeos" ] data_deps += [ "//third_party/liblouis:liblouis_test_data" ] @@ -53,7 +53,7 @@ sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] } -@@ -2060,7 +2060,7 @@ test("browser_tests") { +@@ -2067,7 +2067,7 @@ test("browser_tests") { configs += [ "//build/config/win:default_large_module_incremental_linking" ] } @@ -62,7 +62,7 @@ data_deps += [ "//components/nacl/loader:nacl_helper" ] if (enable_nacl_nonsfi) { -@@ -2170,7 +2170,7 @@ test("browser_tests") { +@@ -2186,7 +2186,7 @@ test("browser_tests") { } } @@ -71,7 +71,7 @@ # Set rpath to find the CDM adapter even in a non-component build. configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } -@@ -2391,7 +2391,7 @@ test("browser_tests") { +@@ -2412,7 +2412,7 @@ test("browser_tests") { if (toolkit_views) { sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] } @@ -80,7 +80,7 @@ sources += [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] } -@@ -2568,7 +2568,7 @@ test("browser_tests") { +@@ -2594,7 +2594,7 @@ test("browser_tests") { "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", ] } @@ -89,8 +89,8 @@ sources += [ # Tests for non mobile and non CrOS (includes Linux, Win, Mac). "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc", -@@ -2746,7 +2746,7 @@ if (!is_android) { - "$root_out_dir/pyproto/", +@@ -2772,7 +2772,7 @@ if (!is_android) { + "//testing/xvfb.py", ] - if (is_linux || is_win) { @@ -98,7 +98,7 @@ data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -3439,7 +3439,7 @@ test("unit_tests") { +@@ -3471,7 +3471,7 @@ test("unit_tests") { "$root_out_dir/resources.pak", ] } @@ -107,7 +107,7 @@ data += [ "$root_out_dir/chrome_200_percent.pak" ] } if (is_win) { -@@ -4177,7 +4177,7 @@ test("unit_tests") { +@@ -4198,7 +4198,7 @@ test("unit_tests") { "//ui/wm", ] } @@ -116,7 +116,7 @@ sources += [ "../browser/password_manager/native_backend_kwallet_x_unittest.cc", "../browser/shell_integration_linux_unittest.cc", -@@ -4197,7 +4197,7 @@ test("unit_tests") { +@@ -4218,7 +4218,7 @@ test("unit_tests") { if (use_gio) { deps += [ "//build/linux/libgio" ] } @@ -125,7 +125,7 @@ deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -4456,18 +4456,18 @@ test("unit_tests") { +@@ -4487,18 +4487,18 @@ test("unit_tests") { "//components/os_crypt:gnome_keyring_direct", ] } @@ -147,7 +147,7 @@ ldflags = [ "-Wl,--strip-debug" ] } if (is_mac) { -@@ -4956,7 +4956,7 @@ if (safe_browsing_mode == 1 && is_mac) { +@@ -4996,7 +4996,7 @@ if (safe_browsing_mode == 1 && is_mac) { } } @@ -156,12 +156,12 @@ # TODO(609855): Make this compile on Android and run on the bots. test("chrome_app_unittests") { sources = [ -@@ -4982,7 +4982,7 @@ if (!is_android) { +@@ -5021,7 +5021,7 @@ if (!is_android) { } } --if (!is_android && !is_ios && !is_chromecast) { -+if (!is_android && !is_ios && !is_chromecast && !is_bsd) { +-if (!is_android && !is_chromecast) { ++if (!is_android && !is_chromecast && !is_bsd) { test("performance_browser_tests") { sources = [ "../app/chrome_version.rc.version", diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc index 6df160f..96e89ff 100644 --- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2017-01-26 00:49:10 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2017-04-19 19:06:31 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -93,6 +93,10 @@ +@@ -94,6 +94,10 @@ namespace { diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h index 88da806..f52d163 100644 --- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h +++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h @@ -1,6 +1,6 @@ ---- chrome/test/base/testing_browser_process.h.orig 2017-01-26 00:49:10 UTC +--- chrome/test/base/testing_browser_process.h.orig 2017-04-19 19:06:31 UTC +++ chrome/test/base/testing_browser_process.h -@@ -107,8 +107,8 @@ class TestingBrowserProcess : public Bro +@@ -108,8 +108,8 @@ class TestingBrowserProcess : public Bro DownloadStatusUpdater* download_status_updater() override; DownloadRequestLimiter* download_request_limiter() override; diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index ae75d42..c329a05 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,4 +1,4 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2017-01-26 00:49:10 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2017-04-19 19:06:31 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc @@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base installation_locations[i].Append(L"Chromium\\Application")); diff --git a/www/chromium/files/patch-chromecast_BUILD.gn b/www/chromium/files/patch-chromecast_BUILD.gn index d013abad..ac78333 100644 --- a/www/chromium/files/patch-chromecast_BUILD.gn +++ b/www/chromium/files/patch-chromecast_BUILD.gn @@ -1,7 +1,7 @@ ---- chromecast/BUILD.gn.orig 2017-01-26 00:49:11 UTC +--- chromecast/BUILD.gn.orig 2017-04-19 19:06:32 UTC +++ chromecast/BUILD.gn -@@ -51,7 +51,7 @@ cast_test_group("cast_tests") { - tests += [ "//gpu:gpu_unittests" ] +@@ -55,7 +55,7 @@ cast_test_group("cast_tests") { + } } - if (is_linux) { diff --git a/www/chromium/files/patch-chromecast_browser_BUILD.gn b/www/chromium/files/patch-chromecast_browser_BUILD.gn index b8f080f..0012a2e 100644 --- a/www/chromium/files/patch-chromecast_browser_BUILD.gn +++ b/www/chromium/files/patch-chromecast_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chromecast/browser/BUILD.gn.orig 2017-03-09 20:04:31 UTC +--- chromecast/browser/BUILD.gn.orig 2017-04-19 19:06:32 UTC +++ chromecast/browser/BUILD.gn -@@ -118,7 +118,7 @@ source_set("browser") { +@@ -125,7 +125,7 @@ source_set("browser") { "//ui/gl", ] diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 41d1e4d..55f4ba2 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2017-02-02 02:02:51 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2017-04-19 19:06:32 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -67,7 +67,7 @@ +@@ -70,7 +70,7 @@ #include <signal.h> #include <sys/prctl.h> #endif @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #endif -@@ -226,7 +226,7 @@ DefaultCommandLineSwitch g_default_switc +@@ -229,7 +229,7 @@ DefaultCommandLineSwitch g_default_switc #if BUILDFLAG(IS_CAST_AUDIO_ONLY) { switches::kDisableGpu, "" }, #endif @@ -18,7 +18,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -366,7 +366,7 @@ void CastBrowserMainParts::PostMainMessa +@@ -371,7 +371,7 @@ void CastBrowserMainParts::PostMainMessa } void CastBrowserMainParts::ToolkitInitialized() { diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index c36a169..49ab113 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2017-03-09 20:04:31 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2017-04-19 19:06:32 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -285,7 +285,7 @@ void CastContentBrowserClient::AppendExt +@@ -298,7 +298,7 @@ void CastContentBrowserClient::AppendExt command_line->AppendSwitch(switches::kAllowHiddenMediaPlayback); } diff --git a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn index 6634a76..367e3f1 100644 --- a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn +++ b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn @@ -1,4 +1,4 @@ ---- chromecast/browser/metrics/BUILD.gn.orig 2017-01-26 00:49:11 UTC +--- chromecast/browser/metrics/BUILD.gn.orig 2017-04-19 19:06:32 UTC +++ chromecast/browser/metrics/BUILD.gn @@ -26,7 +26,7 @@ source_set("metrics") { "//content/public/common", diff --git a/www/chromium/files/patch-chromecast_crash_BUILD.gn b/www/chromium/files/patch-chromecast_crash_BUILD.gn index 584f3bc..875145c 100644 --- a/www/chromium/files/patch-chromecast_crash_BUILD.gn +++ b/www/chromium/files/patch-chromecast_crash_BUILD.gn @@ -1,4 +1,4 @@ ---- chromecast/crash/BUILD.gn.orig 2017-01-26 00:49:11 UTC +--- chromecast/crash/BUILD.gn.orig 2017-04-19 19:06:32 UTC +++ chromecast/crash/BUILD.gn @@ -78,7 +78,7 @@ source_set("test_support") { ] diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index 13c8854..96ed75a 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,6 +1,6 @@ ---- components/BUILD.gn.orig 2017-03-09 20:04:31 UTC +--- components/BUILD.gn.orig 2017-04-19 19:06:32 UTC +++ components/BUILD.gn -@@ -174,8 +174,8 @@ test("components_unittests") { +@@ -177,8 +177,8 @@ test("components_unittests") { "//components/certificate_reporting:unit_tests", "//components/certificate_transparency:unit_tests", "//components/contextual_search:unit_tests", diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc index 4fe8033..b666b91 100644 --- a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc +++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc @@ -1,4 +1,4 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2017-01-26 00:49:11 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2017-04-19 19:06:32 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc @@ -28,7 +28,11 @@ #include "third_party/WebKit/public/web/WebFormControlElement.h" diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc new file mode 100644 index 0000000..b6df655 --- /dev/null +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/browser/autofill_experiments.cc.orig 2017-04-19 19:06:32 UTC ++++ components/autofill/core/browser/autofill_experiments.cc +@@ -151,7 +151,7 @@ unsigned int GetPopupMargin() { + } + + bool OfferStoreUnmaskedCards() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + // The checkbox can be forced on with a flag, but by default we don't store + // on Linux due to lack of system keychain integration. See crbug.com/162735 + return base::CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc index fae97a7..6dc37c2 100644 --- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc @@ -1,4 +1,4 @@ ---- components/content_settings/core/browser/website_settings_registry.cc.orig 2017-01-26 00:49:11 UTC +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2017-04-19 19:06:32 UTC +++ components/content_settings/core/browser/website_settings_registry.cc @@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettin // doesn't allow the settings to be managed in the same way. See diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h index e32baa3..de95fba 100644 --- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h @@ -1,4 +1,4 @@ ---- components/content_settings/core/browser/website_settings_registry.h.orig 2017-01-26 00:49:11 UTC +--- components/content_settings/core/browser/website_settings_registry.h.orig 2017-04-19 19:06:32 UTC +++ components/content_settings/core/browser/website_settings_registry.h @@ -36,10 +36,11 @@ class WebsiteSettingsRegistry { PLATFORM_MAC = 1 << 3, diff --git a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc index 39862fc..3aaab85 100644 --- a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc +++ b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc @@ -1,4 +1,4 @@ ---- components/cookie_config/cookie_store_util.cc.orig 2017-01-26 00:49:11 UTC +--- components/cookie_config/cookie_store_util.cc.orig 2017-04-19 19:06:32 UTC +++ components/cookie_config/cookie_store_util.cc @@ -11,7 +11,7 @@ diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn index 20916a1..a292bd4 100644 --- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/content/app/BUILD.gn.orig 2017-03-09 20:04:31 UTC +--- components/crash/content/app/BUILD.gn.orig 2017-04-19 19:06:32 UTC +++ components/crash/content/app/BUILD.gn -@@ -154,7 +154,7 @@ source_set("app_non_mac_win") { +@@ -153,7 +153,7 @@ source_set("app_non_mac_win") { "//breakpad:breakpad_handler", "//sandbox", ] diff --git a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn index 0c6ebe1..dcdecb6 100644 --- a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/content/browser/BUILD.gn.orig 2017-01-26 00:49:11 UTC +--- components/crash/content/browser/BUILD.gn.orig 2017-04-19 19:06:32 UTC +++ components/crash/content/browser/BUILD.gn @@ -16,7 +16,7 @@ source_set("browser") { diff --git a/www/chromium/files/patch-components_drive_drive__api__util.cc b/www/chromium/files/patch-components_drive_drive__api__util.cc index c399953..cbd7140 100644 --- a/www/chromium/files/patch-components_drive_drive__api__util.cc +++ b/www/chromium/files/patch-components_drive_drive__api__util.cc @@ -1,4 +1,4 @@ ---- components/drive/drive_api_util.cc.orig 2017-01-26 00:49:11 UTC +--- components/drive/drive_api_util.cc.orig 2017-04-19 19:06:32 UTC +++ components/drive/drive_api_util.cc @@ -22,7 +22,11 @@ #include "google_apis/drive/drive_api_parser.h" diff --git a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc index 910d8b2..2fc696b 100644 --- a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc +++ b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc @@ -1,4 +1,4 @@ ---- components/feedback/anonymizer_tool.cc.orig 2017-01-26 00:49:11 UTC +--- components/feedback/anonymizer_tool.cc.orig 2017-04-19 19:06:32 UTC +++ components/feedback/anonymizer_tool.cc @@ -10,7 +10,11 @@ #include "base/strings/string_number_conversions.h" diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index e7f7e57..92b0f5b 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2017-01-26 00:49:11 UTC +--- components/flags_ui/flags_state.cc.orig 2017-04-19 19:06:32 UTC +++ components/flags_ui/flags_state.cc -@@ -544,7 +544,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -566,7 +566,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client.h b/www/chromium/files/patch-components_gcm__driver_gcm__client.h index 5d7a39d..e05ba84 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client.h +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client.h @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client.h.orig 2017-03-09 20:04:31 UTC +--- components/gcm_driver/gcm_client.h.orig 2017-04-19 19:06:32 UTC +++ components/gcm_driver/gcm_client.h -@@ -78,6 +78,7 @@ class GCMClient { +@@ -82,6 +82,7 @@ class GCMClient { PLATFORM_CROS, PLATFORM_IOS, PLATFORM_ANDROID, diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc index ebbc9da..3c9641e 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc @@ -1,4 +1,4 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2017-01-26 00:49:11 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2017-04-19 19:06:32 UTC +++ components/gcm_driver/gcm_client_impl.cc @@ -136,6 +136,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: diff --git a/www/chromium/files/patch-components_json__schema_json__schema__validator.cc b/www/chromium/files/patch-components_json__schema_json__schema__validator.cc index d13e247..1df9422 100644 --- a/www/chromium/files/patch-components_json__schema_json__schema__validator.cc +++ b/www/chromium/files/patch-components_json__schema_json__schema__validator.cc @@ -1,6 +1,6 @@ ---- components/json_schema/json_schema_validator.cc.orig 2017-01-26 00:49:11 UTC +--- components/json_schema/json_schema_validator.cc.orig 2017-04-19 19:06:32 UTC +++ components/json_schema/json_schema_validator.cc -@@ -21,7 +21,11 @@ +@@ -20,7 +20,11 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "components/json_schema/json_schema_constants.h" diff --git a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc index 7b98bee..8f8989e 100644 --- a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc +++ b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc @@ -1,4 +1,4 @@ ---- components/keyed_service/core/dependency_graph_unittest.cc.orig 2017-01-26 00:49:11 UTC +--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2017-04-19 19:06:32 UTC +++ components/keyed_service/core/dependency_graph_unittest.cc @@ -9,7 +9,11 @@ #include "components/keyed_service/core/dependency_graph.h" diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index bad50b3..281a7cf 100644 --- a/www/chromium/files/patch-components_metrics_BUILD.gn +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/metrics/BUILD.gn.orig 2017-03-09 20:04:31 UTC +--- components/metrics/BUILD.gn.orig 2017-04-19 19:06:32 UTC +++ components/metrics/BUILD.gn -@@ -107,6 +107,13 @@ static_library("metrics") { +@@ -118,6 +118,13 @@ static_library("metrics") { if (is_win) { sources -= [ "machine_id_provider_stub.cc" ] } @@ -14,7 +14,7 @@ } if (!is_ios) { -@@ -282,7 +289,7 @@ static_library("test_support") { +@@ -295,7 +302,7 @@ static_library("test_support") { ] } @@ -23,7 +23,7 @@ static_library("serialization") { sources = [ "serialization/metric_sample.cc", -@@ -342,7 +349,7 @@ source_set("unit_tests") { +@@ -358,7 +365,7 @@ source_set("unit_tests") { "//ui/gfx/geometry", ] diff --git a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc index 6591eaa..45928cd 100644 --- a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc +++ b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc @@ -1,4 +1,4 @@ ---- components/metrics/drive_metrics_provider_linux.cc.orig 2017-01-26 00:49:12 UTC +--- components/metrics/drive_metrics_provider_linux.cc.orig 2017-04-19 19:06:32 UTC +++ components/metrics/drive_metrics_provider_linux.cc @@ -4,7 +4,13 @@ diff --git a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc index 5a68fbd..ec3f152 100644 --- a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc +++ b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc @@ -1,4 +1,4 @@ ---- components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-01-26 00:49:12 UTC +--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-04-19 19:06:32 UTC +++ components/metrics/system_memory_stats_recorder_linux.cc @@ -30,6 +30,7 @@ namespace metrics { UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index 9589a18..1b394b5 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,4 +1,4 @@ ---- components/neterror/resources/neterror.js.orig 2017-03-09 20:04:31 UTC +--- components/neterror/resources/neterror.js.orig 2017-04-19 19:06:32 UTC +++ components/neterror/resources/neterror.js @@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings } diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h index 5b6f69d..5eb2565 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,4 +1,4 @@ ---- components/os_crypt/os_crypt.h.orig 2017-01-26 00:49:12 UTC +--- components/os_crypt/os_crypt.h.orig 2017-04-19 19:06:32 UTC +++ components/os_crypt/os_crypt.h @@ -13,7 +13,7 @@ #include "base/strings/string16.h" diff --git a/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc b/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc index 9b1a3a9..5aed223 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/import/csv_reader.cc.orig 2017-01-26 00:49:12 UTC +--- components/password_manager/core/browser/import/csv_reader.cc.orig 2017-04-19 19:06:32 UTC +++ components/password_manager/core/browser/import/csv_reader.cc @@ -9,7 +9,11 @@ #include "base/logging.h" diff --git a/www/chromium/files/patch-components_plugins_renderer_BUILD.gn b/www/chromium/files/patch-components_plugins_renderer_BUILD.gn index 13bb3ef..95a3a2f 100644 --- a/www/chromium/files/patch-components_plugins_renderer_BUILD.gn +++ b/www/chromium/files/patch-components_plugins_renderer_BUILD.gn @@ -1,4 +1,4 @@ ---- components/plugins/renderer/BUILD.gn.orig 2017-03-09 20:04:31 UTC +--- components/plugins/renderer/BUILD.gn.orig 2017-04-19 19:06:33 UTC +++ components/plugins/renderer/BUILD.gn @@ -20,6 +20,7 @@ static_library("renderer") { } diff --git a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc index d02d0ef..e91036d 100644 --- a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc +++ b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc @@ -1,4 +1,4 @@ ---- components/plugins/renderer/plugin_placeholder.cc.orig 2017-01-26 00:49:12 UTC +--- components/plugins/renderer/plugin_placeholder.cc.orig 2017-04-19 19:06:33 UTC +++ components/plugins/renderer/plugin_placeholder.cc @@ -11,7 +11,11 @@ #include "gin/object_template_builder.h" diff --git a/www/chromium/files/patch-components_policy_BUILD.gn b/www/chromium/files/patch-components_policy_BUILD.gn index 8492f29..5859d03 100644 --- a/www/chromium/files/patch-components_policy_BUILD.gn +++ b/www/chromium/files/patch-components_policy_BUILD.gn @@ -1,4 +1,4 @@ ---- components/policy/BUILD.gn.orig 2017-03-09 20:04:31 UTC +--- components/policy/BUILD.gn.orig 2017-04-19 19:06:33 UTC +++ components/policy/BUILD.gn @@ -16,6 +16,7 @@ assert(!is_ios, "Policy should not be re gen_policy_templates_common = true @@ -8,7 +8,7 @@ gen_policy_templates_android = is_android gen_policy_templates_mac = is_mac -@@ -128,7 +129,7 @@ grit("grit_policy_templates") { +@@ -159,7 +160,7 @@ grit("grit_policy_templates") { outputs += policy_templates_android_outputs defines += [ "gen_policy_templates_android" ] } diff --git a/www/chromium/files/patch-components_policy_core_common_schema.cc b/www/chromium/files/patch-components_policy_core_common_schema.cc index 920d9f9..ab668c4 100644 --- a/www/chromium/files/patch-components_policy_core_common_schema.cc +++ b/www/chromium/files/patch-components_policy_core_common_schema.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/schema.cc.orig 2017-01-26 00:49:12 UTC +--- components/policy/core/common/schema.cc.orig 2017-04-19 19:06:33 UTC +++ components/policy/core/common/schema.cc @@ -21,7 +21,11 @@ #include "components/json_schema/json_schema_constants.h" diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index 7b07088..ee2af29 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2017-03-09 20:04:31 UTC +--- components/policy/resources/policy_templates.json.orig 2017-04-19 19:06:33 UTC +++ components/policy/resources/policy_templates.json -@@ -927,7 +927,7 @@ +@@ -964,7 +964,7 @@ 'name': 'RemoteAccessHostMatchUsername', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -9,7 +9,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -2106,7 +2106,7 @@ +@@ -2139,7 +2139,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4782,7 +4782,7 @@ +@@ -4815,7 +4815,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -27,7 +27,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5671,7 +5671,7 @@ +@@ -5723,7 +5723,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -6198,7 +6198,7 @@ +@@ -6250,7 +6250,7 @@ 'name': 'FullscreenAllowed', 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index 5e392e7..9ce300c 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,4 +1,4 @@ ---- components/policy/tools/generate_policy_source.py.orig 2017-03-09 20:04:31 UTC +--- components/policy/tools/generate_policy_source.py.orig 2017-04-19 19:06:33 UTC +++ components/policy/tools/generate_policy_source.py @@ -103,7 +103,7 @@ class PolicyDetails: if platform.startswith('chrome.'): diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn index 1f107d4..e5cdb68 100644 --- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn @@ -1,4 +1,4 @@ ---- components/storage_monitor/BUILD.gn.orig 2017-01-26 00:49:12 UTC +--- components/storage_monitor/BUILD.gn.orig 2017-04-19 19:06:33 UTC +++ components/storage_monitor/BUILD.gn @@ -65,6 +65,21 @@ static_library("storage_monitor") { ] diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc index ae1f8a3..4886d38 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor.cc.orig 2017-01-26 00:49:12 UTC +--- components/storage_monitor/storage_monitor.cc.orig 2017-04-19 19:06:33 UTC +++ components/storage_monitor/storage_monitor.cc @@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor: diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc index 497dc72..62c22bc 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-01-29 22:59:23 UTC +--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-04-22 13:58:19 UTC +++ components/storage_monitor/storage_monitor_freebsd.cc @@ -0,0 +1,101 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h index d61c060..cb2113e 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2017-01-29 22:59:23 UTC +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2017-04-22 13:58:19 UTC +++ components/storage_monitor/storage_monitor_freebsd.h @@ -0,0 +1,45 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-components_sync_base_get__session__name.cc b/www/chromium/files/patch-components_sync_base_get__session__name.cc index 2f344a0..380c33d 100644 --- a/www/chromium/files/patch-components_sync_base_get__session__name.cc +++ b/www/chromium/files/patch-components_sync_base_get__session__name.cc @@ -1,4 +1,4 @@ ---- components/sync/base/get_session_name.cc.orig 2017-02-02 02:02:53 UTC +--- components/sync/base/get_session_name.cc.orig 2017-04-19 19:06:33 UTC +++ components/sync/base/get_session_name.cc @@ -15,7 +15,7 @@ diff --git a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc index 8d45cc2..4fcf015 100644 --- a/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc +++ b/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc @@ -1,4 +1,4 @@ ---- components/sync/base/get_session_name_linux.cc.orig 2017-02-02 02:02:53 UTC +--- components/sync/base/get_session_name_linux.cc.orig 2017-04-19 19:06:33 UTC +++ components/sync/base/get_session_name_linux.cc @@ -13,8 +13,9 @@ namespace syncer { namespace internal { diff --git a/www/chromium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc b/www/chromium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc new file mode 100644 index 0000000..c473b40 --- /dev/null +++ b/www/chromium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc @@ -0,0 +1,11 @@ +--- components/tracing/child/child_memory_dump_manager_delegate_impl.cc.orig 2017-04-19 19:06:33 UTC ++++ components/tracing/child/child_memory_dump_manager_delegate_impl.cc +@@ -52,7 +52,7 @@ void ChildMemoryDumpManagerDelegateImpl: + base::trace_event::MemoryDumpManager::GetInstance()->Initialize( + this /* delegate */, false /* is_coordinator */); + +-#if !defined(OS_LINUX) && !defined(OS_NACL) ++#if !defined(OS_LINUX) && !defined(OS_NACL) && !defined(OS_BSD) + // On linux the browser process takes care of dumping process metrics. + // The child process is not allowed to do so due to BPF sandbox. + tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( diff --git a/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc b/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc new file mode 100644 index 0000000..0665a62 --- /dev/null +++ b/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc @@ -0,0 +1,81 @@ +--- components/tracing/common/process_metrics_memory_dump_provider.cc.orig 2017-04-19 19:06:33 UTC ++++ components/tracing/common/process_metrics_memory_dump_provider.cc +@@ -56,7 +56,7 @@ base::LazyInstance< + std::unique_ptr<ProcessMetricsMemoryDumpProvider>>>::Leaky + g_dump_providers_map = LAZY_INSTANCE_INITIALIZER; + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + const char kClearPeakRssCommand[] = "5"; + + const uint32_t kMaxLineSize = 4096; +@@ -190,13 +190,13 @@ bool GetResidentSizeFromStatmFile(int fd + return num_scanned == 1; + } + +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + std::unique_ptr<base::ProcessMetrics> CreateProcessMetrics( + base::ProcessId process) { + if (process == base::kNullProcessId) + return base::ProcessMetrics::CreateCurrentProcessMetrics(); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Just pass ProcessId instead of handle since they are the same in linux and + // android. + return base::ProcessMetrics::CreateProcessMetrics(process); +@@ -205,7 +205,7 @@ std::unique_ptr<base::ProcessMetrics> Cr + // additional information like ProcessHandle or port provider. + NOTREACHED(); + return std::unique_ptr<base::ProcessMetrics>(); +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + } + + } // namespace +@@ -217,7 +217,7 @@ uint64_t ProcessMetricsMemoryDumpProvide + ProcessMetricsMemoryDumpProvider::FactoryFunction + ProcessMetricsMemoryDumpProvider::factory_for_testing = nullptr; + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + // static + FILE* ProcessMetricsMemoryDumpProvider::proc_smaps_for_testing = nullptr; +@@ -244,7 +244,7 @@ bool ProcessMetricsMemoryDumpProvider::D + pmd->set_has_process_mmaps(); + return res; + } +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + #if defined(OS_WIN) + bool ProcessMetricsMemoryDumpProvider::DumpProcessMemoryMaps( +@@ -620,7 +620,7 @@ bool ProcessMetricsMemoryDumpProvider::D + + #if !defined(OS_IOS) + peak_rss_bytes = process_metrics_->GetPeakWorkingSetSize(); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + if (is_rss_peak_resettable_) { + std::string clear_refs_file = + "/proc/" + +@@ -670,7 +670,7 @@ bool ProcessMetricsMemoryDumpProvider::D + void ProcessMetricsMemoryDumpProvider::PollFastMemoryTotal( + uint64_t* memory_total) { + *memory_total = 0; +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + int statm_fd = fast_polling_statm_fd_for_testing; + if (statm_fd == -1) { + if (!fast_polling_statm_fd_.is_valid()) { +@@ -698,7 +698,7 @@ void ProcessMetricsMemoryDumpProvider::P + } + + void ProcessMetricsMemoryDumpProvider::SuspendFastMemoryPolling() { +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + fast_polling_statm_fd_.reset(); + #endif + } diff --git a/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h b/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h new file mode 100644 index 0000000..fb1e179 --- /dev/null +++ b/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h @@ -0,0 +1,20 @@ +--- components/tracing/common/process_metrics_memory_dump_provider.h.orig 2017-04-19 19:06:33 UTC ++++ components/tracing/common/process_metrics_memory_dump_provider.h +@@ -57,7 +57,7 @@ class TRACING_EXPORT ProcessMetricsMemor + #elif defined(OS_WIN) + FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest, + TestWinModuleReading); +-#elif defined(OS_LINUX) || defined(OS_ANDROID) ++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest, + DoubleRegister); + #endif +@@ -70,7 +70,7 @@ class TRACING_EXPORT ProcessMetricsMemor + static uint64_t rss_bytes_for_testing; + static FactoryFunction factory_for_testing; + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + static FILE* proc_smaps_for_testing; + static int fast_polling_statm_fd_for_testing; + diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc index 9a72e9f..747606e 100644 --- a/www/chromium/files/patch-components_update__client_update__query__params.cc +++ b/www/chromium/files/patch-components_update__client_update__query__params.cc @@ -1,4 +1,4 @@ ---- components/update_client/update_query_params.cc.orig 2017-03-09 20:04:32 UTC +--- components/update_client/update_query_params.cc.orig 2017-04-19 19:06:33 UTC +++ components/update_client/update_query_params.cc @@ -34,6 +34,8 @@ const char kOs[] = "linux"; diff --git a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc index f65de46..beccba3 100644 --- a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc +++ b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc @@ -1,4 +1,4 @@ ---- components/url_matcher/regex_set_matcher.cc.orig 2017-01-26 00:49:13 UTC +--- components/url_matcher/regex_set_matcher.cc.orig 2017-04-19 19:06:33 UTC +++ components/url_matcher/regex_set_matcher.cc @@ -10,8 +10,13 @@ #include "base/memory/ptr_util.h" diff --git a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc index e6c5860..3ead93f 100644 --- a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc +++ b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc @@ -1,4 +1,4 @@ ---- components/url_matcher/url_matcher_factory.cc.orig 2017-01-26 00:49:13 UTC +--- components/url_matcher/url_matcher_factory.cc.orig 2017-04-19 19:06:33 UTC +++ components/url_matcher/url_matcher_factory.cc @@ -16,7 +16,11 @@ #include "base/values.h" diff --git a/www/chromium/files/patch-components_variations_proto_study.proto b/www/chromium/files/patch-components_variations_proto_study.proto index 29618af..8e5b7ea 100644 --- a/www/chromium/files/patch-components_variations_proto_study.proto +++ b/www/chromium/files/patch-components_variations_proto_study.proto @@ -1,4 +1,4 @@ ---- components/variations/proto/study.proto.orig 2017-03-09 20:04:32 UTC +--- components/variations/proto/study.proto.orig 2017-04-19 19:06:33 UTC +++ components/variations/proto/study.proto @@ -188,6 +188,7 @@ message Study { PLATFORM_CHROMEOS = 3; diff --git a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc index 03cfbbe..83f5416 100644 --- a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc +++ b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc @@ -1,4 +1,4 @@ ---- components/webcrypto/algorithms/test_helpers.cc.orig 2017-01-26 00:49:13 UTC +--- components/webcrypto/algorithms/test_helpers.cc.orig 2017-04-19 19:06:33 UTC +++ components/webcrypto/algorithms/test_helpers.cc @@ -25,7 +25,11 @@ #include "components/webcrypto/status.h" diff --git a/www/chromium/files/patch-content_app_BUILD.gn b/www/chromium/files/patch-content_app_BUILD.gn index 5c6395c..af5c313 100644 --- a/www/chromium/files/patch-content_app_BUILD.gn +++ b/www/chromium/files/patch-content_app_BUILD.gn @@ -1,6 +1,6 @@ ---- content/app/BUILD.gn.orig 2017-03-09 20:04:32 UTC +--- content/app/BUILD.gn.orig 2017-04-19 19:06:33 UTC +++ content/app/BUILD.gn -@@ -70,7 +70,7 @@ template("implement_content_app") { +@@ -68,7 +68,7 @@ template("implement_content_app") { ] } diff --git a/www/chromium/files/patch-content_app_content__main__runner.cc b/www/chromium/files/patch-content_app_content__main__runner.cc index 36dc4a6..6cb01e3 100644 --- a/www/chromium/files/patch-content_app_content__main__runner.cc +++ b/www/chromium/files/patch-content_app_content__main__runner.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner.cc.orig 2017-03-09 20:04:32 UTC +--- content/app/content_main_runner.cc.orig 2017-04-19 19:06:33 UTC +++ content/app/content_main_runner.cc -@@ -98,10 +98,10 @@ +@@ -92,10 +92,10 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -13,7 +13,7 @@ #include "content/zygote/zygote_main.h" #endif -@@ -298,7 +298,7 @@ struct MainFunction { +@@ -365,7 +365,7 @@ struct MainFunction { int (*function)(const MainFunctionParams&); }; @@ -22,7 +22,7 @@ // On platforms that use the zygote, we have a special subset of // subprocesses that are launched via the zygote. This function // fills in some process-launching bits around ZygoteMain(). -@@ -350,7 +350,7 @@ int RunZygote(const MainFunctionParams& +@@ -426,7 +426,7 @@ int RunZygote(const MainFunctionParams& NOTREACHED() << "Unknown zygote process type: " << process_type; return 1; } @@ -31,7 +31,7 @@ static void RegisterMainThreadFactories() { #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD) -@@ -417,7 +417,7 @@ int RunNamedProcessTypeMain( +@@ -492,7 +492,7 @@ int RunNamedProcessTypeMain( } } diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 100b969..cb60cd2 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2017-03-09 20:04:32 UTC +--- content/browser/BUILD.gn.orig 2017-04-19 19:06:33 UTC +++ content/browser/BUILD.gn -@@ -1444,11 +1444,6 @@ source_set("browser") { +@@ -1464,11 +1464,6 @@ source_set("browser") { "memory/memory_monitor_chromeos.cc", "memory/memory_monitor_chromeos.h", ] @@ -12,7 +12,7 @@ } if (!is_win) { -@@ -1514,7 +1509,7 @@ source_set("browser") { +@@ -1540,7 +1535,7 @@ source_set("browser") { # Desktop screen capture implementations, conditionally built depending on # the available implementations for each platform. @@ -21,7 +21,7 @@ defines += [ "ENABLE_SCREEN_CAPTURE=1" ] sources += [ "media/capture/cursor_renderer.cc", -@@ -1703,7 +1698,7 @@ source_set("browser") { +@@ -1727,7 +1722,7 @@ source_set("browser") { } } @@ -30,7 +30,7 @@ deps += [ "//build/linux:fontconfig" ] } -@@ -1862,6 +1857,17 @@ source_set("browser") { +@@ -1880,6 +1875,17 @@ source_set("browser") { "//chromeos", "//chromeos:power_manager_proto", ] @@ -48,7 +48,7 @@ } if (enable_mojo_media) { -@@ -1978,11 +1984,11 @@ source_set("browser") { +@@ -1998,11 +2004,11 @@ source_set("browser") { ] } @@ -61,3 +61,4 @@ + if (is_linux || is_bsd) { deps += [ "//third_party/boringssl" ] } + diff --git a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h index 744e494..a31b680 100644 --- a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h +++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h @@ -1,6 +1,6 @@ ---- content/browser/accessibility/browser_accessibility.h.orig 2017-01-26 00:49:13 UTC +--- content/browser/accessibility/browser_accessibility.h.orig 2017-04-19 19:06:33 UTC +++ content/browser/accessibility/browser_accessibility.h -@@ -38,7 +38,7 @@ +@@ -40,7 +40,7 @@ #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1 #endif diff --git a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h index 4d41062..369d986 100644 --- a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h +++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h @@ -1,6 +1,6 @@ ---- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-03-09 20:04:32 UTC +--- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-04-19 19:06:33 UTC +++ content/browser/accessibility/browser_accessibility_manager.h -@@ -34,7 +34,7 @@ class BrowserAccessibilityManager; +@@ -36,7 +36,7 @@ class BrowserAccessibilityManager; class BrowserAccessibilityManagerAndroid; #elif defined(OS_WIN) class BrowserAccessibilityManagerWin; @@ -9,7 +9,7 @@ class BrowserAccessibilityManagerAuraLinux; #elif defined(OS_MACOSX) class BrowserAccessibilityManagerMac; -@@ -246,7 +246,7 @@ class CONTENT_EXPORT BrowserAccessibilit +@@ -248,7 +248,7 @@ class CONTENT_EXPORT BrowserAccessibilit BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid(); #endif diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 895e97e..4a82d00 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,17 +1,18 @@ ---- content/browser/browser_main_loop.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/browser_main_loop.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/browser_main_loop.cc -@@ -210,6 +210,10 @@ +@@ -210,6 +210,11 @@ #include "gpu/vulkan/vulkan_implementation.h" #endif +#if defined(OS_BSD) -+#include "content/common/child_process_sandbox_support_impl_linux.h" ++#include "content/common/sandbox_linux/sandbox_linux.h" ++#include "content/child/child_process_sandbox_support_impl_linux.h" +#endif + // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -218,7 +222,7 @@ +@@ -218,7 +223,7 @@ namespace content { namespace { @@ -20,7 +21,7 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); if (parsed_command_line.HasSwitch(switches::kNoZygote)) { -@@ -582,10 +586,15 @@ void BrowserMainLoop::Init() { +@@ -584,10 +589,15 @@ void BrowserMainLoop::Init() { void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 3f94a81..9c98c10 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/child_process_launcher_helper_linux.cc -@@ -95,6 +95,7 @@ ChildProcessLauncherHelper::LaunchProces +@@ -67,6 +67,7 @@ ChildProcessLauncherHelper::LaunchProces int* launch_result) { *is_synchronous_launch = true; @@ -8,7 +8,7 @@ ZygoteHandle* zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr : delegate_->GetZygote(); -@@ -114,6 +115,7 @@ ChildProcessLauncherHelper::LaunchProces +@@ -86,6 +87,7 @@ ChildProcessLauncherHelper::LaunchProces process.zygote = *zygote_handle; return process; } @@ -16,7 +16,7 @@ Process process; process.process = base::LaunchProcess(*command_line(), options); -@@ -133,10 +135,12 @@ base::TerminationStatus ChildProcessLaun +@@ -105,10 +107,12 @@ base::TerminationStatus ChildProcessLaun const ChildProcessLauncherHelper::Process& process, bool known_dead, int* exit_code) { @@ -29,7 +29,7 @@ if (known_dead) { return base::GetKnownDeadTerminationStatus( process.process.Handle(), exit_code); -@@ -155,13 +159,17 @@ void ChildProcessLauncherHelper::ForceNo +@@ -127,13 +131,17 @@ void ChildProcessLauncherHelper::ForceNo ChildProcessLauncherHelper::Process process) { process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc b/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc index 428af3a..256f998 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/color_picker.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/devtools/protocol/color_picker.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/devtools/protocol/color_picker.cc -@@ -150,7 +150,7 @@ void ColorPicker::UpdateCursor() { +@@ -153,7 +153,7 @@ void ColorPicker::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. diff --git a/www/chromium/files/patch-content_browser_download_base__file.cc b/www/chromium/files/patch-content_browser_download_base__file.cc index bd25da7..7259a03 100644 --- a/www/chromium/files/patch-content_browser_download_base__file.cc +++ b/www/chromium/files/patch-content_browser_download_base__file.cc @@ -1,6 +1,6 @@ ---- content/browser/download/base_file.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/download/base_file.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/download/base_file.cc -@@ -370,7 +370,7 @@ DownloadInterruptReason BaseFile::LogInt +@@ -380,7 +380,7 @@ DownloadInterruptReason BaseFile::LogInt return reason; } @@ -9,7 +9,7 @@ namespace { -@@ -453,7 +453,7 @@ DownloadInterruptReason BaseFile::Annota +@@ -463,7 +463,7 @@ DownloadInterruptReason BaseFile::Annota } return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; } diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index b08b34f..a915ad8 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -384,7 +384,7 @@ bool GpuDataManagerImplPrivate::GpuAcces +@@ -396,7 +396,7 @@ bool GpuDataManagerImplPrivate::GpuAcces // strings even if all features are blacklisted. If all GPU features are // disabled, the GPU process will only initialize GL bindings, create a GL // context, and collect full GPU info. @@ -9,7 +9,7 @@ if (reason) { *reason = "All GPU features are blacklisted."; } -@@ -501,8 +501,10 @@ void GpuDataManagerImplPrivate::SetGLStr +@@ -513,8 +513,10 @@ void GpuDataManagerImplPrivate::SetGLStr gpu_info.gl_renderer = gl_renderer; gpu_info.gl_version = gl_version; @@ -20,7 +20,7 @@ UpdateGpuInfo(gpu_info); UpdateGpuSwitchingManager(gpu_info); -@@ -557,10 +559,12 @@ void GpuDataManagerImplPrivate::Initiali +@@ -572,10 +574,12 @@ void GpuDataManagerImplPrivate::Initiali // Skip collecting the basic driver info if SetGpuInfo() is already called. if (IsCompleteGpuInfoAvailable()) { gpu_info = gpu_info_; @@ -33,7 +33,7 @@ } if (command_line->HasSwitch(switches::kGpuTestingVendorId) && -@@ -671,7 +675,9 @@ void GpuDataManagerImplPrivate::UpdateGp +@@ -686,7 +690,9 @@ void GpuDataManagerImplPrivate::UpdateGp return; bool was_info_available = IsCompleteGpuInfoAvailable(); diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index d519fea..abdca96 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2017-01-26 00:49:13 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2017-04-19 19:06:33 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h -@@ -154,7 +154,7 @@ class CONTENT_EXPORT GpuDataManagerImplP +@@ -156,7 +156,7 @@ class CONTENT_EXPORT GpuDataManagerImplP UnblockOtherDomainFrom3DAPIs); FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, UnblockThisDomainFrom3DAPIs); diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc index 6070827..6f216ef 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc @@ -1,4 +1,4 @@ ---- content/browser/gpu/gpu_internals_ui.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/gpu/gpu_internals_ui.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/gpu/gpu_internals_ui.cc @@ -43,7 +43,7 @@ #include "third_party/skia/include/core/SkMilestone.h" @@ -18,7 +18,7 @@ #include "ui/base/x/x11_util.h" // nogncheck #include "ui/gfx/x/x11_atom_cache.h" // nogncheck #endif -@@ -210,7 +210,7 @@ base::DictionaryValue* GpuInfoAsDictiona +@@ -204,7 +204,7 @@ base::DictionaryValue* GpuInfoAsDictiona gpu_info.gl_ws_version)); basic_info->Append(NewDescriptionValuePair("Window system binding extensions", gpu_info.gl_ws_extensions)); diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 79039fa..5ed494d 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -994,7 +994,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp +@@ -1024,7 +1024,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp std::unique_ptr<base::CommandLine> cmd_line = base::MakeUnique<base::CommandLine>(base::CommandLine::NO_PROGRAM); #else diff --git a/www/chromium/files/patch-content_browser_media_media__internals.cc b/www/chromium/files/patch-content_browser_media_media__internals.cc index da731c7..71a3e83 100644 --- a/www/chromium/files/patch-content_browser_media_media__internals.cc +++ b/www/chromium/files/patch-content_browser_media_media__internals.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_internals.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/media/media_internals.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/media/media_internals.cc -@@ -776,7 +776,7 @@ void MediaInternals::UpdateVideoCaptureD +@@ -774,7 +774,7 @@ void MediaInternals::UpdateVideoCaptureD device_dict->SetString("name", descriptor.GetNameAndModel()); device_dict->Set("formats", format_list); #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc b/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc index 95ed2c6..7255b1f 100644 --- a/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc +++ b/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/memory/memory_coordinator_impl.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/memory/memory_coordinator_impl.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/memory/memory_coordinator_impl.cc -@@ -148,8 +148,12 @@ void MemoryCoordinatorHandleImpl::AddChi +@@ -90,8 +90,12 @@ void MemoryCoordinatorHandleImpl::AddChi struct MemoryCoordinatorImplSingletonTraits : public base::LeakySingletonTraits<MemoryCoordinatorImpl> { static MemoryCoordinatorImpl* New() { diff --git a/www/chromium/files/patch-content_browser_memory_memory__monitor.cc b/www/chromium/files/patch-content_browser_memory_memory__monitor.cc index a3b34ec..b8f0580 100644 --- a/www/chromium/files/patch-content_browser_memory_memory__monitor.cc +++ b/www/chromium/files/patch-content_browser_memory_memory__monitor.cc @@ -1,4 +1,4 @@ ---- content/browser/memory/memory_monitor.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/memory/memory_monitor.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/memory/memory_monitor.cc @@ -8,6 +8,7 @@ diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc index fa3f9f6..0c619fa 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -54,9 +54,9 @@ +@@ -55,9 +55,9 @@ namespace content { @@ -12,7 +12,7 @@ // NOTE: changes to this class need to be reviewed by the security team. class PpapiPluginSandboxedProcessLauncherDelegate -@@ -110,7 +110,7 @@ class PpapiPluginSandboxedProcessLaunche +@@ -111,7 +111,7 @@ class PpapiPluginSandboxedProcessLaunche return true; } @@ -21,7 +21,7 @@ ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -204,13 +204,13 @@ PpapiPluginProcessHost* PpapiPluginProce +@@ -205,13 +205,13 @@ PpapiPluginProcessHost* PpapiPluginProce return NULL; } @@ -37,7 +37,7 @@ // static void PpapiPluginProcessHost::DidCreateOutOfProcessInstance( -@@ -362,7 +362,7 @@ bool PpapiPluginProcessHost::Init(const +@@ -363,7 +363,7 @@ bool PpapiPluginProcessHost::Init(const base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); diff --git a/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc b/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc index 745bdd9..80794c4 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/media/video_capture_manager.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/renderer_host/media/video_capture_manager.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/renderer_host/media/video_capture_manager.cc -@@ -662,7 +662,7 @@ VideoCaptureManager::DoStartTabCaptureOn +@@ -645,7 +645,7 @@ VideoCaptureManager::DoStartTabCaptureOn DCHECK(IsOnDeviceThread()); std::unique_ptr<VideoCaptureDevice> video_capture_device; @@ -9,7 +9,7 @@ video_capture_device = WebContentsVideoCaptureDevice::Create(id); #endif -@@ -692,7 +692,7 @@ VideoCaptureManager::DoStartDesktopCaptu +@@ -675,7 +675,7 @@ VideoCaptureManager::DoStartDesktopCaptu } if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index ddac970..8a37fe2 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -90,7 +90,7 @@ +@@ -89,7 +89,7 @@ #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h index 059ef53..3eda08a 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2017-03-09 20:04:32 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2017-04-19 19:06:33 UTC +++ content/browser/renderer_host/render_message_filter.h @@ -132,7 +132,7 @@ class CONTENT_EXPORT RenderMessageFilter const std::list<base::ProcessHandle>& handles); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index cc7fa0f..5f249d3 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -372,11 +372,11 @@ SiteProcessMap* GetSiteProcessMapForBrow +@@ -378,11 +378,11 @@ SiteProcessMap* GetSiteProcessMapForBrow return map; } @@ -14,7 +14,7 @@ // NOTE: changes to this class need to be reviewed by the security team. class RendererSandboxedProcessLauncherDelegate -@@ -399,7 +399,7 @@ class RendererSandboxedProcessLauncherDe +@@ -405,7 +405,7 @@ class RendererSandboxedProcessLauncherDe return GetContentClient()->browser()->PreSpawnRenderer(policy); } @@ -23,7 +23,7 @@ ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -639,7 +639,7 @@ void RenderProcessHost::SetMaxRendererPr +@@ -655,7 +655,7 @@ void RenderProcessHost::SetMaxRendererPr g_max_renderer_count_override = count; } @@ -32,7 +32,7 @@ // static void RenderProcessHostImpl::EarlyZygoteLaunch() { DCHECK(!g_render_zygote); -@@ -649,7 +649,7 @@ void RenderProcessHostImpl::EarlyZygoteL +@@ -665,7 +665,7 @@ void RenderProcessHostImpl::EarlyZygoteL ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus( (*GetGenericZygote())->GetSandboxStatus()); } @@ -41,7 +41,7 @@ RenderProcessHostImpl::RenderProcessHostImpl( BrowserContext* browser_context, -@@ -796,7 +796,7 @@ bool RenderProcessHostImpl::Init() { +@@ -813,7 +813,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index b290d786..b9754b1 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/renderer_host/render_view_host_impl.cc @@ -140,7 +140,7 @@ void GetPlatformSpecificPrefs(RendererPr display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 68adc23..6baa618 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,7 +1,7 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -111,7 +111,7 @@ - #include "ui/gfx/gdi_util.h" +@@ -116,7 +116,7 @@ + #include "content/browser/accessibility/browser_accessibility_auralinux.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -2018,7 +2018,7 @@ bool RenderWidgetHostViewAura::NeedsInpu +@@ -2031,7 +2031,7 @@ bool RenderWidgetHostViewAura::NeedsInpu } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2218,7 +2218,7 @@ void RenderWidgetHostViewAura::ForwardKe +@@ -2231,7 +2231,7 @@ void RenderWidgetHostViewAura::ForwardKe if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index 9498f26..f40b8d1 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -545,7 +545,7 @@ bool RenderWidgetHostViewEventHandler::C +@@ -546,7 +546,7 @@ bool RenderWidgetHostViewEventHandler::C if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; diff --git a/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc b/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc index 60e0ed2..6c766ba 100644 --- a/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc +++ b/www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/tracing/tracing_controller_impl.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/tracing/tracing_controller_impl.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/tracing/tracing_controller_impl.cc -@@ -475,7 +475,7 @@ void TracingControllerImpl::AddTraceMess +@@ -476,7 +476,7 @@ void TracingControllerImpl::AddTraceMess return; } @@ -9,3 +9,12 @@ // On Linux the browser process dumps process metrics for child process due to // sandbox. tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( +@@ -504,7 +504,7 @@ void TracingControllerImpl::RemoveTraceM + return; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + tracing::ProcessMetricsMemoryDumpProvider::UnregisterForProcess( + trace_message_filter->peer_pid()); + #endif diff --git a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc index 48533fe..53a1355 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host_impl.cc.orig 2017-03-09 20:04:32 UTC +--- content/browser/utility_process_host_impl.cc.orig 2017-04-19 19:06:33 UTC +++ content/browser/utility_process_host_impl.cc @@ -44,9 +44,9 @@ #include "services/service_manager/public/cpp/interface_provider.h" diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc index 8ce401b..3e2c0ae 100644 --- a/www/chromium/files/patch-content_child_child__process.cc +++ b/www/chromium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2017-03-09 20:04:32 UTC +--- content/child/child_process.cc.orig 2017-04-19 19:06:33 UTC +++ content/child/child_process.cc -@@ -122,7 +122,7 @@ void ChildProcess::ReleaseProcess() { +@@ -133,7 +133,7 @@ void ChildProcess::ReleaseProcess() { main_thread_->OnProcessFinalRelease(); } diff --git a/www/chromium/files/patch-content_child_child__process.h b/www/chromium/files/patch-content_child_child__process.h index e9aaf17..7c9704e 100644 --- a/www/chromium/files/patch-content_child_child__process.h +++ b/www/chromium/files/patch-content_child_child__process.h @@ -1,6 +1,6 @@ ---- content/child/child_process.h.orig 2017-02-02 02:02:53 UTC +--- content/child/child_process.h.orig 2017-04-19 19:06:33 UTC +++ content/child/child_process.h -@@ -69,7 +69,7 @@ class CONTENT_EXPORT ChildProcess { +@@ -82,7 +82,7 @@ class CONTENT_EXPORT ChildProcess { void AddRefProcess(); void ReleaseProcess(); diff --git a/www/chromium/files/patch-content_child_child__thread__impl.cc b/www/chromium/files/patch-content_child_child__thread__impl.cc index 22ee4e3..81a97b3 100644 --- a/www/chromium/files/patch-content_child_child__thread__impl.cc +++ b/www/chromium/files/patch-content_child_child__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/child/child_thread_impl.cc.orig 2017-03-09 20:04:32 UTC +--- content/child/child_thread_impl.cc.orig 2017-04-19 19:06:33 UTC +++ content/child/child_thread_impl.cc -@@ -706,7 +706,7 @@ std::unique_ptr<base::SharedMemory> Chil +@@ -699,7 +699,7 @@ std::unique_ptr<base::SharedMemory> Chil return base::MakeUnique<base::SharedMemory>(shared_buf, false); } diff --git a/www/chromium/files/patch-content_child_child__thread__impl.h b/www/chromium/files/patch-content_child_child__thread__impl.h index 1cc44f2..47c1eff 100644 --- a/www/chromium/files/patch-content_child_child__thread__impl.h +++ b/www/chromium/files/patch-content_child_child__thread__impl.h @@ -1,4 +1,4 @@ ---- content/child/child_thread_impl.h.orig 2017-03-09 20:04:32 UTC +--- content/child/child_thread_impl.h.orig 2017-04-19 19:06:33 UTC +++ content/child/child_thread_impl.h @@ -116,7 +116,7 @@ class CONTENT_EXPORT ChildThreadImpl static std::unique_ptr<base::SharedMemory> AllocateSharedMemory( diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 61c0197..8ff43c0 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2017-03-09 20:04:32 UTC +--- content/common/BUILD.gn.orig 2017-04-19 19:06:33 UTC +++ content/common/BUILD.gn -@@ -498,7 +498,7 @@ source_set("common") { +@@ -503,7 +503,7 @@ source_set("common") { } if (!use_seccomp_bpf) { @@ -9,7 +9,7 @@ sources -= [ "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc", "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h", -@@ -512,6 +512,16 @@ source_set("common") { +@@ -517,6 +517,16 @@ source_set("common") { "sandbox_linux/bpf_utility_policy_linux.h", "sandbox_linux/sandbox_bpf_base_policy_linux.cc", "sandbox_linux/sandbox_bpf_base_policy_linux.h", diff --git a/www/chromium/files/patch-content_common_child__process__messages.h b/www/chromium/files/patch-content_common_child__process__messages.h index e12b265..d9d8582 100644 --- a/www/chromium/files/patch-content_common_child__process__messages.h +++ b/www/chromium/files/patch-content_common_child__process__messages.h @@ -1,4 +1,4 @@ ---- content/common/child_process_messages.h.orig 2017-03-09 20:04:32 UTC +--- content/common/child_process_messages.h.orig 2017-04-19 19:06:33 UTC +++ content/common/child_process_messages.h @@ -26,7 +26,7 @@ #include "ui/gfx/ipc/gfx_param_traits.h" diff --git a/www/chromium/files/patch-content_common_content__switches__internal.cc b/www/chromium/files/patch-content_common_content__switches__internal.cc index 386b50c..0977c85 100644 --- a/www/chromium/files/patch-content_common_content__switches__internal.cc +++ b/www/chromium/files/patch-content_common_content__switches__internal.cc @@ -1,4 +1,4 @@ ---- content/common/content_switches_internal.cc.orig 2017-03-09 20:04:32 UTC +--- content/common/content_switches_internal.cc.orig 2017-04-19 19:06:33 UTC +++ content/common/content_switches_internal.cc @@ -27,7 +27,7 @@ const base::Feature kUseZoomForDsfEnable #endif diff --git a/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc b/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc index 0c4f988..69c0bf6 100644 --- a/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc +++ b/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc @@ -1,4 +1,4 @@ ---- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2017-01-26 00:49:13 UTC +--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2017-04-19 19:06:34 UTC +++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc @@ -7,7 +7,9 @@ #include <errno.h> diff --git a/www/chromium/files/patch-content_common_set__process__title__linux.cc b/www/chromium/files/patch-content_common_set__process__title__linux.cc index b6a56c7..fbda01a 100644 --- a/www/chromium/files/patch-content_common_set__process__title__linux.cc +++ b/www/chromium/files/patch-content_common_set__process__title__linux.cc @@ -1,4 +1,4 @@ ---- content/common/set_process_title_linux.cc.orig 2017-01-26 00:49:13 UTC +--- content/common/set_process_title_linux.cc.orig 2017-04-19 19:06:34 UTC +++ content/common/set_process_title_linux.cc @@ -49,6 +49,8 @@ extern char** environ; diff --git a/www/chromium/files/patch-content_common_set__process__title__linux.h b/www/chromium/files/patch-content_common_set__process__title__linux.h index f3beb78..8abe8aa 100644 --- a/www/chromium/files/patch-content_common_set__process__title__linux.h +++ b/www/chromium/files/patch-content_common_set__process__title__linux.h @@ -1,4 +1,4 @@ ---- content/common/set_process_title_linux.h.orig 2017-01-26 00:49:13 UTC +--- content/common/set_process_title_linux.h.orig 2017-04-19 19:06:34 UTC +++ content/common/set_process_title_linux.h @@ -5,6 +5,9 @@ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ diff --git a/www/chromium/files/patch-content_common_view__messages.h b/www/chromium/files/patch-content_common_view__messages.h index 32e5a34..77344b3 100644 --- a/www/chromium/files/patch-content_common_view__messages.h +++ b/www/chromium/files/patch-content_common_view__messages.h @@ -1,6 +1,6 @@ ---- content/common/view_messages.h.orig 2017-03-09 20:04:32 UTC +--- content/common/view_messages.h.orig 2017-04-19 19:06:34 UTC +++ content/common/view_messages.h -@@ -246,7 +246,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::Rendere +@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::Rendere IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(use_video_overlay_for_embedded_encrypted_video) IPC_STRUCT_TRAITS_MEMBER(network_contry_iso) diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index 33d6f62..fad94ee 100644 --- a/www/chromium/files/patch-content_gpu_BUILD.gn +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -1,6 +1,6 @@ ---- content/gpu/BUILD.gn.orig 2017-03-09 20:04:32 UTC +--- content/gpu/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ content/gpu/BUILD.gn -@@ -97,6 +97,7 @@ target(link_target_type, "gpu_sources") +@@ -98,6 +98,7 @@ target(link_target_type, "gpu_sources") if (use_x11) { deps += [ "//ui/events/platform/x11" ] diff --git a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc index 6e35e0a..2426bce 100644 --- a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc +++ b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc @@ -1,18 +1,18 @@ ---- content/gpu/gpu_child_thread.cc.orig 2017-03-09 20:04:32 UTC +--- content/gpu/gpu_child_thread.cc.orig 2017-04-19 19:06:34 UTC +++ content/gpu/gpu_child_thread.cc -@@ -387,6 +387,7 @@ void GpuChildThread::OnCollectGraphicsIn - if (dead_on_arrival_) - return; +@@ -398,6 +398,7 @@ void GpuChildThread::OnCollectGraphicsIn + } + #endif +#if !defined(OS_BSD) #if defined(OS_WIN) // GPU full info collection should only happen on un-sandboxed GPU process // or single process/in-process gpu mode on Windows. -@@ -438,6 +439,7 @@ void GpuChildThread::OnCollectGraphicsIn +@@ -420,6 +421,7 @@ void GpuChildThread::OnCollectGraphicsIn base::MessageLoop::current()->QuitWhenIdle(); } #endif // OS_WIN +#endif // XXX(rene) !FreeBSD } - void GpuChildThread::OnGetVideoMemoryUsageStats() { + void GpuChildThread::OnClean() { diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index e89b5c6..accef8f 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2017-03-09 20:04:32 UTC +--- content/gpu/gpu_main.cc.orig 2017-04-19 19:06:34 UTC +++ content/gpu/gpu_main.cc -@@ -94,7 +94,7 @@ namespace content { +@@ -98,7 +98,7 @@ namespace content { namespace { @@ -9,7 +9,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*); #elif defined(OS_WIN) bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*); -@@ -148,7 +148,7 @@ class ContentSandboxHelper : public gpu: +@@ -152,7 +152,7 @@ class ContentSandboxHelper : public gpu: bool EnsureSandboxInitialized( gpu::GpuWatchdogThread* watchdog_thread) override { @@ -18,7 +18,7 @@ return StartSandboxLinux(watchdog_thread); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -310,7 +310,7 @@ int GpuMain(const MainFunctionParams& pa +@@ -313,7 +313,7 @@ int GpuMain(const MainFunctionParams& pa namespace { diff --git a/www/chromium/files/patch-content_gpu_in__process__gpu__thread.cc b/www/chromium/files/patch-content_gpu_in__process__gpu__thread.cc index 82bae81..13d0809 100644 --- a/www/chromium/files/patch-content_gpu_in__process__gpu__thread.cc +++ b/www/chromium/files/patch-content_gpu_in__process__gpu__thread.cc @@ -1,11 +1,11 @@ ---- content/gpu/in_process_gpu_thread.cc.orig 2017-01-26 00:49:13 UTC +--- content/gpu/in_process_gpu_thread.cc.orig 2017-04-19 19:06:34 UTC +++ content/gpu/in_process_gpu_thread.cc -@@ -53,8 +53,6 @@ void InProcessGpuThread::Init() { +@@ -54,8 +54,6 @@ void InProcessGpuThread::Init() { gpu::GPUInfo gpu_info; if (!gl::init::InitializeGLOneOff()) VLOG(1) << "gl::init::InitializeGLOneOff failed"; - else - gpu::CollectContextGraphicsInfo(&gpu_info); - // The process object takes ownership of the thread object, so do not - // save and delete the pointer. + gpu::GpuFeatureInfo gpu_feature_info = + gpu::GetGpuFeatureInfo(gpu_info, *base::CommandLine::ForCurrentProcess()); diff --git a/www/chromium/files/patch-content_public_common_child__process__host.h b/www/chromium/files/patch-content_public_common_child__process__host.h index 147c3a8..aeebc99 100644 --- a/www/chromium/files/patch-content_public_common_child__process__host.h +++ b/www/chromium/files/patch-content_public_common_child__process__host.h @@ -1,6 +1,6 @@ ---- content/public/common/child_process_host.h.orig 2017-01-26 00:49:13 UTC +--- content/public/common/child_process_host.h.orig 2017-04-19 19:06:34 UTC +++ content/public/common/child_process_host.h -@@ -53,7 +53,7 @@ class CONTENT_EXPORT ChildProcessHost : +@@ -54,7 +54,7 @@ class CONTENT_EXPORT ChildProcessHost : // 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 : +@@ -63,7 +63,7 @@ class CONTENT_EXPORT ChildProcessHost : // 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/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 2c8e327..1eeccd1 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2017-01-26 00:49:13 UTC +--- content/public/common/content_switches.cc.orig 2017-04-19 19:06:34 UTC +++ content/public/common/content_switches.cc -@@ -992,7 +992,7 @@ const char kDisableVaapiAcceleratedVideo +@@ -1006,7 +1006,7 @@ const char kDisableVaapiAcceleratedVideo "disable-vaapi-accelerated-video-encode"; #endif diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index d4f8e2e..d7035c6 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2017-03-09 20:04:32 UTC +--- content/public/common/content_switches.h.orig 2017-04-19 19:06:34 UTC +++ content/public/common/content_switches.h -@@ -296,7 +296,7 @@ CONTENT_EXPORT extern const char kDisabl +@@ -294,7 +294,7 @@ CONTENT_EXPORT extern const char kDisabl CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; #endif diff --git a/www/chromium/files/patch-content_public_common_renderer__preferences.h b/www/chromium/files/patch-content_public_common_renderer__preferences.h index 88cc166..4a5a140 100644 --- a/www/chromium/files/patch-content_public_common_renderer__preferences.h +++ b/www/chromium/files/patch-content_public_common_renderer__preferences.h @@ -1,6 +1,6 @@ ---- content/public/common/renderer_preferences.h.orig 2017-01-26 00:49:13 UTC +--- content/public/common/renderer_preferences.h.orig 2017-04-19 19:06:34 UTC +++ content/public/common/renderer_preferences.h -@@ -139,7 +139,7 @@ struct CONTENT_EXPORT RendererPreference +@@ -131,7 +131,7 @@ struct CONTENT_EXPORT RendererPreference // Country iso of the mobile network for content detection purpose. std::string network_contry_iso; diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc index 38bc1b9..8f203ac 100644 --- a/www/chromium/files/patch-content_public_test_browser__test__base.cc +++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc @@ -1,4 +1,4 @@ ---- content/public/test/browser_test_base.cc.orig 2017-01-26 00:49:13 UTC +--- content/public/test/browser_test_base.cc.orig 2017-04-19 19:06:34 UTC +++ content/public/test/browser_test_base.cc @@ -6,6 +6,10 @@ diff --git a/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc b/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc index f024294..efb2042 100644 --- a/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc +++ b/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc @@ -1,4 +1,4 @@ ---- content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2017-01-26 00:49:13 UTC +--- content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2017-04-19 19:06:34 UTC +++ content/renderer/media/webrtc/processed_local_audio_source.cc @@ -269,8 +269,8 @@ void ProcessedLocalAudioSource::Capture( bool key_pressed) { diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index d2a74ce..19d8e97 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2017-03-09 20:04:32 UTC +--- content/renderer/render_thread_impl.cc.orig 2017-04-19 19:06:34 UTC +++ content/renderer/render_thread_impl.cc -@@ -207,11 +207,13 @@ +@@ -206,11 +206,13 @@ #include "content/common/external_ipc_dumper.h" #endif @@ -14,7 +14,7 @@ using base::ThreadRestrictions; using blink::WebDocument; -@@ -1386,7 +1388,7 @@ media::GpuVideoAcceleratorFactories* Ren +@@ -1379,7 +1381,7 @@ media::GpuVideoAcceleratorFactories* Ren const bool enable_video_accelerator = !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); const bool enable_gpu_memory_buffer_video_frames = @@ -23,7 +23,7 @@ !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && !gpu_channel_host->gpu_info().software_rendering; -@@ -1729,6 +1731,8 @@ void RenderThreadImpl::GetRendererMemory +@@ -1712,6 +1714,8 @@ void RenderThreadImpl::GetRendererMemory #else size_t malloc_usage = minfo.hblkhd + minfo.arena; #endif diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 7fa3126..2311ab5 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2017-03-09 20:04:32 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2017-04-19 19:06:34 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -111,7 +111,7 @@ +@@ -112,7 +112,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" @@ -9,7 +9,7 @@ #include <map> #include <string> -@@ -204,7 +204,7 @@ class RendererBlinkPlatformImpl::FileUti +@@ -206,7 +206,7 @@ class RendererBlinkPlatformImpl::FileUti scoped_refptr<ThreadSafeSender> thread_safe_sender_; }; @@ -18,7 +18,7 @@ class RendererBlinkPlatformImpl::SandboxSupport : public blink::WebSandboxSupport { public: -@@ -250,7 +250,7 @@ RendererBlinkPlatformImpl::RendererBlink +@@ -252,7 +252,7 @@ RendererBlinkPlatformImpl::RendererBlink renderer_scheduler_(renderer_scheduler), blink_interface_provider_( new BlinkInterfaceProviderImpl(remote_interfaces)) { @@ -27,7 +27,7 @@ if (g_sandbox_enabled && sandboxEnabled()) { sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); } else { -@@ -286,7 +286,7 @@ RendererBlinkPlatformImpl::~RendererBlin +@@ -288,7 +288,7 @@ RendererBlinkPlatformImpl::~RendererBlin } void RendererBlinkPlatformImpl::Shutdown() { @@ -36,7 +36,7 @@ // SandboxSupport contains a map of WebFontFamily objects, which hold // WebCStrings, which become invalidated when blink is shut down. Hence, we // need to clear that map now, just before blink::shutdown() is called. -@@ -334,7 +334,7 @@ blink::WebFileUtilities* RendererBlinkPl +@@ -336,7 +336,7 @@ blink::WebFileUtilities* RendererBlinkPl } blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() { @@ -45,7 +45,7 @@ // These platforms do not require sandbox support. return NULL; #else -@@ -542,7 +542,7 @@ bool RendererBlinkPlatformImpl::SandboxS +@@ -543,7 +543,7 @@ bool RendererBlinkPlatformImpl::SandboxS return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 4f10c4f..1b3430e 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2017-03-09 20:04:32 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2017-04-19 19:06:34 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -252,7 +252,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo +@@ -253,7 +253,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo class FileUtilities; std::unique_ptr<FileUtilities> file_utilities_; diff --git a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index be1e1b2..7090b6b 100644 --- a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,4 +1,4 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-01-26 00:49:13 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-04-19 19:06:34 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc @@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf } diff --git a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc index c53f33b..0e06833 100644 --- a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc +++ b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc @@ -1,4 +1,4 @@ ---- content/renderer/webscrollbarbehavior_impl_aura.cc.orig 2017-01-26 00:49:13 UTC +--- content/renderer/webscrollbarbehavior_impl_aura.cc.orig 2017-04-19 19:06:34 UTC +++ content/renderer/webscrollbarbehavior_impl_aura.cc @@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCen blink::WebPointerProperties::Button mouseButton, diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 9bbea1f..0167eba 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2017-03-09 20:04:32 UTC +--- content/shell/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ content/shell/BUILD.gn -@@ -296,7 +296,7 @@ static_library("content_shell_lib") { +@@ -295,7 +295,7 @@ static_library("content_shell_lib") { ] } @@ -9,7 +9,7 @@ deps += [ "//build/linux:fontconfig", "//ui/gfx:test_support", -@@ -320,7 +320,7 @@ static_library("content_shell_lib") { +@@ -319,7 +319,7 @@ static_library("content_shell_lib") { ] } @@ -18,13 +18,13 @@ deps += [ "//components/crash/content/app", "//components/crash/content/browser", -@@ -369,7 +369,7 @@ static_library("content_shell_lib") { +@@ -368,7 +368,7 @@ static_library("content_shell_lib") { ] } - if (is_linux) { + if (is_linux || is_bsd) { - deps += [ "//third_party/freetype2" ] + deps += [ "//third_party/freetype-android:freetype" ] } @@ -539,7 +539,7 @@ if (is_android) { diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index 071f52a..0d8886b 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,4 +1,4 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2017-01-26 00:49:13 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2017-04-19 19:06:34 UTC +++ content/shell/browser/shell_browser_context.cc @@ -25,7 +25,7 @@ diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 8c34b88..6e6b564 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2017-03-09 20:04:32 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2017-04-19 19:06:34 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -46,7 +46,7 @@ #if defined(USE_AURA) && defined(USE_X11) diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 13b6df8..968e41e 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2017-03-09 20:04:32 UTC +--- content/test/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ content/test/BUILD.gn -@@ -771,7 +771,7 @@ test("content_browsertests") { +@@ -785,7 +785,7 @@ test("content_browsertests") { } } @@ -9,7 +9,7 @@ data += [ "$root_out_dir/content_shell.pak", "data/", -@@ -1392,7 +1392,7 @@ test("content_unittests") { +@@ -1425,7 +1425,7 @@ test("content_unittests") { sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ] } @@ -18,7 +18,7 @@ data = [ "$root_out_dir/content_shell.pak", "data/", -@@ -1597,7 +1597,7 @@ test("content_unittests") { +@@ -1632,7 +1632,7 @@ test("content_unittests") { "//ui/shell_dialogs:shell_dialogs", ] @@ -27,7 +27,7 @@ sources += [ "../browser/media/capture/desktop_capture_device_unittest.cc" ] deps += [ "//third_party/webrtc/modules/desktop_capture" ] -@@ -1631,7 +1631,7 @@ test("content_unittests") { +@@ -1670,7 +1670,7 @@ test("content_unittests") { } } diff --git a/www/chromium/files/patch-crypto_nss__util.cc b/www/chromium/files/patch-crypto_nss__util.cc index 92d45f0..249910c 100644 --- a/www/chromium/files/patch-crypto_nss__util.cc +++ b/www/chromium/files/patch-crypto_nss__util.cc @@ -1,4 +1,4 @@ ---- crypto/nss_util.cc.orig 2017-01-26 00:49:14 UTC +--- crypto/nss_util.cc.orig 2017-04-19 19:06:34 UTC +++ crypto/nss_util.cc @@ -20,7 +20,7 @@ #include "base/threading/thread_task_runner_handle.h" diff --git a/www/chromium/files/patch-device_BUILD.gn b/www/chromium/files/patch-device_BUILD.gn index c23c855..1feb214 100644 --- a/www/chromium/files/patch-device_BUILD.gn +++ b/www/chromium/files/patch-device_BUILD.gn @@ -1,6 +1,6 @@ ---- device/BUILD.gn.orig 2017-03-09 20:04:33 UTC +--- device/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ device/BUILD.gn -@@ -197,7 +197,7 @@ test("device_unittests") { +@@ -200,7 +200,7 @@ test("device_unittests") { ] } diff --git a/www/chromium/files/patch-device_battery_BUILD.gn b/www/chromium/files/patch-device_battery_BUILD.gn index dd53e08..8c51ce4 100644 --- a/www/chromium/files/patch-device_battery_BUILD.gn +++ b/www/chromium/files/patch-device_battery_BUILD.gn @@ -1,4 +1,4 @@ ---- device/battery/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- device/battery/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ device/battery/BUILD.gn @@ -47,7 +47,7 @@ if (!is_android) { ] diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn index ed64cb7..a27c459 100644 --- a/www/chromium/files/patch-device_bluetooth_BUILD.gn +++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn @@ -1,6 +1,6 @@ ---- device/bluetooth/BUILD.gn.orig 2017-03-09 20:04:33 UTC +--- device/bluetooth/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ device/bluetooth/BUILD.gn -@@ -199,7 +199,7 @@ component("bluetooth") { +@@ -200,7 +200,7 @@ component("bluetooth") { ] } diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index cd25201..26527f1 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,4 +1,4 @@ ---- device/gamepad/gamepad_provider.cc.orig 2017-03-09 20:04:33 UTC +--- device/gamepad/gamepad_provider.cc.orig 2017-04-19 19:06:34 UTC +++ device/gamepad/gamepad_provider.cc @@ -153,7 +153,7 @@ void GamepadProvider::Initialize(std::un monitor->AddDevicesChangedObserver(this); diff --git a/www/chromium/files/patch-device_geolocation_BUILD.gn b/www/chromium/files/patch-device_geolocation_BUILD.gn index e7a65f9..1f4d0ae 100644 --- a/www/chromium/files/patch-device_geolocation_BUILD.gn +++ b/www/chromium/files/patch-device_geolocation_BUILD.gn @@ -1,4 +1,4 @@ ---- device/geolocation/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- device/geolocation/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ device/geolocation/BUILD.gn @@ -89,7 +89,7 @@ component("geolocation") { if (is_android) { diff --git a/www/chromium/files/patch-device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-device_geolocation_location__arbitrator.cc index 2c5b0b4..b316169 100644 --- a/www/chromium/files/patch-device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-device_geolocation_location__arbitrator.cc @@ -1,4 +1,4 @@ ---- device/geolocation/location_arbitrator.cc.orig 2017-01-26 00:49:14 UTC +--- device/geolocation/location_arbitrator.cc.orig 2017-04-19 19:06:34 UTC +++ device/geolocation/location_arbitrator.cc @@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationPr diff --git a/www/chromium/files/patch-device_hid_BUILD.gn b/www/chromium/files/patch-device_hid_BUILD.gn index a465136..3839cd3 100644 --- a/www/chromium/files/patch-device_hid_BUILD.gn +++ b/www/chromium/files/patch-device_hid_BUILD.gn @@ -1,4 +1,4 @@ ---- device/hid/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- device/hid/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ device/hid/BUILD.gn @@ -56,6 +56,13 @@ source_set("hid") { deps += [ "//device/udev_linux" ] diff --git a/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__daemon__client.h b/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__daemon__client.h index 936ca99..f1731ef 100644 --- a/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__daemon__client.h +++ b/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__daemon__client.h @@ -1,4 +1,4 @@ ---- device/media_transfer_protocol/media_transfer_protocol_daemon_client.h.orig 2017-02-02 02:02:54 UTC +--- device/media_transfer_protocol/media_transfer_protocol_daemon_client.h.orig 2017-04-19 19:06:34 UTC +++ device/media_transfer_protocol/media_transfer_protocol_daemon_client.h @@ -19,7 +19,7 @@ #include "base/macros.h" diff --git a/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h b/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h index 09b23fc..c12a44a 100644 --- a/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h +++ b/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h @@ -1,4 +1,4 @@ ---- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2017-01-26 00:49:14 UTC +--- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2017-04-19 19:06:34 UTC +++ device/media_transfer_protocol/media_transfer_protocol_manager.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" diff --git a/www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h b/www/chromium/files/patch-device_sensors_data__fetcher__shared__memory.h index 1f7c96d..3e39313 100644 --- a/www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h +++ b/www/chromium/files/patch-device_sensors_data__fetcher__shared__memory.h @@ -1,6 +1,6 @@ ---- content/browser/device_sensors/data_fetcher_shared_memory.h.orig 2017-01-26 00:49:13 UTC -+++ content/browser/device_sensors/data_fetcher_shared_memory.h -@@ -45,7 +45,7 @@ class CONTENT_EXPORT DataFetcherSharedMe +--- device/sensors/data_fetcher_shared_memory.h.orig 2017-04-19 19:06:34 UTC ++++ device/sensors/data_fetcher_shared_memory.h +@@ -44,7 +44,7 @@ class DEVICE_SENSOR_EXPORT DataFetcherSh bool Start(ConsumerType consumer_type, void* buffer) override; bool Stop(ConsumerType consumer_type) override; diff --git a/www/chromium/files/patch-device_serial_BUILD.gn b/www/chromium/files/patch-device_serial_BUILD.gn index 0a8900d..5e66e46 100644 --- a/www/chromium/files/patch-device_serial_BUILD.gn +++ b/www/chromium/files/patch-device_serial_BUILD.gn @@ -1,4 +1,4 @@ ---- device/serial/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- device/serial/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ device/serial/BUILD.gn @@ -6,7 +6,7 @@ import("//build/config/features.gni") import("//mojo/public/tools/bindings/mojom.gni") diff --git a/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc index 13fe8e2..b515cc9 100644 --- a/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc +++ b/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc @@ -1,4 +1,4 @@ ---- device/serial/serial_io_handler_posix.cc.orig 2017-01-26 00:49:14 UTC +--- device/serial/serial_io_handler_posix.cc.orig 2017-04-19 19:06:34 UTC +++ device/serial/serial_io_handler_posix.cc @@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate, BITRATE_TO_SPEED_CASE(9600) diff --git a/www/chromium/files/patch-device_usb_usb__context.cc b/www/chromium/files/patch-device_usb_usb__context.cc index 3b2a483..1379b24 100644 --- a/www/chromium/files/patch-device_usb_usb__context.cc +++ b/www/chromium/files/patch-device_usb_usb__context.cc @@ -1,4 +1,4 @@ ---- device/usb/usb_context.cc.orig 2017-01-26 00:49:14 UTC +--- device/usb/usb_context.cc.orig 2017-04-19 19:06:34 UTC +++ device/usb/usb_context.cc @@ -9,8 +9,13 @@ #include "base/macros.h" diff --git a/www/chromium/files/patch-device_usb_usb__context__unittest.cc b/www/chromium/files/patch-device_usb_usb__context__unittest.cc index f25eb36..f54b7d7 100644 --- a/www/chromium/files/patch-device_usb_usb__context__unittest.cc +++ b/www/chromium/files/patch-device_usb_usb__context__unittest.cc @@ -1,4 +1,4 @@ ---- device/usb/usb_context_unittest.cc.orig 2017-01-26 00:49:14 UTC +--- device/usb/usb_context_unittest.cc.orig 2017-04-19 19:06:34 UTC +++ device/usb/usb_context_unittest.cc @@ -7,7 +7,11 @@ #include "build/build_config.h" diff --git a/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc b/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc index 14ff998..3ba8fcd 100644 --- a/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc @@ -1,4 +1,4 @@ ---- device/usb/usb_device_handle_impl.cc.orig 2017-01-26 00:49:14 UTC +--- device/usb/usb_device_handle_impl.cc.orig 2017-04-19 19:06:34 UTC +++ device/usb/usb_device_handle_impl.cc @@ -25,7 +25,11 @@ #include "device/usb/usb_error.h" diff --git a/www/chromium/files/patch-device_usb_usb__device__handle__impl.h b/www/chromium/files/patch-device_usb_usb__device__handle__impl.h index 3fb03aa..4cf2a18 100644 --- a/www/chromium/files/patch-device_usb_usb__device__handle__impl.h +++ b/www/chromium/files/patch-device_usb_usb__device__handle__impl.h @@ -1,4 +1,4 @@ ---- device/usb/usb_device_handle_impl.h.orig 2017-01-26 00:49:14 UTC +--- device/usb/usb_device_handle_impl.h.orig 2017-04-19 19:06:34 UTC +++ device/usb/usb_device_handle_impl.h @@ -18,7 +18,12 @@ #include "base/memory/ref_counted.h" diff --git a/www/chromium/files/patch-device_usb_usb__device__impl.cc b/www/chromium/files/patch-device_usb_usb__device__impl.cc index 23389cd..e299984 100644 --- a/www/chromium/files/patch-device_usb_usb__device__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__device__impl.cc @@ -1,4 +1,4 @@ ---- device/usb/usb_device_impl.cc.orig 2017-01-26 00:49:14 UTC +--- device/usb/usb_device_impl.cc.orig 2017-04-19 19:06:34 UTC +++ device/usb/usb_device_impl.cc @@ -22,7 +22,11 @@ #include "device/usb/usb_descriptors.h" diff --git a/www/chromium/files/patch-device_usb_usb__error.cc b/www/chromium/files/patch-device_usb_usb__error.cc index 61db73d..b650b77 100644 --- a/www/chromium/files/patch-device_usb_usb__error.cc +++ b/www/chromium/files/patch-device_usb_usb__error.cc @@ -1,4 +1,4 @@ ---- device/usb/usb_error.cc.orig 2017-01-26 00:49:14 UTC +--- device/usb/usb_error.cc.orig 2017-04-19 19:06:34 UTC +++ device/usb/usb_error.cc @@ -4,7 +4,11 @@ diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc index d315285..861a824 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc @@ -1,6 +1,6 @@ ---- device/usb/usb_service_impl.cc.orig 2017-03-09 20:04:33 UTC +--- device/usb/usb_service_impl.cc.orig 2017-04-19 19:06:34 UTC +++ device/usb/usb_service_impl.cc -@@ -26,7 +26,11 @@ +@@ -25,7 +25,11 @@ #include "device/usb/usb_error.h" #include "device/usb/webusb_descriptors.h" #include "net/base/io_buffer.h" @@ -12,8 +12,8 @@ +#endif #if defined(OS_WIN) - #include <setupapi.h> -@@ -229,8 +233,10 @@ UsbServiceImpl::UsbServiceImpl( + #define INITGUID +@@ -231,8 +235,10 @@ UsbServiceImpl::UsbServiceImpl( } UsbServiceImpl::~UsbServiceImpl() { @@ -24,7 +24,7 @@ for (auto* platform_device : ignored_devices_) libusb_unref_device(platform_device); } -@@ -287,6 +293,7 @@ void UsbServiceImpl::OnUsbContext(scoped +@@ -289,6 +295,7 @@ void UsbServiceImpl::OnUsbContext(scoped context_ = std::move(context); @@ -32,7 +32,7 @@ int rv = libusb_hotplug_register_callback( context_->context(), static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -299,6 +306,7 @@ void UsbServiceImpl::OnUsbContext(scoped +@@ -301,6 +308,7 @@ void UsbServiceImpl::OnUsbContext(scoped // This will call any enumeration callbacks queued while initializing. RefreshDevices(); @@ -40,7 +40,7 @@ #if defined(OS_WIN) DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); -@@ -498,6 +506,7 @@ void UsbServiceImpl::RemoveDevice(scoped +@@ -500,6 +508,7 @@ void UsbServiceImpl::RemoveDevice(scoped device->OnDisconnect(); } @@ -48,7 +48,7 @@ // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -528,6 +537,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC +@@ -530,6 +539,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC return 0; } diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.h b/www/chromium/files/patch-device_usb_usb__service__impl.h index 0ec596d..115e64a 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.h +++ b/www/chromium/files/patch-device_usb_usb__service__impl.h @@ -1,4 +1,4 @@ ---- device/usb/usb_service_impl.h.orig 2017-03-09 20:04:33 UTC +--- device/usb/usb_service_impl.h.orig 2017-04-19 19:06:34 UTC +++ device/usb/usb_service_impl.h @@ -15,7 +15,13 @@ #include "build/build_config.h" @@ -14,7 +14,7 @@ #if defined(OS_WIN) #include "base/scoped_observer.h" -@@ -71,11 +77,13 @@ class UsbServiceImpl : +@@ -73,11 +79,13 @@ class UsbServiceImpl : scoped_refptr<UsbDeviceImpl> device); void RemoveDevice(scoped_refptr<UsbDeviceImpl> device); @@ -28,7 +28,7 @@ // These functions release a reference to the provided platform device. void OnPlatformDeviceAdded(PlatformUsbDevice platform_device); void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device); -@@ -92,7 +100,9 @@ class UsbServiceImpl : +@@ -94,7 +102,9 @@ class UsbServiceImpl : // connected instead of only when a full enumeration is requested. // TODO(reillyg): Support this on all platforms. crbug.com/411715 bool hotplug_enabled_ = false; diff --git a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc index 58b5497..1b226d2 100644 --- a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc +++ b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2017-01-26 00:49:14 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2017-04-19 19:06:34 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc @@ -29,7 +29,11 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc index 1ea9651..d94b27c 100644 --- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc +++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2017-01-26 00:49:14 UTC +--- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2017-04-19 19:06:34 UTC +++ extensions/browser/api/networking_private/networking_private_event_router_factory.cc @@ -13,6 +13,7 @@ diff --git a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc index d3d5936..5b69f28 100644 --- a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc +++ b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/serial/serial_api.cc.orig 2017-03-09 20:04:33 UTC +--- extensions/browser/api/serial/serial_api.cc.orig 2017-04-19 19:06:34 UTC +++ extensions/browser/api/serial/serial_api.cc @@ -86,11 +86,13 @@ bool SerialGetDevicesFunction::Prepare() void SerialGetDevicesFunction::Work() { diff --git a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc index 9abb79d..64959cb 100644 --- a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc +++ b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/web_request/form_data_parser.cc.orig 2017-01-26 00:49:14 UTC +--- extensions/browser/api/web_request/form_data_parser.cc.orig 2017-04-19 19:06:34 UTC +++ extensions/browser/api/web_request/form_data_parser.cc @@ -15,7 +15,11 @@ #include "base/values.h" diff --git a/www/chromium/files/patch-extensions_common_image__util.cc b/www/chromium/files/patch-extensions_common_image__util.cc index ebbe100..823b32f 100644 --- a/www/chromium/files/patch-extensions_common_image__util.cc +++ b/www/chromium/files/patch-extensions_common_image__util.cc @@ -1,4 +1,4 @@ ---- extensions/common/image_util.cc.orig 2017-01-26 00:49:14 UTC +--- extensions/common/image_util.cc.orig 2017-04-19 19:06:34 UTC +++ extensions/common/image_util.cc @@ -11,7 +11,11 @@ #include "base/strings/string_number_conversions.h" diff --git a/www/chromium/files/patch-extensions_common_stack__frame.cc b/www/chromium/files/patch-extensions_common_stack__frame.cc index 5338f97..918a20a 100644 --- a/www/chromium/files/patch-extensions_common_stack__frame.cc +++ b/www/chromium/files/patch-extensions_common_stack__frame.cc @@ -1,4 +1,4 @@ ---- extensions/common/stack_frame.cc.orig 2017-01-26 00:49:14 UTC +--- extensions/common/stack_frame.cc.orig 2017-04-19 19:06:34 UTC +++ extensions/common/stack_frame.cc @@ -7,7 +7,11 @@ #include <string> diff --git a/www/chromium/files/patch-gpu_BUILD.gn b/www/chromium/files/patch-gpu_BUILD.gn index b052d6e..b1e3465 100644 --- a/www/chromium/files/patch-gpu_BUILD.gn +++ b/www/chromium/files/patch-gpu_BUILD.gn @@ -1,6 +1,6 @@ ---- gpu/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- gpu/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ gpu/BUILD.gn -@@ -93,7 +93,7 @@ test("command_buffer_gles2_tests") { +@@ -96,7 +96,7 @@ test("command_buffer_gles2_tests") { libs += [ "android" ] deps += [ "//ui/android:ui_java" ] } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc index dab811c..bb49bb7 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/program_manager.cc.orig 2017-01-26 00:49:14 UTC +--- gpu/command_buffer/service/program_manager.cc.orig 2017-04-19 19:06:34 UTC +++ gpu/command_buffer/service/program_manager.cc @@ -31,7 +31,11 @@ #include "gpu/command_buffer/service/program_cache.h" diff --git a/www/chromium/files/patch-gpu_config_BUILD.gn b/www/chromium/files/patch-gpu_config_BUILD.gn index 454821f..6c0ff48 100644 --- a/www/chromium/files/patch-gpu_config_BUILD.gn +++ b/www/chromium/files/patch-gpu_config_BUILD.gn @@ -1,4 +1,4 @@ ---- gpu/config/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- gpu/config/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ gpu/config/BUILD.gn @@ -8,7 +8,8 @@ import("//build/config/ui.gni") @@ -10,7 +10,7 @@ (use_x11 || use_ozone) } -@@ -97,6 +98,14 @@ source_set("config_sources") { +@@ -101,6 +102,14 @@ source_set("config_sources") { ] } } diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index c6e7a78..6167136 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list.cc.orig 2017-01-26 00:49:14 UTC +--- gpu/config/gpu_control_list.cc.orig 2017-04-19 19:06:34 UTC +++ gpu/config/gpu_control_list.cc @@ -19,7 +19,11 @@ #include "base/sys_info.h" @@ -12,7 +12,7 @@ namespace gpu { namespace { -@@ -1154,7 +1158,7 @@ GpuControlList::GpuControlListEntry::GLT +@@ -1183,7 +1187,7 @@ GpuControlList::GpuControlListEntry::GLT GpuControlList::GpuControlListEntry::GetDefaultGLType() { #if defined(OS_CHROMEOS) return kGLTypeGL; @@ -21,7 +21,7 @@ return kGLTypeGL; #elif defined(OS_MACOSX) return kGLTypeGL; -@@ -1606,7 +1610,7 @@ GpuControlList::OsType GpuControlList::G +@@ -1642,7 +1646,7 @@ GpuControlList::OsType GpuControlList::G return kOsWin; #elif defined(OS_ANDROID) return kOsAndroid; diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc b/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc index afb2796..ee60865 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list_unittest.cc.orig 2017-01-26 00:49:14 UTC +--- gpu/config/gpu_control_list_unittest.cc.orig 2017-04-19 19:06:34 UTC +++ gpu/config/gpu_control_list_unittest.cc @@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs features = control_list->MakeDecision( diff --git a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc index 7608cfe..562c2f6 100644 --- a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc +++ b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_info_collector.cc.orig 2017-01-26 00:49:14 UTC +--- gpu/config/gpu_info_collector.cc.orig 2017-04-19 19:06:34 UTC +++ gpu/config/gpu_info_collector.cc @@ -193,8 +193,10 @@ CollectInfoResult CollectGraphicsInfoGL( gpu_info->pixel_shader_version = glsl_version; diff --git a/www/chromium/files/patch-gpu_config_gpu__test__config.cc b/www/chromium/files/patch-gpu_config_gpu__test__config.cc index 65a4eff..b2c8de7 100644 --- a/www/chromium/files/patch-gpu_config_gpu__test__config.cc +++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_test_config.cc.orig 2017-01-26 00:49:14 UTC +--- gpu/config/gpu_test_config.cc.orig 2017-04-19 19:06:34 UTC +++ gpu/config/gpu_test_config.cc @@ -24,7 +24,7 @@ namespace { GPUTestConfig::OS GetCurrentOS() { diff --git a/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn b/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn index fa54c91..82d02b2 100644 --- a/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn +++ b/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn @@ -1,4 +1,4 @@ ---- gpu/gles2_conform_support/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- gpu/gles2_conform_support/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ gpu/gles2_conform_support/BUILD.gn @@ -60,7 +60,7 @@ executable("gles2_conform_support") { "//gpu/gles2_conform_support/egl", diff --git a/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn b/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn index b95cde8..92ca9db 100644 --- a/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn +++ b/www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn @@ -1,4 +1,4 @@ ---- gpu/gles2_conform_support/native/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- gpu/gles2_conform_support/native/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ gpu/gles2_conform_support/native/BUILD.gn @@ -20,7 +20,7 @@ source_set("native") { "//gpu/gles2_conform_support/egl", diff --git a/www/chromium/files/patch-gpu_ipc_client_BUILD.gn b/www/chromium/files/patch-gpu_ipc_client_BUILD.gn index 1b4f6c6..8e5c1bb 100644 --- a/www/chromium/files/patch-gpu_ipc_client_BUILD.gn +++ b/www/chromium/files/patch-gpu_ipc_client_BUILD.gn @@ -1,4 +1,4 @@ ---- gpu/ipc/client/BUILD.gn.orig 2017-03-09 20:04:33 UTC +--- gpu/ipc/client/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ gpu/ipc/client/BUILD.gn @@ -44,6 +44,7 @@ source_set("ipc_client_sources") { configs += [ diff --git a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn index cf8bdd7..bc82427 100644 --- a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn +++ b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn @@ -1,6 +1,6 @@ ---- gpu/ipc/service/BUILD.gn.orig 2017-03-09 20:04:33 UTC +--- gpu/ipc/service/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ gpu/ipc/service/BUILD.gn -@@ -109,11 +109,12 @@ target(link_target_type, "ipc_service_so +@@ -110,11 +110,12 @@ target(link_target_type, "ipc_service_so ] libs += [ "android" ] } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 044a355..ef61b49 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2017-03-09 20:04:33 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2017-04-19 19:06:34 UTC +++ gpu/ipc/service/gpu_init.cc @@ -76,7 +76,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI } @@ -34,5 +34,5 @@ -#endif // !defined(OS_MACOSX) +#endif // !defined(OS_MACOSX) && !defined(OS_BSD) - base::TimeDelta collect_context_time = - base::TimeTicks::Now() - before_collect_context_graphics_info; + gpu_feature_info_ = gpu::GetGpuFeatureInfo(gpu_info_, command_line); + diff --git a/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn b/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn index ccdd6bb..6a60939 100644 --- a/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn +++ b/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn @@ -1,4 +1,4 @@ ---- gpu/tools/compositor_model_bench/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- gpu/tools/compositor_model_bench/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ gpu/tools/compositor_model_bench/BUILD.gn @@ -4,7 +4,7 @@ diff --git a/www/chromium/files/patch-gpu_vulkan_BUILD.gn b/www/chromium/files/patch-gpu_vulkan_BUILD.gn index 50279a9..2dd0aa4 100644 --- a/www/chromium/files/patch-gpu_vulkan_BUILD.gn +++ b/www/chromium/files/patch-gpu_vulkan_BUILD.gn @@ -1,4 +1,4 @@ ---- gpu/vulkan/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- gpu/vulkan/BUILD.gn.orig 2017-04-19 19:06:34 UTC +++ gpu/vulkan/BUILD.gn @@ -14,7 +14,7 @@ if (enable_vulkan) { component("vulkan") { diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index 8f3c7af..ffe5b22 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2017-01-26 00:49:15 UTC +--- ipc/ipc_channel.h.orig 2017-04-19 19:06:35 UTC +++ ipc/ipc_channel.h -@@ -245,7 +245,7 @@ class IPC_EXPORT Channel : public Sender +@@ -246,7 +246,7 @@ class IPC_EXPORT Channel : public Sender static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index d0f1064..ccffba6 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2017-01-26 00:49:15 UTC +--- ipc/ipc_message_utils.cc.orig 2017-04-19 19:06:35 UTC +++ ipc/ipc_message_utils.cc -@@ -425,7 +425,7 @@ void ParamTraits<unsigned int>::Log(cons +@@ -421,7 +421,7 @@ void ParamTraits<unsigned int>::Log(cons l->append(base::UintToString(p)); } diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index 9e5a300..4d0604a 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,4 +1,4 @@ ---- ipc/ipc_message_utils.h.orig 2017-03-09 20:04:34 UTC +--- ipc/ipc_message_utils.h.orig 2017-04-19 19:06:35 UTC +++ ipc/ipc_message_utils.h @@ -209,7 +209,7 @@ struct ParamTraits<unsigned int> { // 3) Android 64 bit also has int64_t typedef'd to long. diff --git a/www/chromium/files/patch-mash_package_mash__packaged__service.cc b/www/chromium/files/patch-mash_package_mash__packaged__service.cc index 5f8421f..5cc467a 100644 --- a/www/chromium/files/patch-mash_package_mash__packaged__service.cc +++ b/www/chromium/files/patch-mash_package_mash__packaged__service.cc @@ -1,6 +1,6 @@ ---- mash/package/mash_packaged_service.cc.orig 2017-03-09 20:04:34 UTC +--- mash/package/mash_packaged_service.cc.orig 2017-04-19 19:06:35 UTC +++ mash/package/mash_packaged_service.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "ash/touch_hud/mus/touch_hud_application.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "components/font_service/font_service_app.h" #endif -@@ -103,7 +103,7 @@ std::unique_ptr<service_manager::Service +@@ -104,7 +104,7 @@ std::unique_ptr<service_manager::Service return base::WrapUnique(new mash::task_viewer::TaskViewer); if (name == "test_ime_driver") return base::WrapUnique(new ui::test::TestIMEApplication); diff --git a/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc b/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc index dba40d6..0923902 100644 --- a/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc +++ b/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc @@ -1,4 +1,4 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2017-03-09 20:04:34 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2017-04-19 19:06:35 UTC +++ media/audio/alsa/audio_manager_alsa.cc @@ -138,7 +138,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic int card = -1; diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index 41a4627..0c873b4 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2017-03-09 20:04:34 UTC +--- media/audio/BUILD.gn.orig 2017-04-19 19:06:35 UTC +++ media/audio/BUILD.gn -@@ -207,7 +207,7 @@ source_set("audio") { +@@ -212,7 +212,7 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } @@ -9,7 +9,7 @@ sources += [ "linux/audio_manager_linux.cc" ] } -@@ -256,10 +256,12 @@ source_set("audio") { +@@ -261,10 +261,12 @@ source_set("audio") { configs += [ ":libpulse" ] } else { # TODO(ajwong): Technically, this dl should go in the action. diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc index 2c9571c..73fb170 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.cc +++ b/www/chromium/files/patch-media_audio_audio__manager.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_manager.cc.orig 2017-03-09 20:04:34 UTC +--- media/audio/audio_manager.cc.orig 2017-04-19 19:06:35 UTC +++ media/audio/audio_manager.cc -@@ -95,7 +95,7 @@ class AudioManagerHelper : public base:: +@@ -93,7 +93,7 @@ class AudioManagerHelper : public base:: } #endif @@ -9,7 +9,7 @@ void set_app_name(const std::string& app_name) { app_name_ = app_name; } const std::string& app_name() const { return app_name_; } #endif -@@ -253,7 +253,7 @@ class AudioManagerHelper : public base:: +@@ -227,7 +227,7 @@ class AudioManagerHelper : public base:: std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; #endif @@ -18,12 +18,12 @@ std::string app_name_; #endif -@@ -369,7 +369,7 @@ void AudioManager::EnableCrashKeyLogging - g_helper.Pointer()->enable_crash_key_logging(); +@@ -342,7 +342,7 @@ void AudioManager::StartHangMonitorIfNee + GetHelper()->StartHangTimer(std::move(task_runner)); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) // static void AudioManager::SetGlobalAppName(const std::string& app_name) { - g_helper.Pointer()->set_app_name(app_name); + GetHelper()->set_app_name(app_name); diff --git a/www/chromium/files/patch-media_audio_audio__manager.h b/www/chromium/files/patch-media_audio_audio__manager.h index 7272a8e..8431068 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.h +++ b/www/chromium/files/patch-media_audio_audio__manager.h @@ -1,8 +1,8 @@ ---- media/audio/audio_manager.h.orig 2017-01-26 00:49:15 UTC +--- media/audio/audio_manager.h.orig 2017-04-19 19:06:35 UTC +++ media/audio/audio_manager.h -@@ -84,7 +84,7 @@ class MEDIA_EXPORT AudioManager { - // See http://crbug.com/422522 - static void EnableCrashKeyLoggingForAudioThreadHangs(); +@@ -81,7 +81,7 @@ class MEDIA_EXPORT AudioManager { + static void StartHangMonitorIfNeeded( + scoped_refptr<base::SingleThreadTaskRunner> task_runner); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) diff --git a/www/chromium/files/patch-media_base_BUILD.gn b/www/chromium/files/patch-media_base_BUILD.gn index dc04ed7..2c8aea8 100644 --- a/www/chromium/files/patch-media_base_BUILD.gn +++ b/www/chromium/files/patch-media_base_BUILD.gn @@ -1,6 +1,6 @@ ---- media/base/BUILD.gn.orig 2017-03-09 20:04:34 UTC +--- media/base/BUILD.gn.orig 2017-04-19 19:06:35 UTC +++ media/base/BUILD.gn -@@ -311,7 +311,7 @@ target(link_target_type, "base") { +@@ -305,7 +305,7 @@ target(link_target_type, "base") { allow_circular_includes_from += [ "//media/base/android" ] } @@ -9,8 +9,8 @@ configs += [ "//build/config/linux:x11", "//build/config/linux:xext", -@@ -347,7 +347,7 @@ target(link_target_type, "base") { - deps += [ ":media_yasm" ] +@@ -331,7 +331,7 @@ target(link_target_type, "base") { + defines += [ "DISABLE_USER_INPUT_MONITOR" ] } - if (is_linux || is_win) { diff --git a/www/chromium/files/patch-media_base_audio__latency.cc b/www/chromium/files/patch-media_base_audio__latency.cc index f1fb5aa..08780cd 100644 --- a/www/chromium/files/patch-media_base_audio__latency.cc +++ b/www/chromium/files/patch-media_base_audio__latency.cc @@ -1,4 +1,4 @@ ---- media/base/audio_latency.cc.orig 2017-02-02 02:02:55 UTC +--- media/base/audio_latency.cc.orig 2017-04-19 19:06:35 UTC +++ media/base/audio_latency.cc @@ -83,7 +83,7 @@ int AudioLatency::GetRtcBufferSize(int s return frames_per_buffer; diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 59ba49a..29406d9 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2017-03-09 20:04:34 UTC +--- media/base/video_frame.cc.orig 2017-04-19 19:06:35 UTC +++ media/base/video_frame.cc @@ -53,7 +53,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 47057ec..3f650d9 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2017-02-02 02:02:55 UTC +--- media/base/video_frame.h.orig 2017-04-19 19:06:35 UTC +++ media/base/video_frame.h @@ -62,7 +62,7 @@ class MEDIA_EXPORT VideoFrame : public b STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. @@ -27,7 +27,7 @@ // Returns backing DmaBuf file descriptor for given |plane|, if present, or // -1 if not. // TODO(mcasas): Rename to DmabufFd() to comply with Style Guide. -@@ -519,7 +519,7 @@ class MEDIA_EXPORT VideoFrame : public b +@@ -528,7 +528,7 @@ class MEDIA_EXPORT VideoFrame : public b base::SharedMemoryHandle shared_memory_handle_; size_t shared_memory_offset_; diff --git a/www/chromium/files/patch-media_capture_BUILD.gn b/www/chromium/files/patch-media_capture_BUILD.gn index 9717506..c48066b 100644 --- a/www/chromium/files/patch-media_capture_BUILD.gn +++ b/www/chromium/files/patch-media_capture_BUILD.gn @@ -1,6 +1,6 @@ ---- media/capture/BUILD.gn.orig 2017-03-09 20:04:34 UTC +--- media/capture/BUILD.gn.orig 2017-04-19 19:06:35 UTC +++ media/capture/BUILD.gn -@@ -135,6 +135,16 @@ component("capture") { +@@ -153,6 +153,16 @@ component("capture_lib") { ] } @@ -15,5 +15,5 @@ + } + if (is_win) { - deps += [ - "//media/base", # For media_switches. + deps += [ "//media/base/win" ] + libs = [ diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 2e488ad..182a4ca 100644 --- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,11 +1,11 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2017-04-19 19:06:35 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -71,7 +71,7 @@ void FakeVideoCaptureDeviceFactory::GetD - for (int n = 0; n < number_of_devices_; ++n) { - device_descriptors->emplace_back(base::StringPrintf("fake_device_%d", n), - base::StringPrintf("/dev/video%d", n), +@@ -192,7 +192,7 @@ void FakeVideoCaptureDeviceFactory::GetD + for (const auto& entry : devices_config_) { + device_descriptors->emplace_back( + base::StringPrintf("fake_device_%d", entry_index), entry.device_id, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE #elif defined(OS_MACOSX) - VideoCaptureApi::MACOSX_AVFOUNDATION + VideoCaptureApi::MACOSX_AVFOUNDATION diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc index f35681f..48e064a 100644 --- a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC +--- media/capture/video/file_video_capture_device_factory.cc.orig 2017-04-19 19:06:35 UTC +++ media/capture/video/file_video_capture_device_factory.cc @@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetD #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 72a0cb3..575db56 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-03-09 20:04:34 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-04-19 19:06:35 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc index f88eb5e..695e2db 100644 --- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc +++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-03-09 20:04:34 UTC +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-04-19 19:06:35 UTC +++ media/capture/video/linux/video_capture_device_linux.cc @@ -21,6 +21,7 @@ diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index 816c199..0bd1db3 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2017-03-09 20:04:34 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2017-04-19 19:06:35 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -220,7 +220,7 @@ void VideoCaptureDeviceClient::OnIncomin +@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomin // 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/chromium/files/patch-media_capture_video_video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc index a88d1e0..3e51687 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC +--- media/capture/video/video_capture_device_factory.cc.orig 2017-04-19 19:06:35 UTC +++ media/capture/video/video_capture_device_factory.cc @@ -18,6 +18,10 @@ namespace media { std::unique_ptr<VideoCaptureDeviceFactory> @@ -11,7 +11,7 @@ const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); // Use a Fake or File Video Device Factory if the command line flags are -@@ -36,6 +40,7 @@ VideoCaptureDeviceFactory::CreateFactory +@@ -42,6 +46,7 @@ VideoCaptureDeviceFactory::CreateFactory return std::unique_ptr<VideoCaptureDeviceFactory>( CreateVideoCaptureDeviceFactory(ui_task_runner)); } @@ -19,7 +19,7 @@ } VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { -@@ -55,7 +60,7 @@ void VideoCaptureDeviceFactory::Enumerat +@@ -61,7 +66,7 @@ void VideoCaptureDeviceFactory::Enumerat callback.Run(std::move(device_descriptors)); } diff --git a/www/chromium/files/patch-media_cast_BUILD.gn b/www/chromium/files/patch-media_cast_BUILD.gn index 383281c..3288140 100644 --- a/www/chromium/files/patch-media_cast_BUILD.gn +++ b/www/chromium/files/patch-media_cast_BUILD.gn @@ -1,4 +1,4 @@ ---- media/cast/BUILD.gn.orig 2017-03-09 20:04:34 UTC +--- media/cast/BUILD.gn.orig 2017-04-19 19:06:35 UTC +++ media/cast/BUILD.gn @@ -358,7 +358,7 @@ test("cast_unittests") { } diff --git a/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni b/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni index fd36cc0..f99a58f 100644 --- a/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni +++ b/www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni @@ -1,4 +1,4 @@ ---- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig 2017-01-26 00:49:15 UTC +--- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig 2017-04-19 19:06:35 UTC +++ media/cdm/ppapi/ppapi_cdm_adapter.gni @@ -5,7 +5,7 @@ # This template defines a CDM adapter target. Just use this as you would a diff --git a/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h b/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h index d437727..b1f46be 100644 --- a/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h +++ b/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h @@ -1,4 +1,4 @@ ---- media/ffmpeg/ffmpeg_common.h.orig 2017-01-26 00:49:15 UTC +--- media/ffmpeg/ffmpeg_common.h.orig 2017-04-19 19:06:35 UTC +++ media/ffmpeg/ffmpeg_common.h @@ -25,7 +25,7 @@ extern "C" { // Disable deprecated features which result in spammy compile warnings. This diff --git a/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc b/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc index d015745..0080af1 100644 --- a/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc +++ b/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc @@ -1,6 +1,6 @@ ---- media/filters/ffmpeg_demuxer.cc.orig 2017-03-09 20:04:34 UTC +--- media/filters/ffmpeg_demuxer.cc.orig 2017-04-19 19:06:35 UTC +++ media/filters/ffmpeg_demuxer.cc -@@ -1195,24 +1195,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone +@@ -1221,24 +1221,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone // If no estimate is found, the stream entry will be kInfiniteDuration. std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, kInfiniteDuration); diff --git a/www/chromium/files/patch-media_filters_vp9__parser.h b/www/chromium/files/patch-media_filters_vp9__parser.h index a8f4ef0..8cb60f9 100644 --- a/www/chromium/files/patch-media_filters_vp9__parser.h +++ b/www/chromium/files/patch-media_filters_vp9__parser.h @@ -1,4 +1,4 @@ ---- media/filters/vp9_parser.h.orig 2017-01-26 00:49:15 UTC +--- media/filters/vp9_parser.h.orig 2017-04-19 19:06:35 UTC +++ media/filters/vp9_parser.h @@ -14,6 +14,7 @@ diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc index 67b3c9a..2e1dd66 100644 --- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc +++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc @@ -1,4 +1,4 @@ ---- media/formats/common/offset_byte_queue.cc.orig 2017-01-26 00:49:15 UTC +--- media/formats/common/offset_byte_queue.cc.orig 2017-04-19 19:06:35 UTC +++ media/formats/common/offset_byte_queue.cc @@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off *size = tail() - offset; diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h index 2a5b914..807a086 100644 --- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h +++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h @@ -1,4 +1,4 @@ ---- media/formats/common/offset_byte_queue.h.orig 2017-01-26 00:49:15 UTC +--- media/formats/common/offset_byte_queue.h.orig 2017-04-19 19:06:35 UTC +++ 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/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc index a783be4..965a64b 100644 --- a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc +++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc @@ -1,4 +1,4 @@ ---- media/formats/mp2t/es_parser_adts.cc.orig 2017-03-09 20:04:34 UTC +--- media/formats/mp2t/es_parser_adts.cc.orig 2017-04-19 19:06:35 UTC +++ media/formats/mp2t/es_parser_adts.cc @@ -60,11 +60,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts const uint8_t* es; diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc index 47f192d..8353d94 100644 --- a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc +++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc @@ -1,4 +1,4 @@ ---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2017-01-26 00:49:15 UTC +--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2017-04-19 19:06:35 UTC +++ media/formats/mp2t/es_parser_mpeg1audio.cc @@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud const uint8_t* es; diff --git a/www/chromium/files/patch-mojo_BUILD.gn b/www/chromium/files/patch-mojo_BUILD.gn index 3c361a9..c89989f 100644 --- a/www/chromium/files/patch-mojo_BUILD.gn +++ b/www/chromium/files/patch-mojo_BUILD.gn @@ -1,4 +1,4 @@ ---- mojo/BUILD.gn.orig 2017-01-26 00:49:15 UTC +--- mojo/BUILD.gn.orig 2017-04-19 19:06:35 UTC +++ mojo/BUILD.gn @@ -12,7 +12,7 @@ group("mojo") { "//mojo/common", diff --git a/www/chromium/files/patch-mojo_edk_test_BUILD.gn b/www/chromium/files/patch-mojo_edk_test_BUILD.gn index bf2a989..19e36a5 100644 --- a/www/chromium/files/patch-mojo_edk_test_BUILD.gn +++ b/www/chromium/files/patch-mojo_edk_test_BUILD.gn @@ -1,4 +1,4 @@ ---- mojo/edk/test/BUILD.gn.orig 2017-03-09 20:04:34 UTC +--- mojo/edk/test/BUILD.gn.orig 2017-04-19 19:06:35 UTC +++ mojo/edk/test/BUILD.gn @@ -46,7 +46,7 @@ source_set("run_all_unittests") { "//testing/gtest", diff --git a/www/chromium/files/patch-native__client__sdk_src_BUILD.gn b/www/chromium/files/patch-native__client__sdk_src_BUILD.gn index 9a7521b..6983b7f 100644 --- a/www/chromium/files/patch-native__client__sdk_src_BUILD.gn +++ b/www/chromium/files/patch-native__client__sdk_src_BUILD.gn @@ -1,4 +1,4 @@ ---- native_client_sdk/src/BUILD.gn.orig 2017-01-26 00:49:16 UTC +--- native_client_sdk/src/BUILD.gn.orig 2017-04-19 19:06:36 UTC +++ native_client_sdk/src/BUILD.gn @@ -7,7 +7,7 @@ import("//build/config/features.gni") declare_args() { diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 1550b8a..15c93a3 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2017-03-09 20:04:35 UTC +--- net/BUILD.gn.orig 2017-04-19 19:06:36 UTC +++ net/BUILD.gn -@@ -82,7 +82,7 @@ if (use_glib && use_gconf && !is_chromeo +@@ -79,7 +79,7 @@ if (use_glib && use_gconf && !is_chromeo net_configs += [ "//build/config/linux/gconf" ] } @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -281,6 +281,16 @@ component("net") { +@@ -1824,6 +1824,16 @@ component("net") { sources -= [ "disk_cache/blockfile/file_posix.cc" ] } @@ -24,9 +24,9 @@ + } + if (is_ios || is_mac) { - sources += gypi_values.net_base_mac_ios_sources - } -@@ -962,7 +972,7 @@ if (!is_ios && !is_android) { + sources += [ + "base/mac/url_conversions.h", +@@ -2773,7 +2783,7 @@ if (!is_ios && !is_android) { } } @@ -35,7 +35,7 @@ executable("cachetool") { testonly = true sources = [ -@@ -991,7 +1001,7 @@ if (is_linux || is_mac) { +@@ -2802,7 +2812,7 @@ if (is_linux || is_mac) { } } @@ -44,7 +44,7 @@ static_library("epoll_server") { sources = [ "tools/epoll_server/epoll_server.cc", -@@ -1095,7 +1105,7 @@ if (is_android) { +@@ -2906,7 +2916,7 @@ if (is_android) { } } @@ -53,7 +53,7 @@ executable("disk_cache_memory_test") { testonly = true sources = [ -@@ -1276,7 +1286,7 @@ test("net_unittests") { +@@ -4767,7 +4777,7 @@ test("net_unittests") { "third_party/nist-pkits/", ] @@ -62,25 +62,23 @@ deps += [ "//third_party/pyftpdlib/", "//third_party/pywebsocket/", -@@ -1299,7 +1309,7 @@ test("net_unittests") { +@@ -4790,7 +4800,7 @@ test("net_unittests") { if (is_desktop_linux) { deps += [ ":epoll_quic_tools" ] } - if (is_linux) { + if (is_linux || is_bsd) { - sources += gypi_values.net_linux_test_sources - deps += [ - ":epoll_quic_tools", -@@ -1319,6 +1329,12 @@ test("net_unittests") { + sources += [ + "tools/quic/chlo_extractor_test.cc", + "tools/quic/end_to_end_test.cc", +@@ -4852,6 +4862,10 @@ test("net_unittests") { sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ] } + if (is_bsd) { -+ sources -= [ -+ "base/address_tracker_linux_unittest.cc", -+ ] ++ sources -= [ "base/address_tracker_linux_unittest.cc" ] + } + - if (v8_use_external_startup_data) { + if (!is_proto_quic && v8_use_external_startup_data) { deps += [ "//gin" ] } diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h index 40de388..71a5be5 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.h +++ b/www/chromium/files/patch-net_base_address__tracker__linux.h @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux.h.orig 2017-01-26 00:49:16 UTC +--- net/base/address_tracker_linux.h.orig 2017-04-19 19:06:36 UTC +++ net/base/address_tracker_linux.h @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ diff --git a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc index bd31441..fe4b502 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux_unittest.cc.orig 2017-01-26 00:49:16 UTC +--- net/base/address_tracker_linux_unittest.cc.orig 2017-04-19 19:06:36 UTC +++ net/base/address_tracker_linux_unittest.cc @@ -4,7 +4,11 @@ diff --git a/www/chromium/files/patch-net_base_mime__util__unittest.cc b/www/chromium/files/patch-net_base_mime__util__unittest.cc index 0bb7e31..83c743b 100644 --- a/www/chromium/files/patch-net_base_mime__util__unittest.cc +++ b/www/chromium/files/patch-net_base_mime__util__unittest.cc @@ -1,11 +1,11 @@ ---- net/base/mime_util_unittest.cc.orig 2017-01-26 00:49:16 UTC +--- net/base/mime_util_unittest.cc.orig 2017-04-19 19:06:36 UTC +++ net/base/mime_util_unittest.cc -@@ -243,7 +243,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM - { "MeSsAge/*", 1, "eml" }, - { "image/bmp", 1, "bmp" }, - { "video/*", 6, "mp4" }, +@@ -250,7 +250,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM + {"message/", 0, NULL, true}, + {"image/bmp", 1, "bmp"}, + {"video/*", 6, "mp4"}, -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS) +#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS) - { "video/*", 6, "mpg" }, + {"video/*", 6, "mpg"}, #else - { "video/*", 6, "mpeg" }, + {"video/*", 6, "mpeg"}, diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index 1865da7..9f6c055 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2017-02-02 02:02:56 UTC +--- net/base/network_change_notifier.cc.orig 2017-04-19 19:06:36 UTC +++ net/base/network_change_notifier.cc @@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNoti #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-net_base_network__interfaces__posix.cc b/www/chromium/files/patch-net_base_network__interfaces__posix.cc index 7a0d0f1..9687f1b8 100644 --- a/www/chromium/files/patch-net_base_network__interfaces__posix.cc +++ b/www/chromium/files/patch-net_base_network__interfaces__posix.cc @@ -1,4 +1,4 @@ ---- net/base/network_interfaces_posix.cc.orig 2017-02-02 02:02:56 UTC +--- net/base/network_interfaces_posix.cc.orig 2017-04-19 19:06:36 UTC +++ net/base/network_interfaces_posix.cc @@ -9,7 +9,7 @@ #include <memory> diff --git a/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h index 55eb34b..03ee840 100644 --- a/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h +++ b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h @@ -1,4 +1,4 @@ ---- net/disk_cache/blockfile/disk_format.h.orig 2017-02-02 02:02:56 UTC +--- net/disk_cache/blockfile/disk_format.h.orig 2017-04-19 19:06:36 UTC +++ net/disk_cache/blockfile/disk_format.h @@ -149,7 +149,9 @@ struct RankingsNode { }; diff --git a/www/chromium/files/patch-net_dns_address__sorter__posix.cc b/www/chromium/files/patch-net_dns_address__sorter__posix.cc index cb1b3be..6e408eb 100644 --- a/www/chromium/files/patch-net_dns_address__sorter__posix.cc +++ b/www/chromium/files/patch-net_dns_address__sorter__posix.cc @@ -1,4 +1,4 @@ ---- net/dns/address_sorter_posix.cc.orig 2017-01-26 00:49:16 UTC +--- net/dns/address_sorter_posix.cc.orig 2017-04-19 19:06:36 UTC +++ net/dns/address_sorter_posix.cc @@ -13,6 +13,7 @@ #include <sys/socket.h> // Must be included before ifaddrs.h. diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc index 38e160e..55f5114 100644 --- a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc +++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_config_service_posix_unittest.cc.orig 2017-01-26 00:49:16 UTC +--- net/dns/dns_config_service_posix_unittest.cc.orig 2017-04-19 19:06:36 UTC +++ 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/chromium/files/patch-net_dns_dns__reloader.cc b/www/chromium/files/patch-net_dns_dns__reloader.cc index 6e4be98..8ca6af2 100644 --- a/www/chromium/files/patch-net_dns_dns__reloader.cc +++ b/www/chromium/files/patch-net_dns_dns__reloader.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_reloader.cc.orig 2017-01-26 00:49:16 UTC +--- net/dns/dns_reloader.cc.orig 2017-04-19 19:06:36 UTC +++ net/dns/dns_reloader.cc @@ -7,6 +7,10 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index f6d5432..cc263cb 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_util.cc.orig 2017-02-02 02:02:56 UTC +--- net/dns/dns_util.cc.orig 2017-04-19 19:06:36 UTC +++ net/dns/dns_util.cc @@ -15,6 +15,8 @@ #include "build/build_config.h" diff --git a/www/chromium/files/patch-net_dns_host__resolver__proc.cc b/www/chromium/files/patch-net_dns_host__resolver__proc.cc index 1551634..25a3824 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc @@ -1,4 +1,4 @@ ---- net/dns/host_resolver_proc.cc.orig 2017-02-02 02:02:56 UTC +--- net/dns/host_resolver_proc.cc.orig 2017-04-19 19:06:36 UTC +++ net/dns/host_resolver_proc.cc @@ -194,7 +194,7 @@ int SystemHostResolverCall(const std::st hints.ai_socktype = SOCK_STREAM; diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc index 649307c..09bb69f 100644 --- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,4 +1,4 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2017-03-09 20:04:35 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2017-04-19 19:06:36 UTC +++ net/http/http_auth_gssapi_posix.cc @@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary: static const char* const kDefaultLibraryNames[] = { diff --git a/www/chromium/files/patch-net_http_http__network__session.cc b/www/chromium/files/patch-net_http_http__network__session.cc index cdefb6d..c915a54 100644 --- a/www/chromium/files/patch-net_http_http__network__session.cc +++ b/www/chromium/files/patch-net_http_http__network__session.cc @@ -1,6 +1,6 @@ ---- net/http/http_network_session.cc.orig 2017-03-09 20:04:35 UTC +--- net/http/http_network_session.cc.orig 2017-04-19 19:06:36 UTC +++ net/http/http_network_session.cc -@@ -20,7 +20,9 @@ +@@ -23,7 +23,9 @@ #include "base/trace_event/process_memory_dump.h" #include "base/values.h" #include "net/base/network_throttle_manager_impl.h" diff --git a/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc index 5c8b5fc..1e75635 100644 --- a/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc +++ b/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2017-01-26 00:49:16 UTC +--- net/proxy/proxy_config_service_linux.cc.orig 2017-04-19 19:06:36 UTC +++ net/proxy/proxy_config_service_linux.cc @@ -11,7 +11,14 @@ #include <limits.h> @@ -20,10 +20,10 @@ explicit SettingGetterImplKDE(base::Environment* env_var_getter) : inotify_fd_(-1), + config_fd_(-1), + inotify_watcher_(FROM_HERE), notify_delegate_(nullptr), debounce_timer_(new base::OneShotTimer()), - indirect_manual_(false), -@@ -937,9 +945,10 @@ class SettingGetterImplKDE : public Prox +@@ -938,9 +946,10 @@ class SettingGetterImplKDE : public Prox // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor // anyway. (Not that it really matters; the process is exiting.) @@ -35,7 +35,7 @@ } bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner, -@@ -948,9 +957,17 @@ class SettingGetterImplKDE : public Prox +@@ -949,9 +958,17 @@ class SettingGetterImplKDE : public Prox // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK_LT(inotify_fd_, 0); @@ -53,7 +53,7 @@ return false; } if (!base::SetNonBlocking(inotify_fd_)) { -@@ -974,22 +991,40 @@ class SettingGetterImplKDE : public Prox +@@ -975,22 +992,40 @@ class SettingGetterImplKDE : public Prox close(inotify_fd_); inotify_fd_ = -1; } @@ -94,7 +94,7 @@ notify_delegate_ = delegate; if (!base::MessageLoopForIO::current()->WatchFileDescriptor( inotify_fd_, true, base::MessageLoopForIO::WATCH_READ, -@@ -1010,7 +1045,19 @@ class SettingGetterImplKDE : public Prox +@@ -1011,7 +1046,19 @@ class SettingGetterImplKDE : public Prox void OnFileCanReadWithoutBlocking(int fd) override { DCHECK_EQ(fd, inotify_fd_); DCHECK(file_task_runner_->BelongsToCurrentThread()); @@ -114,7 +114,7 @@ } void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); } -@@ -1283,8 +1330,11 @@ class SettingGetterImplKDE : public Prox +@@ -1284,8 +1331,11 @@ class SettingGetterImplKDE : public Prox void OnChangeNotification() { DCHECK_GE(inotify_fd_, 0); DCHECK(file_task_runner_->BelongsToCurrentThread()); @@ -127,7 +127,7 @@ ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have -@@ -1321,6 +1371,7 @@ class SettingGetterImplKDE : public Prox +@@ -1322,6 +1372,7 @@ class SettingGetterImplKDE : public Prox inotify_fd_ = -1; } } @@ -135,7 +135,7 @@ if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -1336,6 +1387,7 @@ class SettingGetterImplKDE : public Prox +@@ -1337,6 +1388,7 @@ class SettingGetterImplKDE : public Prox std::vector<std::string> > strings_map_type; int inotify_fd_; diff --git a/www/chromium/files/patch-net_proxy_proxy__service.cc b/www/chromium/files/patch-net_proxy_proxy__service.cc index c3fb1bd..759c79e 100644 --- a/www/chromium/files/patch-net_proxy_proxy__service.cc +++ b/www/chromium/files/patch-net_proxy_proxy__service.cc @@ -1,4 +1,4 @@ ---- net/proxy/proxy_service.cc.orig 2017-01-26 00:49:16 UTC +--- net/proxy/proxy_service.cc.orig 2017-04-19 19:06:36 UTC +++ net/proxy/proxy_service.cc @@ -49,7 +49,7 @@ #elif defined(OS_MACOSX) diff --git a/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc b/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc index cf4cdf0..9b12538 100644 --- a/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc +++ b/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc @@ -1,4 +1,4 @@ ---- net/quic/platform/impl/quic_ip_address_impl.cc.orig 2017-03-09 20:04:35 UTC +--- net/quic/platform/impl/quic_ip_address_impl.cc.orig 2017-04-19 19:06:36 UTC +++ net/quic/platform/impl/quic_ip_address_impl.cc @@ -12,6 +12,7 @@ #include <ws2bth.h> diff --git a/www/chromium/files/patch-net_socket_socks5__client__socket.cc b/www/chromium/files/patch-net_socket_socks5__client__socket.cc index 741dabf..10a9e52 100644 --- a/www/chromium/files/patch-net_socket_socks5__client__socket.cc +++ b/www/chromium/files/patch-net_socket_socks5__client__socket.cc @@ -1,4 +1,4 @@ ---- net/socket/socks5_client_socket.cc.orig 2017-01-26 00:49:16 UTC +--- net/socket/socks5_client_socket.cc.orig 2017-04-19 19:06:36 UTC +++ net/socket/socks5_client_socket.cc @@ -4,6 +4,10 @@ diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index 0cb815c..2303db9 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,4 +1,4 @@ ---- net/socket/udp_socket_posix.cc.orig 2017-03-09 20:04:35 UTC +--- net/socket/udp_socket_posix.cc.orig 2017-04-19 19:06:36 UTC +++ net/socket/udp_socket_posix.cc @@ -59,7 +59,7 @@ const int kBindRetries = 10; const int kPortStart = 1024; @@ -9,7 +9,7 @@ // Returns IPv4 address in network order. int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) { -@@ -763,7 +763,7 @@ int UDPSocketPosix::SetMulticastOptions( +@@ -765,7 +765,7 @@ int UDPSocketPosix::SetMulticastOptions( if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { @@ -18,7 +18,7 @@ ip_mreqn mreq; mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); -@@ -838,7 +838,7 @@ int UDPSocketPosix::JoinGroup(const IPAd +@@ -840,7 +840,7 @@ int UDPSocketPosix::JoinGroup(const IPAd if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc index fb1f446..b2238dc 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc @@ -1,6 +1,6 @@ ---- net/tools/cert_verify_tool/verify_using_path_builder.cc.orig 2017-03-09 20:04:35 UTC +--- net/tools/cert_verify_tool/verify_using_path_builder.cc.orig 2017-04-19 19:06:36 UTC +++ net/tools/cert_verify_tool/verify_using_path_builder.cc -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #include "net/cert/internal/trust_store_nss.h" #endif @@ -9,7 +9,7 @@ #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #endif -@@ -179,7 +179,7 @@ void SetUpOnNetworkThread(std::unique_pt +@@ -185,7 +185,7 @@ void SetUpOnNetworkThread(std::unique_pt // (similar to VERIFY_CERT_IO_ENABLED flag for CertVerifyProc). net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); diff --git a/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc b/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc index 853d3d7..0547576 100644 --- a/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc +++ b/www/chromium/files/patch-net_tools_get__server__time_get__server__time.cc @@ -1,4 +1,4 @@ ---- net/tools/get_server_time/get_server_time.cc.orig 2017-01-26 00:49:16 UTC +--- net/tools/get_server_time/get_server_time.cc.orig 2017-04-19 19:06:36 UTC +++ net/tools/get_server_time/get_server_time.cc @@ -46,7 +46,7 @@ diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index bd67df1..b4bdf07 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,4 +1,4 @@ ---- net/url_request/url_request_context_builder.cc.orig 2017-01-26 00:49:16 UTC +--- net/url_request/url_request_context_builder.cc.orig 2017-04-19 19:06:36 UTC +++ net/url_request/url_request_context_builder.cc @@ -327,7 +327,7 @@ std::unique_ptr<URLRequestContext> URLRe if (!proxy_service_) { diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index cb8b4af..e2376db 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,4 +1,4 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2017-03-09 20:04:35 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2017-04-19 19:06:36 UTC +++ pdf/pdfium/pdfium_engine.cc @@ -129,7 +129,7 @@ std::vector<uint32_t> GetPageNumbersFrom return page_numbers; @@ -45,7 +45,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -2936,7 +2936,7 @@ bool PDFiumEngine::ContinuePaint(int pro +@@ -2950,7 +2950,7 @@ bool PDFiumEngine::ContinuePaint(int pro DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size()); DCHECK(image_data); @@ -54,7 +54,7 @@ g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -3394,7 +3394,7 @@ void PDFiumEngine::SetCurrentPage(int in +@@ -3408,7 +3408,7 @@ void PDFiumEngine::SetCurrentPage(int in FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc index e2c90bb..3ef9398 100644 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,4 +1,4 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2017-01-26 00:49:16 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2017-04-19 19:06:36 UTC +++ ppapi/proxy/file_io_resource.cc @@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of diff --git a/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc b/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc index fc5d068..ba76213 100644 --- a/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc +++ b/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc @@ -1,4 +1,4 @@ ---- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2017-01-26 00:49:16 UTC +--- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2017-04-19 19:06:36 UTC +++ ppapi/shared_impl/private/net_address_private_impl.cc @@ -26,9 +26,12 @@ #include <arpa/inet.h> diff --git a/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn b/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn index 8718839..78bd36d 100644 --- a/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn +++ b/www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn @@ -1,4 +1,4 @@ ---- ppapi/tests/extensions/BUILD.gn.orig 2017-01-26 00:49:16 UTC +--- ppapi/tests/extensions/BUILD.gn.orig 2017-04-19 19:06:36 UTC +++ ppapi/tests/extensions/BUILD.gn @@ -20,7 +20,7 @@ group("extensions") { ":ppapi_tests_extensions_popup($newlib)", diff --git a/www/chromium/files/patch-printing_BUILD.gn b/www/chromium/files/patch-printing_BUILD.gn index 65262b2..a9c4ad7 100644 --- a/www/chromium/files/patch-printing_BUILD.gn +++ b/www/chromium/files/patch-printing_BUILD.gn @@ -1,6 +1,6 @@ ---- printing/BUILD.gn.orig 2017-03-09 20:04:35 UTC +--- printing/BUILD.gn.orig 2017-04-19 19:06:36 UTC +++ printing/BUILD.gn -@@ -137,7 +137,7 @@ component("printing") { +@@ -138,7 +138,7 @@ component("printing") { if (use_cups) { configs += [ ":cups" ] @@ -9,7 +9,7 @@ # rebase_path does not accept an empty string if (use_sysroot) { cups_sysroot = rebase_path(sysroot) -@@ -214,7 +214,7 @@ component("printing") { +@@ -215,7 +215,7 @@ component("printing") { "printing_context_no_system_dialog.cc", "printing_context_no_system_dialog.h", ] diff --git a/www/chromium/files/patch-printing_cups__config__helper.py b/www/chromium/files/patch-printing_cups__config__helper.py index 1fc731b..8b2dbc9 100644 --- a/www/chromium/files/patch-printing_cups__config__helper.py +++ b/www/chromium/files/patch-printing_cups__config__helper.py @@ -1,4 +1,4 @@ ---- printing/cups_config_helper.py.orig 2017-01-26 00:49:17 UTC +--- printing/cups_config_helper.py.orig 2017-04-19 19:06:36 UTC +++ printing/cups_config_helper.py @@ -65,7 +65,7 @@ def main(): mode = sys.argv[1] diff --git a/www/chromium/files/patch-remoting_host_BUILD.gn b/www/chromium/files/patch-remoting_host_BUILD.gn index f0fa0c3..04652d6 100644 --- a/www/chromium/files/patch-remoting_host_BUILD.gn +++ b/www/chromium/files/patch-remoting_host_BUILD.gn @@ -1,6 +1,6 @@ ---- remoting/host/BUILD.gn.orig 2017-03-09 20:04:35 UTC +--- remoting/host/BUILD.gn.orig 2017-04-19 19:06:36 UTC +++ remoting/host/BUILD.gn -@@ -329,7 +329,7 @@ static_library("host") { +@@ -326,7 +326,7 @@ static_library("host") { deps += [ "//components/policy:generated" ] } @@ -9,7 +9,7 @@ libs += [ "pam" ] } -@@ -348,7 +348,7 @@ static_library("host") { +@@ -345,7 +345,7 @@ static_library("host") { "input_injector_x11.cc", "local_input_monitor_x11.cc", ] @@ -18,7 +18,7 @@ # These will already be filtered out on non-Linux. sources -= [ "linux/unicode_to_keysym.cc", -@@ -538,7 +538,7 @@ source_set("unit_tests") { +@@ -531,7 +531,7 @@ source_set("unit_tests") { "touch_injector_win_unittest.cc", ] @@ -27,7 +27,7 @@ sources -= [ "linux/unicode_to_keysym_unittest.cc" ] } if (use_ozone || is_chromeos) { -@@ -750,7 +750,7 @@ if (enable_me2me_host) { +@@ -747,7 +747,7 @@ if (enable_me2me_host) { if (is_desktop_linux) { deps += [ "//build/config/linux/gtk" ] } @@ -36,7 +36,7 @@ libs = [ "pam" ] } -@@ -820,7 +820,7 @@ if (enable_me2me_host) { +@@ -817,7 +817,7 @@ if (enable_me2me_host) { } } } diff --git a/www/chromium/files/patch-sandbox_features.gni b/www/chromium/files/patch-sandbox_features.gni index 6d98e07..37cebdf 100644 --- a/www/chromium/files/patch-sandbox_features.gni +++ b/www/chromium/files/patch-sandbox_features.gni @@ -1,4 +1,4 @@ ---- sandbox/features.gni.orig 2017-03-09 20:04:36 UTC +--- sandbox/features.gni.orig 2017-04-19 19:06:37 UTC +++ sandbox/features.gni @@ -11,6 +11,6 @@ import("//build/config/nacl/config.gni") use_seccomp_bpf = diff --git a/www/chromium/files/patch-sdch_BUILD.gn b/www/chromium/files/patch-sdch_BUILD.gn index 5ac4b47..330821b 100644 --- a/www/chromium/files/patch-sdch_BUILD.gn +++ b/www/chromium/files/patch-sdch_BUILD.gn @@ -1,4 +1,4 @@ ---- sdch/BUILD.gn.orig 2017-01-26 00:49:17 UTC +--- sdch/BUILD.gn.orig 2017-04-19 19:06:37 UTC +++ sdch/BUILD.gn @@ -11,7 +11,7 @@ config("sdch_config") { # from a config and can't be on the target directly. diff --git a/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc b/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc new file mode 100644 index 0000000..3603b47 --- /dev/null +++ b/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc @@ -0,0 +1,21 @@ +--- services/catalog/public/cpp/manifest_parsing_util.cc.orig 2017-04-19 19:06:37 UTC ++++ services/catalog/public/cpp/manifest_parsing_util.cc +@@ -15,7 +15,8 @@ bool IsValidPlatformName(const std::stri + return name == Store::kRequiredFilesKey_PlatformValue_Windows || + name == Store::kRequiredFilesKey_PlatformValue_Linux || + name == Store::kRequiredFilesKey_PlatformValue_MacOSX || +- name == Store::kRequiredFilesKey_PlatformValue_Android; ++ name == Store::kRequiredFilesKey_PlatformValue_Android || ++ name == Store::kRequiredFilesKey_PlatformValue_FreeBSD; + } + + bool IsCurrentPlatform(const std::string& name) { +@@ -27,6 +28,8 @@ bool IsCurrentPlatform(const std::string + return name == Store::kRequiredFilesKey_PlatformValue_MacOSX; + #elif defined(OS_ANDROID) + return name == Store::kRequiredFilesKey_PlatformValue_Android; ++#elif defined(OS_BSD) ++ return name == Store::kRequiredFilesKey_PlatformValue_FreeBSD; + #else + #error This architecture is not supported. + #endif diff --git a/www/chromium/files/patch-services_catalog_store.cc b/www/chromium/files/patch-services_catalog_store.cc new file mode 100644 index 0000000..04f61b3 --- /dev/null +++ b/www/chromium/files/patch-services_catalog_store.cc @@ -0,0 +1,9 @@ +--- services/catalog/store.cc.orig 2017-04-19 19:06:37 UTC ++++ services/catalog/store.cc +@@ -32,4 +32,6 @@ const char Store::kRequiredFilesKey_Plat + const char Store::kRequiredFilesKey_PlatformValue_MacOSX[] = "macosx"; + // static + const char Store::kRequiredFilesKey_PlatformValue_Android[] = "android"; ++// static ++const char Store::kRequiredFilesKey_PlatformValue_FreeBSD[] = "freebsd"; + } // namespace catalog diff --git a/www/chromium/files/patch-services_catalog_store.h b/www/chromium/files/patch-services_catalog_store.h new file mode 100644 index 0000000..4743990 --- /dev/null +++ b/www/chromium/files/patch-services_catalog_store.h @@ -0,0 +1,10 @@ +--- services/catalog/store.h.orig 2017-04-19 19:06:37 UTC ++++ services/catalog/store.h +@@ -33,6 +33,7 @@ class Store { + static const char kRequiredFilesKey_PlatformValue_Linux[]; + static const char kRequiredFilesKey_PlatformValue_MacOSX[]; + static const char kRequiredFilesKey_PlatformValue_Android[]; ++ static const char kRequiredFilesKey_PlatformValue_FreeBSD[]; + }; + + } // namespace catalog diff --git a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc index e96f189..916132d 100644 --- a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc @@ -1,5 +1,5 @@ ---- device/time_zone_monitor/time_zone_monitor.cc.orig 2017-01-26 00:49:14 UTC -+++ device/time_zone_monitor/time_zone_monitor.cc +--- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2017-04-19 19:06:37 UTC ++++ services/device/time_zone_monitor/time_zone_monitor.cc @@ -31,7 +31,7 @@ void TimeZoneMonitor::NotifyClients() { std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault()); #else diff --git a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index 56a67dc..f6e620f 100644 --- a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,16 +1,16 @@ ---- device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2017-01-26 00:49:14 UTC -+++ device/time_zone_monitor/time_zone_monitor_linux.cc +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2017-04-19 19:06:37 UTC ++++ services/device/time_zone_monitor/time_zone_monitor_linux.cc @@ -59,6 +59,9 @@ class TimeZoneMonitorLinuxImpl main_task_runner_(base::ThreadTaskRunnerHandle::Get()), file_task_runner_(file_task_runner), owner_(owner) { -+ } ++ } + -+ void StartWatching() { ++ void StartWatching() { DCHECK(main_task_runner_->RunsTasksOnCurrentThread()); file_task_runner_->PostTask( FROM_HERE, -@@ -152,6 +155,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLin +@@ -150,6 +153,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLin // changed. if (!getenv("TZ")) { impl_ = new TimeZoneMonitorLinuxImpl(this, file_task_runner); diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn index 8b93175..fbfb888 100644 --- a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn +++ b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn @@ -1,4 +1,4 @@ ---- services/service_manager/public/cpp/standalone_service/BUILD.gn.orig 2017-03-09 20:04:36 UTC +--- services/service_manager/public/cpp/standalone_service/BUILD.gn.orig 2017-04-19 19:06:37 UTC +++ services/service_manager/public/cpp/standalone_service/BUILD.gn @@ -23,7 +23,7 @@ source_set("standalone_service") { "//services/service_manager/public/interfaces", diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc index f67f58a..19d66e0 100644 --- a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc +++ b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc @@ -1,4 +1,4 @@ ---- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig 2017-03-09 20:04:36 UTC +--- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig 2017-04-19 19:06:37 UTC +++ services/service_manager/public/cpp/standalone_service/standalone_service.cc @@ -70,6 +70,8 @@ void RunStandaloneService(const Standalo *base::CommandLine::ForCurrentProcess(); diff --git a/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn b/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn index 003707d..7048a84 100644 --- a/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn +++ b/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn @@ -1,4 +1,4 @@ ---- services/service_manager/runner/host/BUILD.gn.orig 2017-03-09 20:04:36 UTC +--- services/service_manager/runner/host/BUILD.gn.orig 2017-04-19 19:06:37 UTC +++ services/service_manager/runner/host/BUILD.gn @@ -28,7 +28,7 @@ source_set("lib") { "//mojo/public/cpp/system", diff --git a/www/chromium/files/patch-services_service__manager_standalone_context.cc b/www/chromium/files/patch-services_service__manager_standalone_context.cc index 975ef5e..1c778e3 100644 --- a/www/chromium/files/patch-services_service__manager_standalone_context.cc +++ b/www/chromium/files/patch-services_service__manager_standalone_context.cc @@ -1,6 +1,6 @@ ---- services/service_manager/standalone/context.cc.orig 2017-03-09 20:04:36 UTC +--- services/service_manager/standalone/context.cc.orig 2017-04-19 19:06:37 UTC +++ services/service_manager/standalone/context.cc -@@ -218,7 +218,7 @@ void Context::Init(std::unique_ptr<InitP +@@ -133,7 +133,7 @@ Context::Context( tracing::mojom::StartupPerformanceDataCollectorPtr collector; BindInterface(service_manager(), source_identity, tracing_identity, &collector); diff --git a/www/chromium/files/patch-services_ui_BUILD.gn b/www/chromium/files/patch-services_ui_BUILD.gn index 067d382..144b26e 100644 --- a/www/chromium/files/patch-services_ui_BUILD.gn +++ b/www/chromium/files/patch-services_ui_BUILD.gn @@ -1,6 +1,6 @@ ---- services/ui/BUILD.gn.orig 2017-03-09 20:04:36 UTC +--- services/ui/BUILD.gn.orig 2017-04-19 19:06:37 UTC +++ services/ui/BUILD.gn -@@ -13,7 +13,6 @@ group("all") { +@@ -12,7 +12,6 @@ group("all") { testonly = true deps = [ ":ui", @@ -8,20 +8,11 @@ "//services/ui/test_wm", ] } -@@ -36,7 +35,6 @@ service("ui") { - data_deps = [ - ":copy_gl_libraries", - ":manifest", +@@ -32,7 +31,6 @@ service("ui") { + ":resources_100", + ":resources_200", + ":resources_strings", - "//services/ui/ime/test_ime_driver", ] + } - resources = [ -@@ -67,7 +65,7 @@ copy("copy_gl_libraries") { - "$root_shlib_dir/libGLESv2.dll", - "$root_shlib_dir/osmesa.dll", - ] -- } else if (is_android || is_linux) { -+ } else if (is_android || is_linux || is_bsd) { - sources = [ - "$root_shlib_dir/libosmesa.so", - ] diff --git a/www/chromium/files/patch-services_ui_gpu_gpu__main.cc b/www/chromium/files/patch-services_ui_gpu_gpu__main.cc index f8e0c74..7a3bda5 100644 --- a/www/chromium/files/patch-services_ui_gpu_gpu__main.cc +++ b/www/chromium/files/patch-services_ui_gpu_gpu__main.cc @@ -1,9 +1,9 @@ ---- services/ui/gpu/gpu_main.cc.orig 2017-03-09 20:04:36 UTC +--- services/ui/gpu/gpu_main.cc.orig 2017-04-19 19:06:37 UTC +++ services/ui/gpu/gpu_main.cc -@@ -52,7 +52,7 @@ GpuMain::GpuMain(mojom::GpuMainRequest r - thread_options.message_pump_factory = base::Bind(&CreateMessagePumpX11); - #elif defined(USE_OZONE) - thread_options.message_loop_type = base::MessageLoop::TYPE_UI; +@@ -59,7 +59,7 @@ GpuMain::GpuMain(mojom::GpuMainRequest r + // runtime. + thread_options.message_loop_type = + ui::OzonePlatform::EnsureInstance()->GetMessageLoopTypeForGpu(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) thread_options.message_loop_type = base::MessageLoop::TYPE_DEFAULT; diff --git a/www/chromium/files/patch-services_ui_ime_BUILD.gn b/www/chromium/files/patch-services_ui_ime_BUILD.gn index 2622664..6eb5342 100644 --- a/www/chromium/files/patch-services_ui_ime_BUILD.gn +++ b/www/chromium/files/patch-services_ui_ime_BUILD.gn @@ -1,7 +1,7 @@ ---- services/ui/ime/BUILD.gn.orig 2017-01-26 00:49:17 UTC +--- services/ui/ime/BUILD.gn.orig 2017-04-19 19:06:37 UTC +++ services/ui/ime/BUILD.gn -@@ -50,7 +50,6 @@ test("mus_ime_unittests") { - ":test_manifest", +@@ -51,7 +51,6 @@ service_test("mus_ime_unittests") { + data_deps = [ ":lib", "//services/ui", - "//services/ui/ime/test_ime_driver", diff --git a/www/chromium/files/patch-skia_BUILD.gn b/www/chromium/files/patch-skia_BUILD.gn index d2b4ff4..ff9f856 100644 --- a/www/chromium/files/patch-skia_BUILD.gn +++ b/www/chromium/files/patch-skia_BUILD.gn @@ -1,6 +1,6 @@ ---- skia/BUILD.gn.orig 2017-03-09 20:04:36 UTC +--- skia/BUILD.gn.orig 2017-04-19 19:06:37 UTC +++ skia/BUILD.gn -@@ -124,7 +124,7 @@ config("skia_library_config") { +@@ -127,7 +127,7 @@ config("skia_library_config") { } # Settings for text blitting, chosen to approximate the system browser. @@ -9,25 +9,25 @@ defines += [ "SK_GAMMA_EXPONENT=1.2", "SK_GAMMA_CONTRAST=0.2", -@@ -340,7 +340,7 @@ component("skia") { - sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] +@@ -326,7 +326,7 @@ component("skia") { + set_sources_assignment_filter(sources_assignment_filter) } -- if (!is_linux) { -+ if (!is_linux && !is_bsd) { - sources -= [ +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ "//third_party/skia/src/ports/SkFontConfigInterface.cpp", "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", -@@ -349,7 +349,7 @@ component("skia") { +@@ -335,7 +335,7 @@ component("skia") { ] } -- if (!is_linux && !is_android) { -+ if (!is_linux && !is_bsd && !is_android) { - sources -= [ +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + sources += [ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", -@@ -387,7 +387,7 @@ component("skia") { +@@ -374,7 +374,7 @@ component("skia") { "//base/third_party/dynamic_annotations", ] diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp index a8643be..558b3fc 100644 --- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,4 +1,4 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2017-01-26 00:49:17 UTC +--- skia/ext/SkMemory_new_handler.cpp.orig 2017-04-19 19:06:37 UTC +++ skia/ext/SkMemory_new_handler.cpp @@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t si // TODO(b.kelemen): we should always use UncheckedMalloc but currently it diff --git a/www/chromium/files/patch-storage_browser_quota_quota__settings.cc b/www/chromium/files/patch-storage_browser_quota_quota__settings.cc new file mode 100644 index 0000000..2a67f21 --- /dev/null +++ b/www/chromium/files/patch-storage_browser_quota_quota__settings.cc @@ -0,0 +1,11 @@ +--- storage/browser/quota/quota_settings.cc.orig 2017-04-19 19:06:37 UTC ++++ storage/browser/quota/quota_settings.cc +@@ -53,7 +53,7 @@ base::Optional<storage::QuotaSettings> C + 1000 * kMBytes; + #elif defined(OS_CHROMEOS) + 1000 * kMBytes; +-#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) ++#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + 10000 * kMBytes; + #else + #error "Port: Need to define an OS accomodation value for unknown OS." diff --git a/www/chromium/files/patch-testing_gtest_src_gtest.cc b/www/chromium/files/patch-testing_gtest_src_gtest.cc index 87f05b7..e1797a9 100644 --- a/www/chromium/files/patch-testing_gtest_src_gtest.cc +++ b/www/chromium/files/patch-testing_gtest_src_gtest.cc @@ -1,4 +1,4 @@ ---- testing/gtest/src/gtest.cc.orig 2017-01-26 00:50:07 UTC +--- testing/gtest/src/gtest.cc.orig 2017-04-19 19:07:41 UTC +++ testing/gtest/src/gtest.cc @@ -122,6 +122,10 @@ diff --git a/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp b/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp index a003c86..699c83f 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig 2017-01-26 00:49:27 UTC +--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig 2017-04-19 19:06:49 UTC +++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp -@@ -46,6 +46,8 @@ +@@ -48,6 +48,8 @@ #if OS(WIN) #include <malloc.h> diff --git a/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn b/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn index db60690..0e5be2c 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn +++ b/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/core/layout/BUILD.gn.orig 2017-03-09 20:04:45 UTC +--- third_party/WebKit/Source/core/layout/BUILD.gn.orig 2017-04-19 19:06:49 UTC +++ third_party/WebKit/Source/core/layout/BUILD.gn -@@ -368,7 +368,7 @@ blink_core_sources("layout") { +@@ -381,7 +381,7 @@ blink_core_sources("layout") { sources += [ "LayoutThemeFontProviderDefault.cpp" ] } diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp index dae6dab..df1d188 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/platform/fonts/FontCache.cpp -@@ -62,9 +62,9 @@ using namespace WTF; +@@ -63,9 +63,9 @@ using namespace WTF; namespace blink { diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h index 6ec4e5c..e047af0 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2017-02-02 02:03:10 UTC +--- third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/platform/fonts/FontCache.h -@@ -122,7 +122,7 @@ class PLATFORM_EXPORT FontCache { +@@ -144,7 +144,7 @@ class PLATFORM_EXPORT FontCache { #else static const AtomicString& legacySystemFontFamily(); #endif @@ -9,7 +9,7 @@ static void setSystemFontFamily(const AtomicString&); #endif -@@ -232,7 +232,7 @@ class PLATFORM_EXPORT FontCache { +@@ -258,7 +258,7 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, CString& name); diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp index 170e6ce..0fbcbf6 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2017-03-09 20:04:45 UTC +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp @@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const m_syntheticBold(source.m_syntheticBold), diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h index 417e9df..150dd3c 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2017-03-09 20:04:45 UTC +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h @@ -47,9 +47,9 @@ #include "wtf/text/CString.h" diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp index e3d8c56..75a0926 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp @@ -50,7 +50,7 @@ namespace blink { const float smallCapsFontSizeMultiplier = 0.7f; @@ -9,7 +9,7 @@ // This is the largest VDMX table which we'll try to load and parse. static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -105,7 +105,7 @@ void SimpleFontData::platformInit(bool s +@@ -109,7 +109,7 @@ void SimpleFontData::platformInit(bool s int vdmxAscent = 0, vdmxDescent = 0; bool isVDMXValid = false; @@ -18,12 +18,12 @@ // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). -@@ -149,7 +149,7 @@ void SimpleFontData::platformInit(bool s - ascent = SkScalarRoundToScalar(-metrics.fAscent); - descent = SkScalarRoundToScalar(metrics.fDescent); - } +@@ -157,7 +157,7 @@ void SimpleFontData::platformInit(bool s + visual_overflow_inflation_for_ascent_ = 1; + if (descent < metrics.fDescent) { + visual_overflow_inflation_for_descent_ = 1; -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) - // When subpixel positioning is enabled, if the descent is rounded down, the - // descent part of the glyph may be truncated when displayed in a 'overflow: - // hidden' container. To avoid that, borrow 1 unit from the ascent when + // When subpixel positioning is enabled, if the descent is rounded down, + // the descent part of the glyph may be truncated when displayed in a + // 'overflow: hidden' container. To avoid that, borrow 1 unit from the diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp index 8825937..092388b 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-03-09 20:04:45 UTC +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp @@ -68,7 +68,7 @@ AtomicString toAtomicString(const SkStri return AtomicString::fromUTF8(str.c_str(), str.size()); @@ -9,7 +9,7 @@ // Android special locale for retrieving the color emoji font // based on the proposed changes in UTR #51 for introducing // an Emoji script code: -@@ -235,7 +235,7 @@ sk_sp<SkTypeface> FontCache::createTypef +@@ -240,7 +240,7 @@ sk_sp<SkTypeface> FontCache::createTypef } #endif diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp index 12b29d2..7167424 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/platform/heap/GCInfo.cpp @@ -7,6 +7,8 @@ #include "platform/heap/Handle.h" diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp index e13608c..cbc8f06 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-03-09 20:04:45 UTC +--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp @@ -7,6 +7,8 @@ #include "public/platform/Platform.h" diff --git a/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp b/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp index d659e3f..00de0c3 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp @@ -1,6 +1,6 @@ ---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2017-03-09 20:04:46 UTC +--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/web/PopupMenuImpl.cpp -@@ -155,7 +155,7 @@ class PopupMenuImpl::ItemIterationContex +@@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex m_isInGroup(false), m_buffer(buffer) { DCHECK(m_buffer); diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp index 77294b3..f586514 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/wtf/Assertions.cpp @@ -60,7 +60,7 @@ #include <windows.h> @@ -9,16 +9,7 @@ #include <cxxabi.h> #include <dlfcn.h> #include <execinfo.h> -@@ -164,7 +164,7 @@ void WTFReportAssertionFailure(const cha - } - - void WTFGetBacktrace(void** stack, int* size) { --#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(MACOSX) || ((OS(LINUX) || OS(BSD)) && !defined(__UCLIBC__)) - *size = backtrace(stack, *size); - #elif OS(WIN) - // The CaptureStackBackTrace function is available in XP, but it is not -@@ -215,7 +215,7 @@ class FrameToNameScope { +@@ -142,7 +142,7 @@ class FrameToNameScope { }; FrameToNameScope::FrameToNameScope(void* addr) : m_name(0), m_cxaDemangled(0) { diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h index c2c0ac4..0d6be91 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/Atomics.h.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/wtf/Atomics.h.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/wtf/Atomics.h @@ -176,7 +176,7 @@ ALWAYS_INLINE void atomicSetOneToZero(in #if defined(THREAD_SANITIZER) diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn b/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn index 3313be6..3f1cf64 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/BUILD.gn.orig 2017-03-09 20:04:46 UTC +--- third_party/WebKit/Source/wtf/BUILD.gn.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/wtf/BUILD.gn @@ -280,6 +280,10 @@ component("wtf") { libs = [ "dl" ] diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h index 7095ec7..11317a1 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/wtf/ByteSwap.h @@ -60,15 +60,21 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h index 8214b9ec..63eecc9 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/wtf/ContainerAnnotations.h @@ -10,7 +10,7 @@ diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp index af56209..232a8e9 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/StackUtil.cpp.orig 2017-03-09 20:04:46 UTC +--- third_party/WebKit/Source/wtf/StackUtil.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/wtf/StackUtil.cpp @@ -8,6 +8,10 @@ #include "wtf/Threading.h" diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp index b56cc76..f31ce45 100644 --- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp +++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig 2017-03-09 20:04:46 UTC +--- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig 2017-04-19 19:06:50 UTC +++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp @@ -49,11 +49,15 @@ #include <objc/objc-auto.h> diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index a7f1e05..461ff42a 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/angle/BUILD.gn.orig 2017-03-09 20:05:21 UTC +--- third_party/angle/BUILD.gn.orig 2017-04-19 19:07:43 UTC +++ third_party/angle/BUILD.gn @@ -16,6 +16,12 @@ if (ozone_platform_gbm) { } @@ -13,7 +13,7 @@ angle_git_is_present = exec_script("src/commit_id.py", [ "check", -@@ -343,11 +349,7 @@ static_library("libANGLE") { +@@ -418,11 +424,7 @@ static_library("libANGLE") { if (use_x11) { sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src") deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ] @@ -26,7 +26,7 @@ } if (is_mac) { sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src") -@@ -545,7 +547,7 @@ util_gypi = exec_script("//build/gypi_to +@@ -627,7 +629,7 @@ util_gypi = exec_script("//build/gypi_to config("angle_util_config") { include_dirs = [ "util" ] @@ -35,7 +35,7 @@ libs = [ "X11" ] } } -@@ -572,7 +574,7 @@ foreach(is_shared_library, +@@ -654,7 +656,7 @@ foreach(is_shared_library, sources += rebase_path(util_gypi.util_win32_sources, ".", "util") } diff --git a/www/chromium/files/patch-third__party_angle_gni_angle.gni b/www/chromium/files/patch-third__party_angle_gni_angle.gni index b7b40f3..bcb9b5b 100644 --- a/www/chromium/files/patch-third__party_angle_gni_angle.gni +++ b/www/chromium/files/patch-third__party_angle_gni_angle.gni @@ -1,4 +1,4 @@ ---- third_party/angle/gni/angle.gni.orig 2017-01-26 00:50:09 UTC +--- third_party/angle/gni/angle.gni.orig 2017-04-19 19:07:43 UTC +++ third_party/angle/gni/angle.gni @@ -20,6 +20,8 @@ if (is_win) { import("//build/config/win/visual_studio_version.gni") diff --git a/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn b/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn index dbfa81c..62bde77 100644 --- a/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/angle/src/tests/BUILD.gn.orig 2017-03-09 20:05:21 UTC +--- third_party/angle/src/tests/BUILD.gn.orig 2017-04-19 19:07:43 UTC +++ third_party/angle/src/tests/BUILD.gn @@ -41,7 +41,7 @@ test("angle_unittests") { ] @@ -54,7 +54,7 @@ libs = [ "pci" ] } } -@@ -393,7 +393,7 @@ if (build_angle_deqp_tests) { +@@ -396,7 +396,7 @@ if (build_angle_deqp_tests) { "../../../deqp/src/data/", ] diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn index d1ea1b1..549874c 100644 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.gn +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/boringssl/BUILD.gn.orig 2017-01-26 00:49:29 UTC +--- third_party/boringssl/BUILD.gn.orig 2017-04-19 19:06:51 UTC +++ third_party/boringssl/BUILD.gn @@ -83,7 +83,7 @@ if (is_win && !is_msan) { } else if (current_cpu == "x64") { diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c index 81f4d7f..6717560 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c @@ -1,4 +1,4 @@ ---- third_party/boringssl/src/crypto/ex_data.c.orig 2017-01-26 00:50:08 UTC +--- third_party/boringssl/src/crypto/ex_data.c.orig 2017-04-19 19:07:42 UTC +++ third_party/boringssl/src/crypto/ex_data.c @@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *a } diff --git a/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h b/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h index 7b23a2e..27d8a71 100644 --- a/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h +++ b/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h @@ -1,4 +1,4 @@ ---- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2017-01-26 00:49:29 UTC +--- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2017-04-19 19:06:51 UTC +++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h @@ -334,6 +334,8 @@ class Status { */ diff --git a/www/chromium/files/patch-third__party_expat_BUILD.gn b/www/chromium/files/patch-third__party_expat_BUILD.gn index aba21d5..7dd3c39 100644 --- a/www/chromium/files/patch-third__party_expat_BUILD.gn +++ b/www/chromium/files/patch-third__party_expat_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/expat/BUILD.gn.orig 2017-01-26 00:49:29 UTC +--- third_party/expat/BUILD.gn.orig 2017-04-19 19:06:51 UTC +++ third_party/expat/BUILD.gn @@ -9,7 +9,7 @@ import("//testing/libfuzzer/fuzzer_test. # let's not pull it in twice. diff --git a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn index c8cfac9..ab83a96 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn +++ b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/BUILD.gn.orig 2017-01-26 00:50:10 UTC +--- third_party/ffmpeg/BUILD.gn.orig 2017-04-19 19:07:44 UTC +++ third_party/ffmpeg/BUILD.gn @@ -6,8 +6,13 @@ import("ffmpeg_options.gni") import("ffmpeg_generated.gni") diff --git a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni index bf1c817..18de5c7 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni +++ b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/ffmpeg_generated.gni.orig 2017-03-09 20:05:22 UTC +--- third_party/ffmpeg/ffmpeg_generated.gni.orig 2017-04-19 19:07:44 UTC +++ third_party/ffmpeg/ffmpeg_generated.gni @@ -12,7 +12,7 @@ ffmpeg_c_sources = [] ffmpeg_gas_sources = [] @@ -203,9 +203,9 @@ -if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { +if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ - "libavcodec/aarch64/imdct15_init.c", "libavcodec/aarch64/mpegaudiodsp_init.c", -@@ -530,7 +530,7 @@ if ((is_android && current_cpu == "arm64 + ] +@@ -528,7 +528,7 @@ if ((is_android && current_cpu == "arm64 ] } @@ -214,7 +214,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/h264chroma_init_aarch64.c", "libavcodec/aarch64/h264dsp_init_aarch64.c", -@@ -544,7 +544,7 @@ if ((is_linux && current_cpu == "arm64" +@@ -542,7 +542,7 @@ if ((is_linux && current_cpu == "arm64" ] } @@ -223,7 +223,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/hpeldsp_init_neon.c", "libavcodec/arm/vp8dsp_init_neon.c", -@@ -557,14 +557,14 @@ if (is_linux && current_cpu == "arm" && +@@ -555,14 +555,14 @@ if (is_linux && current_cpu == "arm" && ] } @@ -240,7 +240,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/blockdsp_init_arm.c", "libavcodec/arm/idctdsp_init_arm.c", -@@ -588,13 +588,13 @@ if ((is_linux && current_cpu == "arm" && +@@ -586,13 +586,13 @@ if ((is_linux && current_cpu == "arm" && ] } @@ -256,7 +256,7 @@ ffmpeg_gas_sources += [ "libavcodec/arm/h264cmc_neon.S", "libavcodec/arm/h264dsp_neon.S", -@@ -609,7 +609,7 @@ if (is_win && current_cpu == "x64") { +@@ -607,7 +607,7 @@ if (is_win && current_cpu == "x64") { ] } @@ -265,7 +265,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/blockdsp_init.c", "libavcodec/x86/fdct.c", -@@ -636,7 +636,7 @@ if ((is_linux && current_cpu == "x64" && +@@ -634,7 +634,7 @@ if ((is_linux && current_cpu == "x64" && ] } @@ -274,7 +274,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/blockdsp_init_mips.c", "libavcodec/mips/h263dsp_init_mips.c", -@@ -649,7 +649,7 @@ if (is_linux && current_cpu == "mipsel" +@@ -647,7 +647,7 @@ if (is_linux && current_cpu == "mipsel" ] } diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c index 3342c62..76c8c9f 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c +++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/libavutil/mem.c.orig 2017-01-26 00:50:11 UTC +--- third_party/ffmpeg/libavutil/mem.c.orig 2017-04-19 19:07:44 UTC +++ third_party/ffmpeg/libavutil/mem.c @@ -32,9 +32,6 @@ #include <stdint.h> diff --git a/www/chromium/files/patch-third__party_fontconfig_BUILD.gn b/www/chromium/files/patch-third__party_fontconfig_BUILD.gn index c127a8b..d6be090 100644 --- a/www/chromium/files/patch-third__party_fontconfig_BUILD.gn +++ b/www/chromium/files/patch-third__party_fontconfig_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/fontconfig/BUILD.gn.orig 2017-01-26 00:49:29 UTC +--- third_party/fontconfig/BUILD.gn.orig 2017-04-19 19:06:51 UTC +++ third_party/fontconfig/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be diff --git a/www/chromium/files/patch-third__party_freetype2_BUILD.gn b/www/chromium/files/patch-third__party_freetype2_BUILD.gn deleted file mode 100644 index 2211291..0000000 --- a/www/chromium/files/patch-third__party_freetype2_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/freetype2/BUILD.gn.orig 2017-01-26 00:49:29 UTC -+++ third_party/freetype2/BUILD.gn -@@ -2,7 +2,7 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --assert(is_linux, "This file should only be depended on from Linux.") -+assert(is_linux || is_bsd, "This file should only be depended on from Linux.") - - config("freetype2_config") { - include_dirs = [ diff --git a/www/chromium/files/patch-third__party_glslang_BUILD.gn b/www/chromium/files/patch-third__party_glslang_BUILD.gn index 73ab4cd..dda33f0 100644 --- a/www/chromium/files/patch-third__party_glslang_BUILD.gn +++ b/www/chromium/files/patch-third__party_glslang_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/glslang/BUILD.gn.orig 2017-01-26 00:49:29 UTC +--- third_party/glslang/BUILD.gn.orig 2017-04-19 19:06:51 UTC +++ third_party/glslang/BUILD.gn @@ -8,7 +8,7 @@ config("glslang_config") { include_dirs = [ "src" ] diff --git a/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn b/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn index 0fec9e1..717835d 100644 --- a/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn +++ b/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/harfbuzz-ng/BUILD.gn.orig 2017-03-09 20:04:47 UTC +--- third_party/harfbuzz-ng/BUILD.gn.orig 2017-04-19 19:06:52 UTC +++ third_party/harfbuzz-ng/BUILD.gn @@ -50,7 +50,7 @@ if (use_system_harfbuzz) { @@ -9,7 +9,7 @@ current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) { # These symbols are referenced from libpangoft2, which will be # dynamically linked later. -@@ -194,7 +194,7 @@ if (use_system_harfbuzz) { +@@ -200,7 +200,7 @@ if (use_system_harfbuzz) { # in the tree, all symbols pango needs must be included, or # pango uses mixed versions of harfbuzz and leads to crash. # See crbug.com/462689. diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc index 9e8e609..843dc3f 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,4 +1,4 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2017-01-26 00:49:30 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2017-04-19 19:06:52 UTC +++ third_party/leveldatabase/env_chromium.cc @@ -25,7 +25,11 @@ #include "base/trace_event/trace_event.h" diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h index 9599ac0..4663573 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2017-01-26 00:50:13 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2017-04-19 19:07:47 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h @@ -56,7 +56,7 @@ template <class T> boost::once_flag Sing #include "phonenumbers/base/logging.h" diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h index d42440a..b4af762 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2017-01-26 00:50:13 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2017-04-19 19:07:47 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h @@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLo // Dummy lock implementation on non-POSIX platforms. If you are running on a diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h index 0b203e0..3789aea 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2017-01-26 00:50:13 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2017-04-19 19:07:47 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h @@ -23,6 +23,7 @@ // user of the library know that it can't be used in a thread-safe manner when diff --git a/www/chromium/files/patch-third__party_libusb_BUILD.gn b/www/chromium/files/patch-third__party_libusb_BUILD.gn index 8b301bc..05273d1 100644 --- a/www/chromium/files/patch-third__party_libusb_BUILD.gn +++ b/www/chromium/files/patch-third__party_libusb_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/libusb/BUILD.gn.orig 2017-01-26 00:49:30 UTC +--- third_party/libusb/BUILD.gn.orig 2017-04-19 19:06:52 UTC +++ third_party/libusb/BUILD.gn @@ -6,8 +6,25 @@ assert(!is_android && !is_ios) diff --git a/www/chromium/files/patch-third__party_libxml_BUILD.gn b/www/chromium/files/patch-third__party_libxml_BUILD.gn index 37bb5e9..ca1f087 100644 --- a/www/chromium/files/patch-third__party_libxml_BUILD.gn +++ b/www/chromium/files/patch-third__party_libxml_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/libxml/BUILD.gn.orig 2017-01-26 00:49:30 UTC +--- third_party/libxml/BUILD.gn.orig 2017-04-19 19:06:52 UTC +++ third_party/libxml/BUILD.gn @@ -4,7 +4,7 @@ diff --git a/www/chromium/files/patch-third__party_libxslt_BUILD.gn b/www/chromium/files/patch-third__party_libxslt_BUILD.gn index e59ff9e..d4e07a9 100644 --- a/www/chromium/files/patch-third__party_libxslt_BUILD.gn +++ b/www/chromium/files/patch-third__party_libxslt_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/libxslt/BUILD.gn.orig 2017-01-26 00:49:30 UTC +--- third_party/libxslt/BUILD.gn.orig 2017-04-19 19:06:52 UTC +++ third_party/libxslt/BUILD.gn @@ -82,7 +82,7 @@ static_library("libxslt") { public_configs = [ ":libxslt_config" ] diff --git a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h index 544151d..0882864 100644 --- a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h +++ b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h @@ -1,4 +1,4 @@ ---- third_party/libyuv/include/libyuv/row.h.orig 2017-01-26 00:50:13 UTC +--- third_party/libyuv/include/libyuv/row.h.orig 2017-04-19 19:07:47 UTC +++ third_party/libyuv/include/libyuv/row.h @@ -161,10 +161,14 @@ extern "C" { #define HAS_ARGBSHADEROW_SSE2 diff --git a/www/chromium/files/patch-third__party_mesa_BUILD.gn b/www/chromium/files/patch-third__party_mesa_BUILD.gn index 9ba3b1f..7fd1838 100644 --- a/www/chromium/files/patch-third__party_mesa_BUILD.gn +++ b/www/chromium/files/patch-third__party_mesa_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/mesa/BUILD.gn.orig 2017-01-26 00:49:30 UTC +--- third_party/mesa/BUILD.gn.orig 2017-04-19 19:06:52 UTC +++ third_party/mesa/BUILD.gn @@ -90,6 +90,10 @@ config("mesa_internal_config") { defines += [ "_GNU_SOURCE" ] diff --git a/www/chromium/files/patch-third__party_minigbm_BUILD.gn b/www/chromium/files/patch-third__party_minigbm_BUILD.gn index 3a54124..68ed5d2 100644 --- a/www/chromium/files/patch-third__party_minigbm_BUILD.gn +++ b/www/chromium/files/patch-third__party_minigbm_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/minigbm/BUILD.gn.orig 2017-01-26 00:49:30 UTC +--- third_party/minigbm/BUILD.gn.orig 2017-04-19 19:06:52 UTC +++ third_party/minigbm/BUILD.gn @@ -4,7 +4,7 @@ diff --git a/www/chromium/files/patch-third__party_node_node.py b/www/chromium/files/patch-third__party_node_node.py new file mode 100644 index 0000000..0cae32d --- /dev/null +++ b/www/chromium/files/patch-third__party_node_node.py @@ -0,0 +1,10 @@ +--- third_party/node/node.py.orig 2017-04-19 19:06:52 UTC ++++ third_party/node/node.py +@@ -12,6 +12,7 @@ import sys + def GetBinaryPath(): + return os_path.join(os_path.dirname(__file__), *{ + 'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'), ++ 'FreeBSD': ('linux', 'node-linux-x64', 'bin', 'node'), + 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), + 'Windows': ('win', 'node.exe'), + }[platform.system()]) diff --git a/www/chromium/files/patch-third__party_opus_BUILD.gn b/www/chromium/files/patch-third__party_opus_BUILD.gn index 041d62b..f15683a 100644 --- a/www/chromium/files/patch-third__party_opus_BUILD.gn +++ b/www/chromium/files/patch-third__party_opus_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/opus/BUILD.gn.orig 2017-01-26 00:49:30 UTC +--- third_party/opus/BUILD.gn.orig 2017-04-19 19:06:52 UTC +++ third_party/opus/BUILD.gn @@ -14,7 +14,7 @@ use_opus_arm_optimization = current_cpu # If OPUS Run Time CPU Detections (RTCD) shall be used. diff --git a/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h b/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h index e4da339..295e94d 100644 --- a/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h +++ b/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h @@ -1,4 +1,4 @@ ---- third_party/ots/include/opentype-sanitiser.h.orig 2017-01-26 00:49:30 UTC +--- third_party/ots/include/opentype-sanitiser.h.orig 2017-04-19 19:06:52 UTC +++ third_party/ots/include/opentype-sanitiser.h @@ -22,6 +22,7 @@ typedef unsigned __int64 uint64_t; #else diff --git a/www/chromium/files/patch-third__party_pdfium_BUILD.gn b/www/chromium/files/patch-third__party_pdfium_BUILD.gn index 6231a8e..b14844a 100644 --- a/www/chromium/files/patch-third__party_pdfium_BUILD.gn +++ b/www/chromium/files/patch-third__party_pdfium_BUILD.gn @@ -1,7 +1,7 @@ ---- third_party/pdfium/BUILD.gn.orig 2017-03-09 20:05:26 UTC +--- third_party/pdfium/BUILD.gn.orig 2017-04-19 19:07:49 UTC +++ third_party/pdfium/BUILD.gn -@@ -45,7 +45,7 @@ config("pdfium_core_config") { - ldflags = [] +@@ -65,7 +65,7 @@ config("pdfium_core_config") { + cflags = [] configs = [ ":pdfium_common_config" ] defines = [ "V8_DEPRECATION_WARNINGS" ] - if (is_linux) { diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h index 8aaabf0..582042a 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h +++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2017-01-26 00:50:14 UTC +--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2017-04-19 19:07:50 UTC +++ third_party/pdfium/core/fxcrt/fx_system.h @@ -40,7 +40,7 @@ #elif defined(_WIN64) diff --git a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp index b1b7665..70a7add 100644 --- a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp @@ -1,4 +1,4 @@ ---- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig 2017-03-09 20:05:26 UTC +--- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig 2017-04-19 19:07:50 UTC +++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp @@ -457,11 +457,12 @@ v8::Local<v8::Date> CJS_Date::ToV8Date(C } diff --git a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp index 696c9ff..495f687 100644 --- a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp @@ -1,4 +1,4 @@ ---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2017-01-26 00:50:15 UTC +--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2017-04-19 19:07:50 UTC +++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp @@ -68,6 +68,103 @@ const FX_WCHAR* const fullmonths[] = {L" L"July", L"August", L"September", diff --git a/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn b/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn index addf901..1e14e84 100644 --- a/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn +++ b/www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/pdfium/skia/BUILD.gn.orig 2017-01-26 00:50:15 UTC +--- third_party/pdfium/skia/BUILD.gn.orig 2017-04-19 19:07:50 UTC +++ third_party/pdfium/skia/BUILD.gn @@ -102,7 +102,7 @@ config("skia_library_config") { } diff --git a/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h b/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h index a5c5546..1dbb5dc 100644 --- a/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h +++ b/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/third_party/base/logging.h.orig 2017-01-26 00:50:15 UTC +--- third_party/pdfium/third_party/base/logging.h.orig 2017-04-19 19:07:50 UTC +++ third_party/pdfium/third_party/base/logging.h @@ -10,7 +10,7 @@ diff --git a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h index d4c983d..b450ecf 100644 --- a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h +++ b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h @@ -1,4 +1,4 @@ ---- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig 2017-03-09 20:05:27 UTC +--- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig 2017-04-19 19:07:51 UTC +++ third_party/skia/src/gpu/GrAutoLocaleSetter.h @@ -25,7 +25,7 @@ #define HAVE_XLOCALE 0 diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn index 95a4c12..ca83cf2 100644 --- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn +++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/sqlite/BUILD.gn.orig 2017-03-09 20:04:47 UTC +--- third_party/sqlite/BUILD.gn.orig 2017-04-19 19:06:52 UTC +++ third_party/sqlite/BUILD.gn @@ -22,7 +22,7 @@ if (!use_system_sqlite) { # sqlite3Fts3InitTok). diff --git a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn index b4ad317..813dff5 100644 --- a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn +++ b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/usrsctp/BUILD.gn.orig 2017-01-26 00:49:31 UTC +--- third_party/usrsctp/BUILD.gn.orig 2017-04-19 19:06:53 UTC +++ third_party/usrsctp/BUILD.gn @@ -112,6 +112,12 @@ static_library("usrsctp") { "__Userspace_os_Linux", diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index b79447d..f6ec0e7 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2017-01-26 00:50:17 UTC +--- third_party/webrtc/BUILD.gn.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/BUILD.gn -@@ -60,6 +60,9 @@ config("common_inherited_config") { +@@ -59,6 +59,9 @@ config("common_inherited_config") { if (is_linux) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn index eec2387..3af4a95 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/base/BUILD.gn.orig 2017-03-09 20:05:29 UTC +--- third_party/webrtc/base/BUILD.gn.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/base/BUILD.gn -@@ -604,7 +604,6 @@ rtc_static_library("rtc_base") { +@@ -566,7 +566,6 @@ rtc_static_library("rtc_base") { if (use_x11) { libs += [ @@ -8,7 +8,7 @@ "rt", "Xext", "X11", -@@ -615,7 +614,6 @@ rtc_static_library("rtc_base") { +@@ -577,7 +576,6 @@ rtc_static_library("rtc_base") { if (is_linux) { libs += [ diff --git a/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc b/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc index 8607744..3db8b5e 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/base/httpcommon.cc.orig 2017-03-09 20:05:29 UTC +--- third_party/webrtc/base/httpcommon.cc.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/base/httpcommon.cc -@@ -385,7 +385,7 @@ bool HttpDateToSeconds(const std::string +@@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; } // TODO: Android should support timezone, see b/2441195 diff --git a/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h b/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h index 12f3b45..7328dd9 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h +++ b/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/ifaddrs_converter.h.orig 2017-01-26 00:50:17 UTC +--- third_party/webrtc/base/ifaddrs_converter.h.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/base/ifaddrs_converter.h @@ -14,6 +14,8 @@ #if defined(WEBRTC_ANDROID) diff --git a/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h b/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h index 73520d4..58a6c4b 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h +++ b/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/ipaddress.h.orig 2017-01-26 00:50:17 UTC +--- third_party/webrtc/base/ipaddress.h.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/base/ipaddress.h @@ -17,6 +17,10 @@ #include <arpa/inet.h> diff --git a/www/chromium/files/patch-third__party_webrtc_base_network.cc b/www/chromium/files/patch-third__party_webrtc_base_network.cc index 224bb19..d98bbc9 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_network.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_network.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/network.cc.orig 2017-03-09 20:05:29 UTC +--- third_party/webrtc/base/network.cc.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/base/network.cc @@ -14,7 +14,7 @@ // linux/if.h can't be included at the same time as the posix sys/if.h, and @@ -9,7 +9,7 @@ #include <linux/if.h> #include <linux/route.h> #elif !defined(__native_client__) -@@ -657,7 +657,7 @@ bool BasicNetworkManager::CreateNetworks +@@ -658,7 +658,7 @@ bool BasicNetworkManager::CreateNetworks } #endif // WEBRTC_WIN @@ -17,8 +17,8 @@ +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) bool IsDefaultRoute(const std::string& network_name) { FileStream fs; - if (!fs.Open("/proc/net/route", "r", NULL)) { -@@ -700,7 +700,7 @@ bool BasicNetworkManager::IsIgnoredNetwo + if (!fs.Open("/proc/net/route", "r", nullptr)) { +@@ -701,7 +701,7 @@ bool BasicNetworkManager::IsIgnoredNetwo strncmp(network.name().c_str(), "vboxnet", 7) == 0) { return true; } diff --git a/www/chromium/files/patch-third__party_webrtc_base_network.h b/www/chromium/files/patch-third__party_webrtc_base_network.h index 91fdc80..48246d7 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_network.h +++ b/www/chromium/files/patch-third__party_webrtc_base_network.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/network.h.orig 2017-03-09 20:05:29 UTC +--- third_party/webrtc/base/network.h.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/base/network.h @@ -24,6 +24,10 @@ #include "webrtc/base/messagehandler.h" diff --git a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc index 0ec3782..a0fd729 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/base/physicalsocketserver.cc.orig 2017-03-09 20:05:29 UTC +--- third_party/webrtc/base/physicalsocketserver.cc.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/base/physicalsocketserver.cc -@@ -62,7 +62,11 @@ typedef void* SockOptArg; +@@ -61,7 +61,11 @@ typedef void* SockOptArg; int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; @@ -12,7 +12,7 @@ if (ret != 0) return -1; int64_t timestamp = -@@ -275,7 +279,7 @@ int PhysicalSocket::GetOption(Option opt +@@ -302,7 +306,7 @@ int PhysicalSocket::GetOption(Option opt socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { @@ -21,7 +21,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } -@@ -288,7 +292,7 @@ int PhysicalSocket::SetOption(Option opt +@@ -315,7 +319,7 @@ int PhysicalSocket::SetOption(Option opt if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -30,7 +30,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -570,10 +574,10 @@ int PhysicalSocket::TranslateOption(Opti +@@ -597,10 +601,10 @@ int PhysicalSocket::TranslateOption(Opti *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc b/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc index 98c0d70..bd2394f 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc +++ b/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc @@ -1,7 +1,7 @@ ---- third_party/webrtc/base/platform_thread.cc.orig 2017-01-26 00:50:17 UTC +--- third_party/webrtc/base/platform_thread.cc.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/base/platform_thread.cc -@@ -12,11 +12,18 @@ - +@@ -13,11 +13,18 @@ + #include "webrtc/base/atomicops.h" #include "webrtc/base/checks.h" -#if defined(WEBRTC_LINUX) @@ -20,7 +20,7 @@ namespace rtc { PlatformThreadId CurrentThreadId() { -@@ -26,6 +33,8 @@ PlatformThreadId CurrentThreadId() { +@@ -27,6 +34,8 @@ PlatformThreadId CurrentThreadId() { #elif defined(WEBRTC_POSIX) #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) ret = pthread_mach_thread_np(pthread_self()); @@ -29,7 +29,7 @@ #elif defined(WEBRTC_LINUX) ret = syscall(__NR_gettid); #elif defined(WEBRTC_ANDROID) -@@ -69,7 +78,9 @@ void SetCurrentThreadName(const char* na +@@ -70,7 +79,9 @@ void SetCurrentThreadName(const char* na reinterpret_cast<ULONG_PTR*>(&threadname_info)); } __except (EXCEPTION_EXECUTE_HANDLER) { } diff --git a/www/chromium/files/patch-third__party_webrtc_base_stringutils.h b/www/chromium/files/patch-third__party_webrtc_base_stringutils.h index 9b04e01..ee8623a 100644 --- a/www/chromium/files/patch-third__party_webrtc_base_stringutils.h +++ b/www/chromium/files/patch-third__party_webrtc_base_stringutils.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/base/stringutils.h.orig 2017-01-26 00:50:17 UTC +--- third_party/webrtc/base/stringutils.h.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/base/stringutils.h @@ -23,11 +23,11 @@ #endif // WEBRTC_WIN diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index f4ca350..a529490 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2017-03-09 20:05:29 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2017-04-19 19:07:52 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn @@ -82,7 +82,7 @@ rtc_static_library("audio_device") { ] diff --git a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc index ff28494..5bcf679 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc +++ b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2017-01-26 00:50:17 UTC +--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2017-04-19 19:07:53 UTC +++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -13,6 +13,7 @@ #include <string.h> diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn index df32038..7875817 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn @@ -1,19 +1,20 @@ ---- third_party/webrtc/modules/video_coding/BUILD.gn.orig 2017-03-09 20:05:29 UTC +--- third_party/webrtc/modules/video_coding/BUILD.gn.orig 2017-04-19 19:07:53 UTC +++ third_party/webrtc/modules/video_coding/BUILD.gn -@@ -164,11 +164,7 @@ rtc_static_library("webrtc_h264") { +@@ -154,12 +154,7 @@ rtc_static_library("webrtc_h264") { } defines = [] - deps = [ - ":video_coding_utility", - "../../base:rtc_base_approved", +- "../../media:rtc_media_base", - "../../system_wrappers", - ] -+ deps = [] ++ deps = [] if (rtc_use_h264) { defines += [ "WEBRTC_USE_H264" ] -@@ -182,10 +178,10 @@ rtc_static_library("webrtc_h264") { +@@ -173,10 +168,10 @@ rtc_static_library("webrtc_h264") { "codecs/h264/h264_encoder_impl.h", ] deps += [ diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index 0d47d3b..2efac34 100644 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2017-03-09 20:05:29 UTC +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2017-04-19 19:07:53 UTC +++ third_party/webrtc/system_wrappers/BUILD.gn @@ -87,7 +87,7 @@ rtc_static_library("system_wrappers") { libs += [ "log" ] diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc b/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc index 5984db3..7a50811 100644 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig 2017-01-26 00:50:17 UTC +--- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig 2017-04-19 19:07:53 UTC +++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc @@ -12,7 +12,7 @@ diff --git a/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h b/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h deleted file mode 100644 index 3327a28..0000000 --- a/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2017-01-26 00:50:17 UTC -+++ third_party/webrtc/voice_engine/voice_engine_defines.h -@@ -210,7 +210,7 @@ inline int VoEChannelId(int moduleId) { - #include <pthread.h> - #include <sys/socket.h> - #include <sys/types.h> --#ifndef QNX -+#if !defined(QNX) && !defined(WEBRTC_BSD) - #include <linux/net.h> - #ifndef ANDROID - #include <sys/soundcard.h> diff --git a/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn b/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn index 7cf640a..3bd5319 100644 --- a/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn +++ b/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/widevine/cdm/BUILD.gn.orig 2017-01-26 00:49:31 UTC +--- third_party/widevine/cdm/BUILD.gn.orig 2017-04-19 19:06:53 UTC +++ third_party/widevine/cdm/BUILD.gn @@ -26,7 +26,7 @@ if (is_android) { widevine_cdm_version_h_file = @@ -9,7 +9,7 @@ widevine_cdm_version_h_file = "linux/$widevine_arch/widevine_cdm_version.h" widevine_cdm_binary_files = [ "linux/$widevine_arch/libwidevinecdm.so" ] } else if (is_win) { -@@ -160,7 +160,7 @@ if ((is_chrome_branded || enable_widevin +@@ -165,7 +165,7 @@ if ((is_chrome_branded || enable_widevin ":widevinecdm", ] @@ -18,7 +18,7 @@ ldflags = [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.so", root_build_dir) ] -@@ -183,7 +183,7 @@ if ((is_chrome_branded || enable_widevin +@@ -188,7 +188,7 @@ if ((is_chrome_branded || enable_widevin # This target exists for tests to depend on that pulls in a runtime dependency # on the license server. source_set("widevine_test_license_server") { diff --git a/www/chromium/files/patch-third__party_yasm_BUILD.gn b/www/chromium/files/patch-third__party_yasm_BUILD.gn index 5c7b20b..11a2eab 100644 --- a/www/chromium/files/patch-third__party_yasm_BUILD.gn +++ b/www/chromium/files/patch-third__party_yasm_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/yasm/BUILD.gn.orig 2017-01-26 00:49:31 UTC +--- third_party/yasm/BUILD.gn.orig 2017-04-19 19:06:53 UTC +++ third_party/yasm/BUILD.gn @@ -32,7 +32,12 @@ import("//build/config/compiler/compiler if (current_toolchain == host_toolchain) { diff --git a/www/chromium/files/patch-third__party_zlib_BUILD.gn b/www/chromium/files/patch-third__party_zlib_BUILD.gn index a7516cb..f34a222 100644 --- a/www/chromium/files/patch-third__party_zlib_BUILD.gn +++ b/www/chromium/files/patch-third__party_zlib_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/zlib/BUILD.gn.orig 2017-01-26 00:49:31 UTC +--- third_party/zlib/BUILD.gn.orig 2017-04-19 19:06:53 UTC +++ third_party/zlib/BUILD.gn @@ -115,7 +115,7 @@ static_library("minizip") { "contrib/minizip/iowin32.h", diff --git a/www/chromium/files/patch-tools_battor__agent_BUILD.gn b/www/chromium/files/patch-tools_battor__agent_BUILD.gn index 30679f4..80c12b6 100644 --- a/www/chromium/files/patch-tools_battor__agent_BUILD.gn +++ b/www/chromium/files/patch-tools_battor__agent_BUILD.gn @@ -1,4 +1,4 @@ ---- tools/battor_agent/BUILD.gn.orig 2017-01-26 00:49:31 UTC +--- tools/battor_agent/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ tools/battor_agent/BUILD.gn @@ -5,7 +5,7 @@ import("//testing/test.gni") diff --git a/www/chromium/files/patch-tools_gn_args.cc b/www/chromium/files/patch-tools_gn_args.cc index 7b2a4c7..4c9ef98 100644 --- a/www/chromium/files/patch-tools_gn_args.cc +++ b/www/chromium/files/patch-tools_gn_args.cc @@ -1,6 +1,6 @@ ---- tools/gn/args.cc.orig 2017-03-09 20:04:48 UTC +--- tools/gn/args.cc.orig 2017-04-19 19:06:54 UTC +++ tools/gn/args.cc -@@ -270,6 +270,8 @@ void Args::SetSystemVarsLocked(Scope* de +@@ -298,6 +298,8 @@ void Args::SetSystemVarsLocked(Scope* de os = "mac"; #elif defined(OS_LINUX) os = "linux"; diff --git a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py index c29d59c..35ce717 100644 --- a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py +++ b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py @@ -1,4 +1,4 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2017-03-09 20:04:48 UTC +--- tools/gn/bootstrap/bootstrap.py.orig 2017-04-19 19:06:54 UTC +++ tools/gn/bootstrap/bootstrap.py @@ -23,6 +23,7 @@ import os import shutil @@ -19,7 +19,7 @@ def check_call(cmd, **kwargs): logging.debug('Running: %s', ' '.join(cmd)) -@@ -605,6 +607,39 @@ def write_gn_ninja(path, root_gen_dir, o +@@ -624,6 +626,41 @@ def write_gn_ninja(path, root_gen_dir, o 'base/third_party/libevent/epoll.c', ]) @@ -36,8 +36,10 @@ + static_libraries['base']['sources'].extend([ + 'base/allocator/allocator_shim.cc', + 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', ++ 'base/callback_helpers.cc', + 'base/memory/shared_memory_posix.cc', + 'base/nix/xdg_util.cc', ++ 'base/process/memory_stubs.cc', + #'base/process/internal_linux.cc', + 'base/process/process_handle_' + platform.system().lower() + '.cc', + 'base/process/process_iterator_' + platform.system().lower() + '.cc', diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index cb6f066..8db9777 100644 --- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,4 +1,4 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2017-03-09 20:04:48 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn @@ -93,7 +93,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] diff --git a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py index 508e8c5..2385c7f 100644 --- a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py +++ b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py @@ -1,4 +1,4 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2017-01-26 00:49:31 UTC +--- tools/variations/fieldtrial_to_struct.py.orig 2017-04-19 19:06:54 UTC +++ tools/variations/fieldtrial_to_struct.py @@ -116,7 +116,7 @@ def main(arguments): if not opts.platform: diff --git a/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h b/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h index 7959642..801c06f 100644 --- a/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h +++ b/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h @@ -1,4 +1,4 @@ ---- ui/accessibility/platform/ax_platform_node.h.orig 2017-01-26 00:49:31 UTC +--- ui/accessibility/platform/ax_platform_node.h.orig 2017-04-19 19:06:54 UTC +++ ui/accessibility/platform/ax_platform_node.h @@ -22,7 +22,7 @@ #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1 diff --git a/www/chromium/files/patch-ui_app__list_app__list__constants.cc b/www/chromium/files/patch-ui_app__list_app__list__constants.cc index 4b89e27..8342c35 100644 --- a/www/chromium/files/patch-ui_app__list_app__list__constants.cc +++ b/www/chromium/files/patch-ui_app__list_app__list__constants.cc @@ -1,4 +1,4 @@ ---- ui/app_list/app_list_constants.cc.orig 2017-01-26 00:49:31 UTC +--- ui/app_list/app_list_constants.cc.orig 2017-04-19 19:06:54 UTC +++ ui/app_list/app_list_constants.cc @@ -140,7 +140,7 @@ const char kSearchQueryLength[] = "Apps. const char kSearchResultDistanceFromOrigin[] = diff --git a/www/chromium/files/patch-ui_app__list_app__list__constants.h b/www/chromium/files/patch-ui_app__list_app__list__constants.h index a99e9c0..0eae800 100644 --- a/www/chromium/files/patch-ui_app__list_app__list__constants.h +++ b/www/chromium/files/patch-ui_app__list_app__list__constants.h @@ -1,4 +1,4 @@ ---- ui/app_list/app_list_constants.h.orig 2017-01-26 00:49:31 UTC +--- ui/app_list/app_list_constants.h.orig 2017-04-19 19:06:54 UTC +++ ui/app_list/app_list_constants.h @@ -89,8 +89,8 @@ APP_LIST_EXPORT extern const char kSearc APP_LIST_EXPORT extern const char kSearchQueryLength[]; diff --git a/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc b/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc index 543a726..8fff20b 100644 --- a/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc +++ b/www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc @@ -1,4 +1,4 @@ ---- ui/app_list/views/app_list_item_view.cc.orig 2017-01-26 00:49:31 UTC +--- ui/app_list/views/app_list_item_view.cc.orig 2017-04-19 19:06:54 UTC +++ ui/app_list/views/app_list_item_view.cc @@ -55,7 +55,7 @@ gfx::FontList GetFontList() { const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle); diff --git a/www/chromium/files/patch-ui_aura_BUILD.gn b/www/chromium/files/patch-ui_aura_BUILD.gn index d86c8f4..8167b4b 100644 --- a/www/chromium/files/patch-ui_aura_BUILD.gn +++ b/www/chromium/files/patch-ui_aura_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/aura/BUILD.gn.orig 2017-03-09 20:04:49 UTC +--- ui/aura/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ ui/aura/BUILD.gn -@@ -362,7 +362,7 @@ test("aura_unittests") { +@@ -369,7 +369,7 @@ test("aura_unittests") { "//ui/gl:test_support", ] diff --git a/www/chromium/files/patch-ui_base_BUILD.gn b/www/chromium/files/patch-ui_base_BUILD.gn index a22a3be..3b91873 100644 --- a/www/chromium/files/patch-ui_base_BUILD.gn +++ b/www/chromium/files/patch-ui_base_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/base/BUILD.gn.orig 2017-03-09 20:04:49 UTC +--- ui/base/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ ui/base/BUILD.gn -@@ -352,7 +352,7 @@ component("base") { +@@ -357,7 +357,7 @@ component("base") { sources += [ "touch/touch_device_android.cc" ] } else if (is_ios) { sources += [ "touch/touch_device_ios.cc" ] @@ -9,7 +9,7 @@ sources += [ "touch/touch_device_linux.cc" ] } else { # Empty implementation for all other cases. -@@ -462,11 +462,11 @@ component("base") { +@@ -467,11 +467,11 @@ component("base") { ] } @@ -23,7 +23,7 @@ deps += [ "//build/linux:fontconfig" ] } -@@ -474,7 +474,7 @@ component("base") { +@@ -479,7 +479,7 @@ component("base") { configs += [ "//build/config/linux:glib" ] } @@ -32,7 +32,7 @@ if (!toolkit_views && !use_aura) { sources -= [ "dragdrop/drag_utils.cc", -@@ -825,7 +825,7 @@ test("ui_base_unittests") { +@@ -831,7 +831,7 @@ test("ui_base_unittests") { "ime/win/imm32_manager_unittest.cc", "ime/win/tsf_input_scope_unittest.cc", ] @@ -41,7 +41,7 @@ sources += [ "ime/input_method_auralinux_unittest.cc" ] } if (use_x11) { -@@ -946,7 +946,7 @@ test("ui_base_unittests") { +@@ -952,7 +952,7 @@ test("ui_base_unittests") { ] } @@ -50,7 +50,7 @@ # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak # instead of depending directly on the non-test .pak files, but depending # on ui_test_pak seems to have no effect. -@@ -959,7 +959,7 @@ test("ui_base_unittests") { +@@ -965,7 +965,7 @@ test("ui_base_unittests") { "//third_party/mesa:osmesa", ] } diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc index 8527918..273c33f 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,4 +1,4 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2017-02-02 02:03:13 UTC +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2017-04-19 19:06:54 UTC +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc @@ -8,7 +8,7 @@ diff --git a/www/chromium/files/patch-ui_base_ime_BUILD.gn b/www/chromium/files/patch-ui_base_ime_BUILD.gn index aa3a96e..f18610b 100644 --- a/www/chromium/files/patch-ui_base_ime_BUILD.gn +++ b/www/chromium/files/patch-ui_base_ime_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/base/ime/BUILD.gn.orig 2017-03-09 20:04:49 UTC +--- ui/base/ime/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ ui/base/ime/BUILD.gn @@ -124,7 +124,7 @@ component("ime") { "//skia", diff --git a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h index 9f1edc2..a8b2b27 100644 --- a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h +++ b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h @@ -1,4 +1,4 @@ ---- ui/base/ime/ime_engine_handler_interface.h.orig 2017-03-09 20:04:49 UTC +--- ui/base/ime/ime_engine_handler_interface.h.orig 2017-04-19 19:06:54 UTC +++ ui/base/ime/ime_engine_handler_interface.h @@ -142,7 +142,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle // Hides the input view window (from API call). diff --git a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc index 4f3bd34..658d5fa 100644 --- a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc +++ b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc @@ -1,4 +1,4 @@ ---- ui/base/ime/input_method_factory.cc.orig 2017-03-09 20:04:49 UTC +--- ui/base/ime/input_method_factory.cc.orig 2017-04-19 19:06:54 UTC +++ ui/base/ime/input_method_factory.cc @@ -16,7 +16,8 @@ #include "ui/base/ime/input_method_win.h" diff --git a/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc index 0cc6722..078ebbd 100644 --- a/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc +++ b/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc @@ -1,4 +1,4 @@ ---- ui/base/ime/input_method_initializer.cc.orig 2017-01-26 00:49:31 UTC +--- ui/base/ime/input_method_initializer.cc.orig 2017-04-19 19:06:54 UTC +++ ui/base/ime/input_method_initializer.cc @@ -8,14 +8,14 @@ diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index 6a846b0..003e7f8 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2017-03-09 20:04:49 UTC +--- ui/base/resource/resource_bundle.cc.orig 2017-04-19 19:06:54 UTC +++ ui/base/resource/resource_bundle.cc -@@ -650,7 +650,7 @@ void ResourceBundle::ReloadFonts() { +@@ -661,7 +661,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -709,7 +709,7 @@ void ResourceBundle::InitSharedInstance( +@@ -719,7 +719,7 @@ void ResourceBundle::InitSharedInstance( supported_scale_factors.push_back(SCALE_FACTOR_100P); } #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-ui_base_ui__features.gni b/www/chromium/files/patch-ui_base_ui__features.gni index 2611b94..1438526 100644 --- a/www/chromium/files/patch-ui_base_ui__features.gni +++ b/www/chromium/files/patch-ui_base_ui__features.gni @@ -1,4 +1,4 @@ ---- ui/base/ui_features.gni.orig 2017-03-09 20:04:49 UTC +--- ui/base/ui_features.gni.orig 2017-04-19 19:06:54 UTC +++ ui/base/ui_features.gni @@ -10,4 +10,4 @@ declare_args() { mac_views_browser = false diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index 3be6125..f825383 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,4 +1,4 @@ ---- ui/base/webui/web_ui_util.cc.orig 2017-01-26 00:49:31 UTC +--- ui/base/webui/web_ui_util.cc.orig 2017-04-19 19:06:54 UTC +++ ui/base/webui/web_ui_util.cc @@ -161,7 +161,7 @@ std::string GetFontFamily() { diff --git a/www/chromium/files/patch-ui_compositor_BUILD.gn b/www/chromium/files/patch-ui_compositor_BUILD.gn index b2f9fba..08800ab 100644 --- a/www/chromium/files/patch-ui_compositor_BUILD.gn +++ b/www/chromium/files/patch-ui_compositor_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/compositor/BUILD.gn.orig 2017-03-09 20:04:49 UTC +--- ui/compositor/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ ui/compositor/BUILD.gn -@@ -203,7 +203,7 @@ test("compositor_unittests") { +@@ -205,7 +205,7 @@ test("compositor_unittests") { "//ui/gl", "//ui/resources", ] diff --git a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index 3bdcb83..0b88df7 100644 --- a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,4 +1,4 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2017-02-02 02:03:13 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2017-04-19 19:06:54 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc @@ -834,6 +834,8 @@ void DeviceDataManagerX11::SetDisabledKe } diff --git a/www/chromium/files/patch-ui_events_event__switches.cc b/www/chromium/files/patch-ui_events_event__switches.cc index 3dc720b..97ce603 100644 --- a/www/chromium/files/patch-ui_events_event__switches.cc +++ b/www/chromium/files/patch-ui_events_event__switches.cc @@ -1,4 +1,4 @@ ---- ui/events/event_switches.cc.orig 2017-03-09 20:04:49 UTC +--- ui/events/event_switches.cc.orig 2017-04-19 19:06:54 UTC +++ ui/events/event_switches.cc @@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = " const char kCompensateForUnstablePinchZoom[] = diff --git a/www/chromium/files/patch-ui_events_event__switches.h b/www/chromium/files/patch-ui_events_event__switches.h index a2fa8cf..a5907eb 100644 --- a/www/chromium/files/patch-ui_events_event__switches.h +++ b/www/chromium/files/patch-ui_events_event__switches.h @@ -1,4 +1,4 @@ ---- ui/events/event_switches.h.orig 2017-03-09 20:04:49 UTC +--- ui/events/event_switches.h.orig 2017-04-19 19:06:54 UTC +++ ui/events/event_switches.h @@ -14,7 +14,7 @@ namespace switches { EVENTS_BASE_EXPORT extern const char kEnableScrollPrediction[]; diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index 625b693..e2be265 100644 --- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,4 +1,4 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2017-01-26 00:49:31 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2017-04-19 19:06:54 UTC +++ ui/events/keycodes/dom/keycode_converter.cc @@ -19,7 +19,7 @@ namespace { // and DOM Level 3 |code| strings. diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index b455522..4f5094b 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2017-03-09 20:04:49 UTC +--- ui/gfx/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ ui/gfx/BUILD.gn -@@ -375,7 +375,7 @@ component("gfx") { +@@ -383,7 +383,7 @@ component("gfx") { } # Linux. @@ -9,7 +9,7 @@ deps += [ "//build/linux:fontconfig" ] } -@@ -570,7 +570,7 @@ static_library("test_support") { +@@ -592,7 +592,7 @@ static_library("test_support") { "test/ui_cocoa_test_helper.mm", ] } diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc index 722f99a..bb9a49b 100644 --- a/www/chromium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/canvas_skia.cc.orig 2017-03-09 20:04:49 UTC +--- ui/gfx/canvas_skia.cc.orig 2017-04-19 19:06:54 UTC +++ ui/gfx/canvas_skia.cc -@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(con +@@ -201,7 +201,7 @@ void Canvas::DrawStringRectWithFlags(con Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc index 709cc86..382059b 100644 --- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2017-02-02 02:03:13 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2017-04-19 19:06:54 UTC +++ ui/gfx/font_fallback_linux.cc @@ -15,6 +15,10 @@ #include "base/memory/ptr_util.h" diff --git a/www/chromium/files/patch-ui_gfx_font__list.cc b/www/chromium/files/patch-ui_gfx_font__list.cc index 4eeeabd..69cf89d 100644 --- a/www/chromium/files/patch-ui_gfx_font__list.cc +++ b/www/chromium/files/patch-ui_gfx_font__list.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_list.cc.orig 2017-02-02 02:03:13 UTC +--- ui/gfx/font_list.cc.orig 2017-04-19 19:06:54 UTC +++ ui/gfx/font_list.cc @@ -24,7 +24,7 @@ base::LazyInstance<scoped_refptr<gfx::Fo bool g_default_impl_initialized = false; diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h index c87dabe..2b2f51e 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params.h +++ b/www/chromium/files/patch-ui_gfx_font__render__params.h @@ -1,4 +1,4 @@ ---- ui/gfx/font_render_params.h.orig 2017-01-26 00:49:31 UTC +--- ui/gfx/font_render_params.h.orig 2017-04-19 19:06:54 UTC +++ ui/gfx/font_render_params.h @@ -106,13 +106,13 @@ GFX_EXPORT FontRenderParams GetFontRende const FontRenderParamsQuery& query, diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index 447e8b8..46acc60 100644 --- a/www/chromium/files/patch-ui_gfx_render__text.cc +++ b/www/chromium/files/patch-ui_gfx_render__text.cc @@ -1,6 +1,6 @@ ---- ui/gfx/render_text.cc.orig 2017-03-09 20:04:49 UTC +--- ui/gfx/render_text.cc.orig 2017-04-19 19:06:54 UTC +++ ui/gfx/render_text.cc -@@ -982,32 +982,33 @@ void RenderText::SetDisplayOffset(int ho +@@ -976,32 +976,33 @@ void RenderText::SetDisplayOffset(int ho const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index f4cbc99..3edb9fe 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2017-03-09 20:04:49 UTC +--- ui/gl/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ ui/gl/BUILD.gn @@ -13,7 +13,7 @@ declare_args() { enable_swiftshader = is_chrome_branded && is_win @@ -9,7 +9,7 @@ use_glx = use_x11 || ozone_platform_x11 if (is_android) { -@@ -174,7 +174,7 @@ component("gl") { +@@ -170,7 +170,7 @@ component("gl") { "gl_surface_egl.h", ] } diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc index efbf0f9..d8da75f 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc @@ -1,63 +1,38 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2017-01-26 00:49:32 UTC +--- ui/gl/sync_control_vsync_provider.cc.orig 2017-04-19 19:06:54 UTC +++ ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; -@@ -21,17 +21,17 @@ const int64_t kMaxVsyncIntervalUs = base - // we think the latest computed interval is invalid (noisey due to - // monitor configuration change, moving a window between monitors, etc.). - const double kRelativeIntervalDifferenceThreshold = 0.05; --#endif // defined(OS_LINUX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) - +@@ -26,7 +26,7 @@ const double kRelativeIntervalDifference namespace gl { SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() { --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) // On platforms where we can't get an accurate reading on the refresh // rate we fall back to the assumption that we're displaying 60 frames // per second. - last_good_interval_ = base::TimeDelta::FromSeconds(1) / 60; --#endif // defined(OS_LINUX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) - } - - SyncControlVSyncProvider::~SyncControlVSyncProvider() {} @@ -39,7 +39,7 @@ SyncControlVSyncProvider::~SyncControlVS void SyncControlVSyncProvider::GetVSyncParameters( const UpdateVSyncCallback& callback) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) base::TimeTicks timebase; - int64_t system_time; -@@ -129,10 +129,10 @@ void SyncControlVSyncProvider::GetVSyncP + // The actual clock used for the system time returned by glXGetSyncValuesOML +@@ -155,7 +155,7 @@ void SyncControlVSyncProvider::GetVSyncP last_timebase_ = timebase; last_media_stream_counter_ = media_stream_counter; callback.Run(timebase, last_good_interval_); --#endif // defined(OS_LINUX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - bool SyncControlVSyncProvider::AdjustSyncValues(int64_t* system_time, - int64_t* media_stream_counter) { - // Both Intel and Mali drivers will return TRUE for GetSyncValues -@@ -192,7 +192,7 @@ bool SyncControlVSyncProvider::AdjustSyn - - return true; - } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) + } - #if defined(OS_WIN) - bool SyncControlVSyncProvider::AdjustSyncValues(int64_t* system_time, + } // namespace gl diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h index 8344229..7abf154 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h @@ -1,24 +1,18 @@ ---- ui/gl/sync_control_vsync_provider.h.orig 2017-01-26 00:49:32 UTC +--- ui/gl/sync_control_vsync_provider.h.orig 2017-04-19 19:06:54 UTC +++ ui/gl/sync_control_vsync_provider.h -@@ -32,7 +32,7 @@ class GL_EXPORT SyncControlVSyncProvider +@@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; private: --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) - bool AdjustSyncValues(int64_t* system_time, int64_t* media_stream_counter); - +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) base::TimeTicks last_timebase_; -@@ -46,11 +46,11 @@ class GL_EXPORT SyncControlVSyncProvider + uint64_t last_media_stream_counter_ = 0; + base::TimeDelta last_good_interval_; +@@ -42,7 +42,7 @@ class SyncControlVSyncProvider : public // from configuration change (monitor reconfiguration, moving windows // between monitors, suspend and resume, etc.). std::queue<base::TimeDelta> last_computed_intervals_; --#endif // defined(OS_LINUX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(OS_WIN) - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - bool invalid_msc_ = false; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-ui_message__center_message__center__style.h b/www/chromium/files/patch-ui_message__center_message__center__style.h index 4e42f71..51a6c11 100644 --- a/www/chromium/files/patch-ui_message__center_message__center__style.h +++ b/www/chromium/files/patch-ui_message__center_message__center__style.h @@ -1,6 +1,6 @@ ---- ui/message_center/message_center_style.h.orig 2017-01-26 00:49:32 UTC +--- ui/message_center/message_center_style.h.orig 2017-04-19 19:06:54 UTC +++ ui/message_center/message_center_style.h -@@ -115,7 +115,7 @@ const int kButtonHorizontalPadding = 16; +@@ -121,7 +121,7 @@ const int kButtonHorizontalPadding = 16; const int kButtonIconTopPadding = 11; // In DIPs. const int kButtonIconToTitlePadding = 16; // In DIPs. diff --git a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc index 2aa0e7c..7c285d5 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc @@ -1,4 +1,4 @@ ---- ui/message_center/views/message_center_button_bar.cc.orig 2017-01-26 00:49:32 UTC +--- ui/message_center/views/message_center_button_bar.cc.orig 2017-04-19 19:06:54 UTC +++ ui/message_center/views/message_center_button_bar.cc @@ -95,7 +95,7 @@ MessageCenterButtonBar::MessageCenterBut const base::string16& title) @@ -36,7 +36,7 @@ layout->AddView(close_bubble_button_); #endif } -@@ -297,7 +297,7 @@ void MessageCenterButtonBar::ButtonPress +@@ -316,7 +316,7 @@ void MessageCenterButtonBar::ButtonPress else message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1)); quiet_mode_button_->SetToggled(message_center()->IsQuietMode()); diff --git a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h index 075d012..35f4a1a 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h +++ b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_center_button_bar.h.orig 2017-01-26 00:49:32 UTC +--- ui/message_center/views/message_center_button_bar.h.orig 2017-04-19 19:06:54 UTC +++ ui/message_center/views/message_center_button_bar.h -@@ -74,7 +74,7 @@ class MessageCenterButtonBar : public vi +@@ -78,7 +78,7 @@ class MessageCenterButtonBar : public vi // close-on-deactivation is off. This is a tentative solution. Once pkotwicz // Fixes the problem of focus-follow-mouse, close-on-deactivation will be // back and this field will be removed. See crbug.com/319516. diff --git a/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc b/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc index 4c36579..e0b64bb 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc @@ -1,4 +1,4 @@ ---- ui/message_center/views/message_view_factory.cc.orig 2017-03-09 20:04:49 UTC +--- ui/message_center/views/message_view_factory.cc.orig 2017-04-19 19:06:54 UTC +++ ui/message_center/views/message_view_factory.cc @@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create( notification_view = new NotificationView(controller, notification); diff --git a/www/chromium/files/patch-ui_message__center_views_toast__contents__view.cc b/www/chromium/files/patch-ui_message__center_views_toast__contents__view.cc index 2343ffa..04e0e58 100644 --- a/www/chromium/files/patch-ui_message__center_views_toast__contents__view.cc +++ b/www/chromium/files/patch-ui_message__center_views_toast__contents__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/toast_contents_view.cc.orig 2017-02-02 02:03:13 UTC +--- ui/message_center/views/toast_contents_view.cc.orig 2017-04-19 19:06:54 UTC +++ ui/message_center/views/toast_contents_view.cc -@@ -361,7 +361,7 @@ void ToastContentsView::CreateWidget( +@@ -388,7 +388,7 @@ void ToastContentsView::CreateWidget( PopupAlignmentDelegate* alignment_delegate) { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); params.keep_on_top = true; diff --git a/www/chromium/files/patch-ui_resources_ui__resources.grd b/www/chromium/files/patch-ui_resources_ui__resources.grd index 7136628..ea1581f 100644 --- a/www/chromium/files/patch-ui_resources_ui__resources.grd +++ b/www/chromium/files/patch-ui_resources_ui__resources.grd @@ -1,4 +1,4 @@ ---- ui/resources/ui_resources.grd.orig 2017-01-26 00:49:32 UTC +--- ui/resources/ui_resources.grd.orig 2017-04-19 19:06:54 UTC +++ ui/resources/ui_resources.grd @@ -15,7 +15,7 @@ <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST diff --git a/www/chromium/files/patch-ui_views_BUILD.gn b/www/chromium/files/patch-ui_views_BUILD.gn index bf91543..e1e373e 100644 --- a/www/chromium/files/patch-ui_views_BUILD.gn +++ b/www/chromium/files/patch-ui_views_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/views/BUILD.gn.orig 2017-03-09 20:04:49 UTC +--- ui/views/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ ui/views/BUILD.gn -@@ -430,7 +430,7 @@ component("views") { +@@ -457,7 +457,7 @@ component("views") { if (use_x11 && !is_chromeos) { deps += [ "//ui/display/util" ] } @@ -9,7 +9,7 @@ sources -= [ "window/window_button_order_provider.cc" ] deps += [ "//ui/shell_dialogs" ] } else { -@@ -618,7 +618,7 @@ component("views") { +@@ -645,7 +645,7 @@ component("views") { "widget/desktop_aura/desktop_window_tree_host_ozone.cc", ] } diff --git a/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h b/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h index 931dadc..42a38a5 100644 --- a/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h +++ b/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h @@ -1,6 +1,6 @@ ---- ui/views/accessibility/native_view_accessibility.h.orig 2017-03-09 20:04:49 UTC +--- ui/views/accessibility/native_view_accessibility.h.orig 2017-04-19 19:06:54 UTC +++ ui/views/accessibility/native_view_accessibility.h -@@ -23,7 +23,7 @@ +@@ -27,7 +27,7 @@ #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1 #endif diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc index 9d021b8..c0c37f6 100644 --- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc @@ -1,4 +1,4 @@ ---- ui/views/bubble/bubble_dialog_delegate.cc.orig 2017-03-09 20:04:49 UTC +--- ui/views/bubble/bubble_dialog_delegate.cc.orig 2017-04-19 19:06:54 UTC +++ ui/views/bubble/bubble_dialog_delegate.cc @@ -76,7 +76,7 @@ Widget* BubbleDialogDelegateView::Create // the parent frame and let DWM handle compositing. If not, then we don't diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index a8e2477..47a6cd8 100644 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -1,15 +1,15 @@ ---- ui/views/controls/label.cc.orig 2017-03-09 20:04:49 UTC +--- ui/views/controls/label.cc.orig 2017-04-19 19:06:54 UTC +++ ui/views/controls/label.cc -@@ -521,7 +521,7 @@ bool Label::OnMousePressed(const ui::Mou +@@ -549,7 +549,7 @@ bool Label::OnMousePressed(const ui::Mou GetFocusManager()->SetFocusedView(this); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (event.IsOnlyMiddleMouseButton() && GetFocusManager()) + if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -685,7 +685,7 @@ bool Label::PasteSelectionClipboard() { +@@ -725,7 +725,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 20dca0f..675e3c0 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2017-03-09 20:04:49 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2017-04-19 19:06:54 UTC +++ ui/views/controls/textfield/textfield.cc @@ -54,7 +54,7 @@ #include "ui/base/win/osk_display_manager.h" @@ -26,16 +26,16 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -582,7 +582,7 @@ bool Textfield::OnMousePressed(const ui: +@@ -606,7 +606,7 @@ bool Textfield::OnMousePressed(const ui: ShowImeIfNeeded(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (!handled && !HasFocus() && event.IsOnlyMiddleMouseButton()) + if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocus(); #endif -@@ -619,7 +619,7 @@ bool Textfield::OnKeyPressed(const ui::K +@@ -645,7 +645,7 @@ bool Textfield::OnKeyPressed(const ui::K if (!textfield) return handled; @@ -44,7 +44,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -759,7 +759,7 @@ void Textfield::AboutToRequestFocusFromT +@@ -785,7 +785,7 @@ void Textfield::AboutToRequestFocusFromT } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -53,16 +53,16 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1041,7 +1041,7 @@ void Textfield::WriteDragDataForView(Vie - std::unique_ptr<gfx::Canvas> canvas( - GetCanvasForDragImage(GetWidget(), label.size())); - label.SetEnabledColor(GetTextColor()); +@@ -1076,7 +1076,7 @@ void Textfield::WriteDragDataForView(Vie + + SkBitmap bitmap; + float raster_scale = ScaleFactorForDragFromWidget(GetWidget()); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Desktop Linux Aura does not yet support transparency in drag images. - canvas->DrawColor(GetBackgroundColor()); - #endif -@@ -1833,7 +1833,7 @@ bool Textfield::PasteSelectionClipboard( + SkColor color = GetBackgroundColor(); + #else +@@ -1873,7 +1873,7 @@ bool Textfield::PasteSelectionClipboard( } void Textfield::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn b/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn index 3551648..10c48d7 100644 --- a/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn +++ b/www/chromium/files/patch-ui_views_controls_webview_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/views/controls/webview/BUILD.gn.orig 2017-01-26 00:49:32 UTC +--- ui/views/controls/webview/BUILD.gn.orig 2017-04-19 19:06:54 UTC +++ ui/views/controls/webview/BUILD.gn @@ -39,7 +39,7 @@ component("webview") { "//ui/views", diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc index 706a541..8dc832a 100644 --- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,4 +1,4 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2017-01-26 00:49:32 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2017-04-19 19:06:54 UTC +++ ui/views/corewm/tooltip_aura.cc @@ -34,7 +34,7 @@ const int kCursorOffsetY = 15; diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc index f44d9ec..570aa28 100644 --- a/www/chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,4 +1,4 @@ ---- ui/views/examples/widget_example.cc.orig 2017-01-26 00:49:32 UTC +--- ui/views/examples/widget_example.cc.orig 2017-04-19 19:06:55 UTC +++ ui/views/examples/widget_example.cc @@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(Vi BuildButton(container, "Popup widget", POPUP); diff --git a/www/chromium/files/patch-ui_views_mus_BUILD.gn b/www/chromium/files/patch-ui_views_mus_BUILD.gn index fdc733c..0b108f5 100644 --- a/www/chromium/files/patch-ui_views_mus_BUILD.gn +++ b/www/chromium/files/patch-ui_views_mus_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/views/mus/BUILD.gn.orig 2017-03-09 20:04:49 UTC +--- ui/views/mus/BUILD.gn.orig 2017-04-19 19:06:55 UTC +++ ui/views/mus/BUILD.gn -@@ -78,7 +78,7 @@ component("mus") { +@@ -79,7 +79,7 @@ component("mus") { "//ui/wm", ] diff --git a/www/chromium/files/patch-ui_views_mus_aura__init.cc b/www/chromium/files/patch-ui_views_mus_aura__init.cc index 48f8aa7..a6f0483 100644 --- a/www/chromium/files/patch-ui_views_mus_aura__init.cc +++ b/www/chromium/files/patch-ui_views_mus_aura__init.cc @@ -1,4 +1,4 @@ ---- ui/views/mus/aura_init.cc.orig 2017-03-09 20:04:49 UTC +--- ui/views/mus/aura_init.cc.orig 2017-04-19 19:06:55 UTC +++ ui/views/mus/aura_init.cc @@ -22,7 +22,7 @@ #include "ui/views/mus/mus_client.h" diff --git a/www/chromium/files/patch-ui_views_mus_aura__init.h b/www/chromium/files/patch-ui_views_mus_aura__init.h index 85eac9c..dd1450cd 100644 --- a/www/chromium/files/patch-ui_views_mus_aura__init.h +++ b/www/chromium/files/patch-ui_views_mus_aura__init.h @@ -1,4 +1,4 @@ ---- ui/views/mus/aura_init.h.orig 2017-03-09 20:04:49 UTC +--- ui/views/mus/aura_init.h.orig 2017-04-19 19:06:55 UTC +++ ui/views/mus/aura_init.h @@ -68,7 +68,7 @@ class VIEWS_MUS_EXPORT AuraInit { private: diff --git a/www/chromium/files/patch-ui_views_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc index 30b07ec..0857239 100644 --- a/www/chromium/files/patch-ui_views_selection__controller.cc +++ b/www/chromium/files/patch-ui_views_selection__controller.cc @@ -1,4 +1,4 @@ ---- ui/views/selection_controller.cc.orig 2017-01-26 00:49:32 UTC +--- ui/views/selection_controller.cc.orig 2017-04-19 19:06:55 UTC +++ ui/views/selection_controller.cc @@ -20,7 +20,7 @@ SelectionController::SelectionController delegate_(delegate), diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index 9a83d56..54a11c5 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,4 +1,4 @@ ---- ui/views/style/platform_style.cc.orig 2017-03-09 20:04:49 UTC +--- ui/views/style/platform_style.cc.orig 2017-04-19 19:06:55 UTC +++ ui/views/style/platform_style.cc @@ -19,7 +19,7 @@ diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc index 6c1dda7..d9ce07c 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.cc +++ b/www/chromium/files/patch-ui_views_views__delegate.cc @@ -1,4 +1,4 @@ ---- ui/views/views_delegate.cc.orig 2017-01-26 00:49:32 UTC +--- ui/views/views_delegate.cc.orig 2017-04-19 19:06:55 UTC +++ ui/views/views_delegate.cc @@ -71,7 +71,7 @@ HICON ViewsDelegate::GetDefaultWindowIco bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index 7e21c3a..01a5548 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,4 +1,4 @@ ---- ui/views/views_delegate.h.orig 2017-01-26 00:49:32 UTC +--- ui/views/views_delegate.h.orig 2017-04-19 19:06:55 UTC +++ ui/views/views_delegate.h @@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro diff --git a/www/chromium/files/patch-ui_views_views__switches.cc b/www/chromium/files/patch-ui_views_views__switches.cc index 26d5584..fecb628 100644 --- a/www/chromium/files/patch-ui_views_views__switches.cc +++ b/www/chromium/files/patch-ui_views_views__switches.cc @@ -1,4 +1,4 @@ ---- ui/views/views_switches.cc.orig 2017-01-26 00:49:32 UTC +--- ui/views/views_switches.cc.orig 2017-04-19 19:06:55 UTC +++ ui/views/views_switches.cc @@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeti "disable-views-rect-based-targeting"; diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 82b14bf..76e8b97 100644 --- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2017-03-09 20:04:49 UTC +--- ui/views/window/custom_frame_view.cc.orig 2017-04-19 19:06:55 UTC +++ ui/views/window/custom_frame_view.cc -@@ -294,7 +294,7 @@ int CustomFrameView::NonClientTopBorderH +@@ -302,7 +302,7 @@ int CustomFrameView::NonClientTopBorderH 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/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index 5b104ff..75ec2f4 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,4 +1,4 @@ ---- ui/views/window/dialog_delegate.cc.orig 2017-03-09 20:04:49 UTC +--- ui/views/window/dialog_delegate.cc.orig 2017-04-19 19:06:55 UTC +++ ui/views/window/dialog_delegate.cc @@ -57,7 +57,7 @@ Widget::InitParams DialogDelegate::GetDi params.bounds = bounds; diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js index ed65d76..73a2958 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_cr.js +++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js @@ -1,4 +1,4 @@ ---- ui/webui/resources/js/cr.js.orig 2017-01-26 00:49:32 UTC +--- ui/webui/resources/js/cr.js.orig 2017-04-19 19:06:55 UTC +++ ui/webui/resources/js/cr.js @@ -451,6 +451,11 @@ var cr = cr || function() { get doc() { diff --git a/www/chromium/files/patch-ui_webui_resources_js_icon.js b/www/chromium/files/patch-ui_webui_resources_js_icon.js index 36883c0..7cd4923 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_icon.js +++ b/www/chromium/files/patch-ui_webui_resources_js_icon.js @@ -1,4 +1,4 @@ ---- ui/webui/resources/js/icon.js.orig 2017-01-26 00:49:32 UTC +--- ui/webui/resources/js/icon.js.orig 2017-04-19 19:06:55 UTC +++ 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/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 5388ea4..fdc21e5 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2017-03-09 20:05:30 UTC +--- v8/BUILD.gn.orig 2017-04-19 19:07:57 UTC +++ v8/BUILD.gn -@@ -2315,7 +2315,7 @@ v8_component("v8_libbase") { +@@ -2336,7 +2336,7 @@ v8_component("v8_libbase") { sources += [ "src/base/platform/platform-posix.cc" ] } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -2325,6 +2325,12 @@ v8_component("v8_libbase") { +@@ -2346,6 +2346,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -2458,6 +2464,7 @@ if (current_toolchain == v8_snapshot_too +@@ -2479,6 +2485,7 @@ if (current_toolchain == v8_snapshot_too sources = [ "src/snapshot/mksnapshot.cc", ] diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index a32e2fb..cdef6c4 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2017-03-09 20:05:30 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2017-04-19 19:07:57 UTC +++ v8/src/base/platform/platform-posix.cc @@ -27,6 +27,10 @@ #include <sys/sysctl.h> // NOLINT, for sysctl diff --git a/www/chromium/files/patch-v8_src_globals.h b/www/chromium/files/patch-v8_src_globals.h index 407f2dc..54aac95 100644 --- a/www/chromium/files/patch-v8_src_globals.h +++ b/www/chromium/files/patch-v8_src_globals.h @@ -1,4 +1,4 @@ ---- v8/src/globals.h.orig 2017-03-09 20:05:30 UTC +--- v8/src/globals.h.orig 2017-04-19 19:07:57 UTC +++ v8/src/globals.h @@ -183,7 +183,11 @@ const size_t kCodeRangeAreaAlignment = 2 const size_t kMaximalCodeRangeSize = 512 * MB; diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 2e4cfd8..3907dfb 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -74,7 +74,10 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/accelerometer-left.png %%DATADIR%%/resources/inspector/Images/accelerometer-right.png %%DATADIR%%/resources/inspector/Images/accelerometer-top.png -%%DATADIR%%/resources/inspector/Images/applicationCache.png +%%DATADIR%%/resources/inspector/Images/audits_logo.png +%%DATADIR%%/resources/inspector/Images/audits_logo_2x.png +%%DATADIR%%/resources/inspector/Images/audits_logo_bw.png +%%DATADIR%%/resources/inspector/Images/audits_logo_bw_2x.png %%DATADIR%%/resources/inspector/Images/breakpoint.png %%DATADIR%%/resources/inspector/Images/breakpointConditional.png %%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png @@ -88,19 +91,12 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png %%DATADIR%%/resources/inspector/Images/deleteIcon.png -%%DATADIR%%/resources/inspector/Images/domain.png %%DATADIR%%/resources/inspector/Images/errorWave.png %%DATADIR%%/resources/inspector/Images/errorWave_2x.png -%%DATADIR%%/resources/inspector/Images/fileSystem.png -%%DATADIR%%/resources/inspector/Images/forward.png -%%DATADIR%%/resources/inspector/Images/frame.png %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png -%%DATADIR%%/resources/inspector/Images/paneAddButtons.png -%%DATADIR%%/resources/inspector/Images/paneFilterButtons.png -%%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png %%DATADIR%%/resources/inspector/Images/profileIcon.png @@ -125,23 +121,23 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/searchPrev.png %%DATADIR%%/resources/inspector/Images/securityIcons.png %%DATADIR%%/resources/inspector/Images/securityIcons_2x.png -%%DATADIR%%/resources/inspector/Images/settingsListRemove.png -%%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png %%DATADIR%%/resources/inspector/Images/smallIcons.png %%DATADIR%%/resources/inspector/Images/smallIcons_2x.png %%DATADIR%%/resources/inspector/Images/speech.png %%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs.png %%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs_2x.png -%%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png -%%DATADIR%%/resources/inspector/Images/toolbarResizerHorizontal.png %%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/touchCursor.png %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png +%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.png +%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles_2x.png %%DATADIR%%/resources/inspector/InspectorBackendCommands.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js %%DATADIR%%/resources/inspector/Tests.js %%DATADIR%%/resources/inspector/accessibility/accessibility_module.js %%DATADIR%%/resources/inspector/animation/animation_module.js +%%DATADIR%%/resources/inspector/audits2_worker.js +%%DATADIR%%/resources/inspector/audits2_worker/audits2_worker_module.js %%DATADIR%%/resources/inspector/audits/audits_module.js %%DATADIR%%/resources/inspector/audits2/audits2_module.js %%DATADIR%%/resources/inspector/cm/cm_module.js @@ -149,7 +145,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js %%DATADIR%%/resources/inspector/console/console_module.js %%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js -%%DATADIR%%/resources/inspector/css_tracker/css_tracker_module.js +%%DATADIR%%/resources/inspector/coverage/coverage_module.js %%DATADIR%%/resources/inspector/data_grid/data_grid_module.js %%DATADIR%%/resources/inspector/devices/devices_module.js %%DATADIR%%/resources/inspector/devtools_compatibility.js @@ -193,6 +189,7 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +%%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js %%DATADIR%%/resources/inspector/formatter_worker.js %%DATADIR%%/resources/inspector/gonzales/gonzales_module.js %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js @@ -203,7 +200,9 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js %%DATADIR%%/resources/inspector/layers/layers_module.js %%DATADIR%%/resources/inspector/network/network_module.js +%%DATADIR%%/resources/inspector/network_group_lookup/network_group_lookup_module.js %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js +%%DATADIR%%/resources/inspector/product_registry/product_registry_module.js %%DATADIR%%/resources/inspector/profiler/profiler_module.js %%DATADIR%%/resources/inspector/quick_open/quick_open_module.js %%DATADIR%%/resources/inspector/resources/resources_module.js diff --git a/www/firefox-esr/files/patch-bug1359051 b/www/firefox-esr/files/patch-bug1359051 new file mode 100644 index 0000000..b4da1ca --- /dev/null +++ b/www/firefox-esr/files/patch-bug1359051 @@ -0,0 +1,31 @@ +commit fe7592e16fcc +Author: Sean Stangl <sstangl@mozilla.com> +Date: Mon Apr 24 07:10:58 2017 -0700 + + Bug 1359051 - Define cacheFlush for non-Simulator ARM64 builds. r=tcampbell +--- + js/src/jit/ExecutableAllocator.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h +index 3a42918142ef..570a25ff0dc3 100644 +--- js/src/jit/ExecutableAllocator.h ++++ js/src/jit/ExecutableAllocator.h +@@ -259,7 +259,7 @@ class ExecutableAllocator + { + __clear_cache(code, reinterpret_cast<char*>(code) + size); + } +-#elif defined(JS_CODEGEN_ARM) && defined(XP_IOS) ++#elif (defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)) && defined(XP_IOS) + static void cacheFlush(void* code, size_t size) + { + sys_icache_invalidate(code, size); +@@ -297,7 +297,7 @@ class ExecutableAllocator + : "r0", "r1", "r2"); + } + } +-#elif defined(JS_CODEGEN_ARM64) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__) ++#elif defined(JS_CODEGEN_ARM64) + static void cacheFlush(void* code, size_t size) + { + __clear_cache(code, (void *)((size_t)code + size)); diff --git a/www/firefox-esr/files/patch-bug1359142 b/www/firefox-esr/files/patch-bug1359142 new file mode 100644 index 0000000..b7998c5 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1359142 @@ -0,0 +1,57 @@ +Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64|MIPS) on BSDs + +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index 1ab76eeb4bd9..bcdff0487837 100644 +--- js/src/wasm/WasmSignalHandlers.cpp ++++ js/src/wasm/WasmSignalHandlers.cpp +@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault + # define R12_sig(p) ((p)->sc_r12) + # define R13_sig(p) ((p)->sc_r13) + # define R14_sig(p) ((p)->sc_r14) +-# define R15_sig(p) ((p)->sc_r15) ++# if defined(__arm__) ++# define R15_sig(p) ((p)->sc_pc) ++# else ++# define R15_sig(p) ((p)->sc_r15) ++# endif ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->sc_elr) ++# define RFP_sig(p) ((p)->sc_x[29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->sc_pc) ++# define RFP_sig(p) ((p)->sc_regs[30]) ++# endif + #elif defined(__linux__) || defined(SOLARIS) + # if defined(__linux__) + # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) +@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault + # define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13]) + # define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14]) + # define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15]) ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) ++# endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + # if defined(__DragonFly__) + # define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i]) +@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault + # else + # define R15_sig(p) ((p)->uc_mcontext.mc_r15) + # endif ++# if defined(__FreeBSD__) && defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29]) ++# endif ++# if defined(__FreeBSD__) && defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_pc) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++# endif + #elif defined(XP_DARWIN) + # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip) + # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 596737f..8b731a5 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 53.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/files/patch-bug1359051 b/www/firefox/files/patch-bug1359051 new file mode 100644 index 0000000..a9268b3 --- /dev/null +++ b/www/firefox/files/patch-bug1359051 @@ -0,0 +1,31 @@ +commit fe7592e16fcc +Author: Sean Stangl <sstangl@mozilla.com> +Date: Mon Apr 24 07:10:58 2017 -0700 + + Bug 1359051 - Define cacheFlush for non-Simulator ARM64 builds. r=tcampbell +--- + js/src/jit/ExecutableAllocator.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h +index 3a42918142ef..570a25ff0dc3 100644 +--- js/src/jit/ExecutableAllocator.h ++++ js/src/jit/ExecutableAllocator.h +@@ -259,7 +259,7 @@ class ExecutableAllocator + { + __clear_cache(code, reinterpret_cast<char*>(code) + size); + } +-#elif defined(JS_CODEGEN_ARM) && defined(XP_IOS) ++#elif (defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)) && defined(XP_IOS) + static void cacheFlush(void* code, size_t size) + { + sys_icache_invalidate(code, size); +@@ -297,7 +297,7 @@ class ExecutableAllocator + : "r0", "r1", "r2"); + } + } +-#elif defined(JS_CODEGEN_ARM64) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__) ++#elif defined(JS_CODEGEN_ARM64) + static void cacheFlush(void* code, size_t size) + { + vixl::CPU::EnsureIAndDCacheCoherency(code, size); diff --git a/www/firefox/files/patch-bug1359142 b/www/firefox/files/patch-bug1359142 new file mode 100644 index 0000000..b7998c5 --- /dev/null +++ b/www/firefox/files/patch-bug1359142 @@ -0,0 +1,57 @@ +Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64|MIPS) on BSDs + +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index 1ab76eeb4bd9..bcdff0487837 100644 +--- js/src/wasm/WasmSignalHandlers.cpp ++++ js/src/wasm/WasmSignalHandlers.cpp +@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault + # define R12_sig(p) ((p)->sc_r12) + # define R13_sig(p) ((p)->sc_r13) + # define R14_sig(p) ((p)->sc_r14) +-# define R15_sig(p) ((p)->sc_r15) ++# if defined(__arm__) ++# define R15_sig(p) ((p)->sc_pc) ++# else ++# define R15_sig(p) ((p)->sc_r15) ++# endif ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->sc_elr) ++# define RFP_sig(p) ((p)->sc_x[29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->sc_pc) ++# define RFP_sig(p) ((p)->sc_regs[30]) ++# endif + #elif defined(__linux__) || defined(SOLARIS) + # if defined(__linux__) + # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) +@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault + # define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13]) + # define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14]) + # define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15]) ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) ++# endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + # if defined(__DragonFly__) + # define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i]) +@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault + # else + # define R15_sig(p) ((p)->uc_mcontext.mc_r15) + # endif ++# if defined(__FreeBSD__) && defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29]) ++# endif ++# if defined(__FreeBSD__) && defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_pc) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++# endif + #elif defined(XP_DARWIN) + # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip) + # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp) diff --git a/www/libxul/files/patch-bug1359142 b/www/libxul/files/patch-bug1359142 new file mode 100644 index 0000000..8c7ab0a --- /dev/null +++ b/www/libxul/files/patch-bug1359142 @@ -0,0 +1,57 @@ +Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64|MIPS) on BSDs + +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index 1ab76eeb4bd9..bcdff0487837 100644 +--- js/src/asmjs/AsmJSSignalHandlers.cpp ++++ js/src/asmjs/AsmJSSignalHandlers.cpp +@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault + # define R12_sig(p) ((p)->sc_r12) + # define R13_sig(p) ((p)->sc_r13) + # define R14_sig(p) ((p)->sc_r14) +-# define R15_sig(p) ((p)->sc_r15) ++# if defined(__arm__) ++# define R15_sig(p) ((p)->sc_pc) ++# else ++# define R15_sig(p) ((p)->sc_r15) ++# endif ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->sc_elr) ++# define RFP_sig(p) ((p)->sc_x[29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->sc_pc) ++# define RFP_sig(p) ((p)->sc_regs[30]) ++# endif + #elif defined(__linux__) || defined(SOLARIS) + # if defined(__linux__) + # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) +@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault + # define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13]) + # define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14]) + # define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15]) ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) ++# endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + # if defined(__DragonFly__) + # define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i]) +@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault + # else + # define R15_sig(p) ((p)->uc_mcontext.mc_r15) + # endif ++# if defined(__FreeBSD__) && defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29]) ++# endif ++# if defined(__FreeBSD__) && defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_pc) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++# endif + #elif defined(XP_DARWIN) + # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip) + # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp) diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile index bdcffd5..15fb6a6 100644 --- a/www/py-flexget/Makefile +++ b/www/py-flexget/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flexget -PORTVERSION= 2.10.35 +PORTVERSION= 2.10.40 PORTEPOCH= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP diff --git a/www/py-flexget/distinfo b/www/py-flexget/distinfo index 22534ae..cd39895 100644 --- a/www/py-flexget/distinfo +++ b/www/py-flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492755289 -SHA256 (FlexGet-2.10.35.tar.gz) = b6fd18fa486968e578ba8ed2abfec6c9b7b220edfd0aa46f71e4824438ffb7f0 -SIZE (FlexGet-2.10.35.tar.gz) = 2677411 +TIMESTAMP = 1493360080 +SHA256 (FlexGet-2.10.40.tar.gz) = 7bafc92c6183963a9a2454f7a22437e4dd2e2b92caa961a8554e1c9e561548b3 +SIZE (FlexGet-2.10.40.tar.gz) = 2654633 diff --git a/www/seamonkey/files/patch-bug1359142 b/www/seamonkey/files/patch-bug1359142 new file mode 100644 index 0000000..6e5fc6e --- /dev/null +++ b/www/seamonkey/files/patch-bug1359142 @@ -0,0 +1,57 @@ +Define EPC_sig and RFP_sig for JS_CODEGEN_(ARM64|MIPS) on BSDs + +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index 1ab76eeb4bd9..bcdff0487837 100644 +--- mozilla/js/src/asmjs/WasmSignalHandlers.cpp ++++ mozilla/js/src/asmjs/WasmSignalHandlers.cpp +@@ -108,7 +108,19 @@ class AutoSetHandlingSegFault + # define R12_sig(p) ((p)->sc_r12) + # define R13_sig(p) ((p)->sc_r13) + # define R14_sig(p) ((p)->sc_r14) +-# define R15_sig(p) ((p)->sc_r15) ++# if defined(__arm__) ++# define R15_sig(p) ((p)->sc_pc) ++# else ++# define R15_sig(p) ((p)->sc_r15) ++# endif ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->sc_elr) ++# define RFP_sig(p) ((p)->sc_x[29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->sc_pc) ++# define RFP_sig(p) ((p)->sc_regs[30]) ++# endif + #elif defined(__linux__) || defined(SOLARIS) + # if defined(__linux__) + # define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i]) +@@ -171,6 +183,14 @@ class AutoSetHandlingSegFault + # define R13_sig(p) ((p)->uc_mcontext.__gregs[_REG_R13]) + # define R14_sig(p) ((p)->uc_mcontext.__gregs[_REG_R14]) + # define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15]) ++# if defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_X29]) ++# endif ++# if defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) ++# define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) ++# endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + # if defined(__DragonFly__) + # define XMM_sig(p,i) (((union savefpu*)(p)->uc_mcontext.mc_fpregs)->sv_xmm.sv_xmm[i]) +@@ -200,6 +220,14 @@ class AutoSetHandlingSegFault + # else + # define R15_sig(p) ((p)->uc_mcontext.mc_r15) + # endif ++# if defined(__FreeBSD__) && defined(__aarch64__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_elr) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_gpregs.gp_x[29]) ++# endif ++# if defined(__FreeBSD__) && defined(__mips__) ++# define EPC_sig(p) ((p)->uc_mcontext.mc_pc) ++# define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++# endif + #elif defined(XP_DARWIN) + # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip) + # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp) |
