diff options
Diffstat (limited to 'devel/electron36/files')
4 files changed, 40 insertions, 22 deletions
diff --git a/devel/electron36/files/patch-electron_BUILD.gn b/devel/electron36/files/patch-electron_BUILD.gn index 1e399556d7df..877b28360e82 100644 --- a/devel/electron36/files/patch-electron_BUILD.gn +++ b/devel/electron36/files/patch-electron_BUILD.gn @@ -1,6 +1,6 @@ ---- electron/BUILD.gn.orig 2025-08-18 21:37:48 UTC +--- electron/BUILD.gn.orig 2025-09-08 12:48:33 UTC +++ electron/BUILD.gn -@@ -547,7 +547,7 @@ source_set("electron_lib") { +@@ -548,7 +548,7 @@ source_set("electron_lib") { defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/browser", -@@ -640,6 +640,12 @@ source_set("electron_lib") { +@@ -641,6 +641,12 @@ source_set("electron_lib") { cflags_objcc = [ "-fobjc-weak" ] } } @@ -22,7 +22,7 @@ if (is_linux) { libs = [ "xshmfence" ] deps += [ -@@ -1218,7 +1224,7 @@ if (is_mac) { +@@ -1219,7 +1225,7 @@ if (is_mac) { ":electron_lib", ":electron_win32_resources", ":packed_resources", @@ -31,7 +31,7 @@ "//content:sandbox_helper_win", "//electron/buildflags", "//third_party/electron_node:libnode", -@@ -1245,7 +1251,7 @@ if (is_mac) { +@@ -1246,7 +1252,7 @@ if (is_mac) { public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ] } @@ -40,7 +40,7 @@ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -1312,7 +1318,7 @@ if (is_mac) { +@@ -1313,7 +1319,7 @@ if (is_mac) { configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } @@ -49,12 +49,14 @@ deps += [ "//sandbox/linux:chrome_sandbox" ] } } -@@ -1420,7 +1426,7 @@ dist_zip("electron_dist_zip") { - ":electron_version_file", - ":licenses", - ] -- if (is_linux) { -+ if (is_linux && !is_bsd) { - data_deps += [ "//sandbox/linux:chrome_sandbox" ] +@@ -1434,7 +1440,9 @@ dist_zip("electron_dist_zip") { + ] + } + +- data_deps += [ "//sandbox/linux:chrome_sandbox" ] ++ if (!is_bsd) { ++ data_deps += [ "//sandbox/linux:chrome_sandbox" ] ++ } } deps = data_deps + outputs = [ "$root_build_dir/dist.zip" ] diff --git a/devel/electron36/files/patch-electron_shell_services_node_node__service.cc b/devel/electron36/files/patch-electron_shell_services_node_node__service.cc index 51fe435d783f..e30819eff56e 100644 --- a/devel/electron36/files/patch-electron_shell_services_node_node__service.cc +++ b/devel/electron36/files/patch-electron_shell_services_node_node__service.cc @@ -1,6 +1,6 @@ ---- electron/shell/services/node/node_service.cc.orig 2025-01-29 20:10:57 UTC +--- electron/shell/services/node/node_service.cc.orig 2025-09-08 12:48:33 UTC +++ electron/shell/services/node/node_service.cc -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "shell/common/node_includes.h" #include "shell/services/node/parent_port.h" @@ -9,7 +9,7 @@ #include "shell/common/crash_keys.h" #endif -@@ -39,7 +39,7 @@ void V8FatalErrorCallback(const char* location, const +@@ -40,7 +40,7 @@ void V8FatalErrorCallback(const char* location, const g_client_remote->OnV8FatalError(location, outstream.str()); } diff --git a/devel/electron36/files/patch-electron_spec_api-tray-spec.ts b/devel/electron36/files/patch-electron_spec_api-tray-spec.ts index cb822fdca402..2116612eaff6 100644 --- a/devel/electron36/files/patch-electron_spec_api-tray-spec.ts +++ b/devel/electron36/files/patch-electron_spec_api-tray-spec.ts @@ -1,5 +1,21 @@ ---- electron/spec/api-tray-spec.ts.orig 2024-10-09 13:53:06 UTC +--- electron/spec/api-tray-spec.ts.orig 2025-09-08 12:48:33 UTC +++ electron/spec/api-tray-spec.ts +@@ -30,13 +30,13 @@ describe('tray module', () => { + }).to.throw(/Failed to load image from path (.+)/); + }); + +- ifit(process.platform !== 'linux')('throws a descriptive error if an invalid guid is given', () => { ++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('throws a descriptive error if an invalid guid is given', () => { + expect(() => { + tray = new Tray(nativeImage.createEmpty(), 'I am not a guid'); + }).to.throw('Invalid GUID format'); + }); + +- ifit(process.platform !== 'linux')('accepts a valid guid', () => { ++ ifit(process.platform !== 'linux' && process.platform !== 'freebsd')('accepts a valid guid', () => { + expect(() => { + tray = new Tray(nativeImage.createEmpty(), '0019A433-3526-48BA-A66C-676742C0FEFB'); + }).to.not.throw(); @@ -131,7 +131,7 @@ describe('tray module', () => { describe('tray.getBounds()', () => { afterEach(() => { tray.destroy(); }); diff --git a/devel/electron36/files/patch-net_dns_BUILD.gn b/devel/electron36/files/patch-net_dns_BUILD.gn index e1fd322aea84..9cc82b31ad6e 100644 --- a/devel/electron36/files/patch-net_dns_BUILD.gn +++ b/devel/electron36/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +--- net/dns/BUILD.gn.orig 2025-09-14 07:58:52 UTC +++ net/dns/BUILD.gn -@@ -138,7 +138,7 @@ source_set("dns") { +@@ -140,7 +140,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -172,6 +172,9 @@ source_set("dns") { +@@ -174,6 +174,9 @@ source_set("dns") { } deps = [ "//net:net_deps" ] @@ -19,7 +19,7 @@ public_deps = [ ":dns_client", -@@ -179,6 +182,7 @@ source_set("dns") { +@@ -181,6 +184,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -27,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -447,9 +451,9 @@ source_set("tests") { +@@ -452,9 +456,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] |