Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d0acb9af authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Patches for v148 (no changes, context changed)

parent 0bf212cf

build/patches/Allow-building-without-supervised-users.patch

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -839,7 +839,6 @@ if (_is_default_toolchain) {

@@ -840,7 +840,6 @@ if (_is_default_toolchain) {

       "//components/offline_pages/core:offline_page_model_enums_java",

       "//components/sharing_message:sharing_dialog_type_generated_enum",

       "//components/sharing_message:sharing_send_message_result_generated_enum",

build/patches/Cromite-Branding.patch

+1 −1
Original line number Diff line number Diff line
@@ -18484,7 +18484,7 @@ i?Ib$(ofrX17!1R|`h|N%TnD<%35@j2bgPM^i2nno*_EOI 
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc

--- a/components/omnibox/browser/autocomplete_controller.cc

+++ b/components/omnibox/browser/autocomplete_controller.cc

@@ -1156,6 +1156,7 @@ bool AutocompleteController::ShouldRunProvider(

@@ -1158,6 +1158,7 @@ bool AutocompleteController::ShouldRunProvider(

 

 #if BUILDFLAG(IS_ANDROID)

   if (omnibox::IsAndroidHub(input_.current_page_classification())) {

build/patches/Disable-safety-check.patch

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn 
       "//chrome/browser/safety_hub/android:java",

       "//chrome/browser/search_engines/android:java",

       "//chrome/browser/segmentation_platform:client_util_java",

@@ -1172,8 +1171,6 @@ if (_is_default_toolchain) {

@@ -1173,8 +1172,6 @@ if (_is_default_toolchain) {

       "//chrome/browser/recent_tabs:junit",

       "//chrome/browser/recent_tabs/internal:junit",

       "//chrome/browser/safe_browsing/android:junit",
@@ -41,7 +41,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn 
       "//chrome/browser/search_engines/android:junit",

       "//chrome/browser/serial/android:junit",

       "//chrome/browser/signin/services/android:junit",

@@ -1492,8 +1489,6 @@ if (_is_default_toolchain) {

@@ -1493,8 +1490,6 @@ if (_is_default_toolchain) {

       "//chrome/browser/quick_delete:javatests",

       "//chrome/browser/renderer_host/android:javatests",

       "//chrome/browser/safe_browsing/android:javatests",

build/patches/Do-not-compile-QR-code-sharing.patch

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -2953,7 +2953,6 @@ if (_is_default_toolchain) {

@@ -2954,7 +2954,6 @@ if (_is_default_toolchain) {

       "../browser/share/android/java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextBridge.java",

       "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",

       "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",

build/patches/Enable-ClientHello-Segmentation.patch

+4 −4
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h 
diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc

--- a/net/socket/ssl_client_socket_impl.cc

+++ b/net/socket/ssl_client_socket_impl.cc

@@ -327,6 +327,10 @@ void SSLClientSocketImpl::SetSSLKeyLogger(

@@ -336,6 +336,10 @@ void SSLClientSocketImpl::SetSSLKeyLogger(

   SSLContext::GetInstance()->SetSSLKeyLogger(std::move(logger));

 }
@@ -155,7 +155,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket 
 std::vector<uint8_t> SSLClientSocketImpl::GetECHRetryConfigs() {

   const uint8_t* retry_configs;

   size_t retry_configs_len;

@@ -394,6 +398,10 @@ int SSLClientSocketImpl::Connect(CompletionOnceCallback callback) {

@@ -403,6 +407,10 @@ int SSLClientSocketImpl::Connect(CompletionOnceCallback callback) {

     return rv;

   }
@@ -166,7 +166,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket 
   // Set SSL to client mode. Handshake happens in the loop below.

   SSL_set_connect_state(ssl_.get());

 

@@ -925,6 +933,7 @@ int SSLClientSocketImpl::DoHandshake() {

@@ -934,6 +942,7 @@ int SSLClientSocketImpl::DoHandshake() {

 

   int rv = SSL_do_handshake(ssl_.get());

   int net_error = OK;
@@ -174,7 +174,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket 
   if (rv <= 0) {

     int ssl_error = SSL_get_error(ssl_.get(), rv);

     if (ssl_error == SSL_ERROR_WANT_X509_LOOKUP && !send_client_cert_) {

@@ -950,8 +959,11 @@ int SSLClientSocketImpl::DoHandshake() {

@@ -959,8 +968,11 @@ int SSLClientSocketImpl::DoHandshake() {

       return ERR_IO_PENDING;

     }