diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 978a82c49b0..7cc6d85cdc0 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 3aa7942f5f787b540500bde0ba9517ed05541082..05f435dd600e5c05490fbc97a6686dab8a9a37cc 100644 +index c7b7940e5ba1e9fab0368ebdadd6febce0e38ab4..05f435dd600e5c05490fbc97a6686dab8a9a37cc 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=102 -MINOR=0 --BUILD=4987 +-BUILD=4991 -PATCH=0 +MINOR=1 +BUILD=40 diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch index 753ea62e381..c01e3a10632 100644 --- a/patches/chrome-installer-linux-BUILD.gn.patch +++ b/patches/chrome-installer-linux-BUILD.gn.patch @@ -1,16 +1,16 @@ diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn -index fbc20f5d65c1bb7006f1feb8266d44d1b676bc4d..dcf131ff3611ebced336701fcea03c83c9f2aeff 100644 +index 3f0414a3ee4011541275bf93662c5b889d2ae0c4..62226eb6bc4c4af0ce08e3d94a78b1424db167c1 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn -@@ -92,6 +92,7 @@ if (build_with_internal_optimization_guide) { +@@ -88,6 +88,7 @@ if (build_with_internal_optimization_guide) { [ "$root_out_dir/liboptimization_guide_internal.so" ] } +packaging_files_executables -= excluded_packaging_files_executables packaging_files_executables += brave_packaging_files_executables packaging_files_binaries = packaging_files_executables + packaging_files_shlibs - copy("swiftshader_libs") { -@@ -192,6 +193,7 @@ action("merge_rpm_dependencies") { + # TODO(mmoss) Any convenient way to get all the relevant build files? +@@ -176,6 +177,7 @@ action("merge_rpm_dependencies") { strip_binary("strip_chrome_binary") { binary_input = "$root_out_dir/chrome" deps = [ "//chrome" ] @@ -18,7 +18,7 @@ index fbc20f5d65c1bb7006f1feb8266d44d1b676bc4d..dcf131ff3611ebced336701fcea03c83 } strip_binary("strip_chrome_crashpad_handler") { -@@ -207,6 +209,7 @@ strip_binary("strip_chrome_management_service") { +@@ -191,6 +193,7 @@ strip_binary("strip_chrome_management_service") { strip_binary("strip_chrome_sandbox") { binary_input = "$root_out_dir/chrome_sandbox" deps = [ "//sandbox/linux:chrome_sandbox" ] @@ -26,7 +26,7 @@ index fbc20f5d65c1bb7006f1feb8266d44d1b676bc4d..dcf131ff3611ebced336701fcea03c83 } strip_binary("strip_libEGL_shlib") { -@@ -308,6 +311,7 @@ copy("common_packaging_files") { +@@ -281,6 +284,7 @@ copy("common_packaging_files") { } sources += [ "//buildtools/third_party/eu-strip/bin/eu-strip" ] @@ -34,7 +34,7 @@ index fbc20f5d65c1bb7006f1feb8266d44d1b676bc4d..dcf131ff3611ebced336701fcea03c83 outputs = [ "$root_out_dir/installer/common/{{source_file_part}}" ] } -@@ -408,6 +412,7 @@ group("installer_deps") { +@@ -381,6 +385,7 @@ group("installer_deps") { "//components/crash/core/app:chrome_crashpad_handler", "//sandbox/linux:chrome_sandbox", ] @@ -42,7 +42,7 @@ index fbc20f5d65c1bb7006f1feb8266d44d1b676bc4d..dcf131ff3611ebced336701fcea03c83 if (enable_nacl) { public_deps += [ ":strip_nacl_helper", -@@ -465,6 +470,9 @@ group("installer_deps") { +@@ -435,6 +440,9 @@ group("installer_deps") { template("linux_package") { assert(defined(invoker.channel)) channel = invoker.channel @@ -52,7 +52,7 @@ index fbc20f5d65c1bb7006f1feb8266d44d1b676bc4d..dcf131ff3611ebced336701fcea03c83 if (is_chrome_branded) { package = "google-chrome" -@@ -628,3 +636,6 @@ linux_package("beta") { +@@ -598,3 +606,6 @@ linux_package("beta") { linux_package("unstable") { channel = "unstable" } diff --git a/patches/third_party-blink-renderer-platform-fonts-font_fallback_list.cc.patch b/patches/third_party-blink-renderer-platform-fonts-font_fallback_list.cc.patch index 2480e7fc56a..1ca71bd9a1a 100644 --- a/patches/third_party-blink-renderer-platform-fonts-font_fallback_list.cc.patch +++ b/patches/third_party-blink-renderer-platform-fonts-font_fallback_list.cc.patch @@ -1,12 +1,12 @@ diff --git a/third_party/blink/renderer/platform/fonts/font_fallback_list.cc b/third_party/blink/renderer/platform/fonts/font_fallback_list.cc -index 4c9aea8382f49fbd6119a69c54bce3e5472b406d..6fcdd469e9908c5a62f807708e637bd6a30ae1e0 100644 +index f6a360913eb603c17e9cb5edf27c419c49ecfaed..221fa5f0fb0ba06d7a9c747855b7dc6bc2b2551c 100644 --- a/third_party/blink/renderer/platform/fonts/font_fallback_list.cc +++ b/third_party/blink/renderer/platform/fonts/font_fallback_list.cc -@@ -175,6 +175,7 @@ scoped_refptr FontFallbackList::GetFontData( - GetFontSelector()->ReportFontLookupByUniqueOrFamilyName( - curr_family->FamilyName(), font_description, - DynamicTo(result.get())); -+ BRAVE_GET_FONT_DATA - } +@@ -178,6 +178,7 @@ scoped_refptr FontFallbackList::GetFontData( + GetFontSelector()->ReportFontLookupByUniqueOrFamilyName( + curr_family->FamilyName(), font_description, + DynamicTo(result.get())); ++ BRAVE_GET_FONT_DATA } if (result) { + GetFontSelector()->ReportSuccessfulFontFamilyMatch(