kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

devel/electron18: update to 18.3.5

Browse source 
Changelog: https://github.com/electron/electron/releases/tag/v18.3.5
This commit is contained in:
Hiroki Tagato 2022-06-25 13:40:35 +09:00
parent 9568bb4e0b
commit 654ce132cd
8 changed files with 44 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/electron18/Makefile
View file

@ -152,7 +152,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
YARN_TIMESTAMP= 1655443613
YARN_TIMESTAMP= 1655950711
GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \

2
devel/electron18/Makefile.version
View file

@ -1,2 +1,2 @@
ELECTRON_VER= 18.3.4
ELECTRON_VER= 18.3.5
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}

10
devel/electron18/distinfo
View file

@ -1,14 +1,14 @@
TIMESTAMP = 1655444360
TIMESTAMP = 1655951956
SHA256 (electron/chromium-100.0.4896.160.tar.xz) = a3f755dff069c6fae3eb7f07b33c0dd3f0762fa82959f41c7bd347da8efbacff
SIZE (electron/chromium-100.0.4896.160.tar.xz) = 1228994280
SHA256 (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 9793d0cfb94bf2ff099682dcd31ef46d1d7f42346c8a2f6355a5f8fda3dcd506
SIZE (electron/aad6877c8cd3cff0ef1ba628d71acc981c520c29) = 12028653
SHA256 (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
SIZE (electron/cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb) = 26759650
SHA256 (electron/electron-yarn-cache-18.3.4.tar.xz) = 9205dcfef74cc613d31b2704ba8a96eb30544cc19ea13b9eddb8d956e98199fb
SIZE (electron/electron-yarn-cache-18.3.4.tar.xz) = 38391320
SHA256 (electron/electron-electron-v18.3.4_GH0.tar.gz) = b730e7c95d21da006265c9bc959116c290715f0db47c2514b453214f5a1fd982
SIZE (electron/electron-electron-v18.3.4_GH0.tar.gz) = 10209257
SHA256 (electron/electron-yarn-cache-18.3.5.tar.xz) = 1988270c5c46db027718bd917f5fe4d0bcd7e5079aa57b72af22eadb964ff886
SIZE (electron/electron-yarn-cache-18.3.5.tar.xz) = 38392736
SHA256 (electron/electron-electron-v18.3.5_GH0.tar.gz) = ed9144b6e10c6f1c77adc4735606042cc4ea13c34a99abcafc965a0a5013c825
SIZE (electron/electron-electron-v18.3.5_GH0.tar.gz) = 10236502
SHA256 (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 93c65be15bfe8151b4a99d529538b23ffc6b5e0202dc7df0e32aa780ab49ad97
SIZE (electron/nodejs-node-v16.13.2_GH0.tar.gz) = 87972240
SHA256 (electron/nodejs-nan-65b32af46e9d7fab2e4ff657751205b3865f4920_GH0.tar.gz) = a649b75bfa9c1a0254c73d022c6e98924b9471f593bcc83832daaf68da4cae8d

2
devel/electron18/files/package.json
View file

@ -1,6 +1,6 @@
{
"name": "electron",
"version": "18.3.4",
"version": "18.3.5",
"repository": "https://github.com/electron/electron",
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
"devDependencies": {

16
devel/electron18/files/patch-electron_BUILD.gn
View file

@ -1,6 +1,6 @@
--- electron/BUILD.gn.orig 2022-05-18 15:31:32 UTC
--- electron/BUILD.gn.orig 2022-06-22 15:31:20 UTC
+++ electron/BUILD.gn
@@ -444,7 +444,7 @@ source_set("electron_lib") {
@@ -447,7 +447,7 @@ source_set("electron_lib") {
defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
}
@ -9,7 +9,7 @@
deps += [
"//components/crash/core/app",
"//components/crash/core/browser",
@@ -486,6 +486,10 @@ source_set("electron_lib") {
@@ -489,6 +489,10 @@ source_set("electron_lib") {
]
}
@ -20,7 +20,7 @@
if (is_mac) {
deps += [
"//components/remote_cocoa/app_shim",
@@ -540,6 +544,12 @@ source_set("electron_lib") {
@@ -543,6 +547,12 @@ source_set("electron_lib") {
cflags_objcc = [ "-fobjc-weak" ]
}
}
@ -33,7 +33,7 @@
if (is_linux) {
libs = [ "xshmfence" ]
deps += [
@@ -1182,7 +1192,7 @@ if (is_mac) {
@@ -1185,7 +1195,7 @@ if (is_mac) {
":electron_app_manifest",
":electron_lib",
":packed_resources",
@ -42,7 +42,7 @@
"//content:sandbox_helper_win",
"//electron/buildflags",
"//ui/strings",
@@ -1208,7 +1218,7 @@ if (is_mac) {
@@ -1211,7 +1221,7 @@ if (is_mac) {
public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
}
@ -51,7 +51,7 @@
data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ]
}
@@ -1276,7 +1286,7 @@ if (is_mac) {
@@ -1279,7 +1289,7 @@ if (is_mac) {
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
@ -60,7 +60,7 @@
deps += [ "//sandbox/linux:chrome_sandbox" ]
}
}
@@ -1412,7 +1422,7 @@ dist_zip("electron_dist_zip") {
@@ -1415,7 +1425,7 @@ dist_zip("electron_dist_zip") {
":electron_version",
":licenses",
]

6
devel/electron18/files/patch-electron_shell_browser_electron__browser__main__parts.cc
View file

@ -1,4 +1,4 @@
--- electron/shell/browser/electron_browser_main_parts.cc.orig 2022-05-25 15:32:14 UTC
--- electron/shell/browser/electron_browser_main_parts.cc.orig 2022-06-22 15:31:20 UTC
+++ electron/shell/browser/electron_browser_main_parts.cc
@@ -64,7 +64,7 @@
#include "ui/wm/core/wm_state.h"
@ -72,7 +72,7 @@
auto linux_ui = BuildGtkUi();
linux_ui->Initialize();
DCHECK(ui::LinuxInputMethodContextFactory::instance());
@@ -477,7 +477,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
@@ -481,7 +481,9 @@ void ElectronBrowserMainParts::PostCreateMainMessageLo
ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop(
std::move(shutdown_cb));
bluez::DBusBluezManagerWrapperLinux::Initialize();
@ -82,7 +82,7 @@
// Set up crypt config. This needs to be done before anything starts the
// network service, as the raw encryption key needs to be shared with the
// network service for encrypted cookie storage.
@@ -536,7 +538,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
@@ -540,7 +542,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun(
fake_browser_process_->PostMainMessageLoopRun();
content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();

22
devel/electron18/files/patch-electron_spec-main_api-browser-window-spec.ts
View file

@ -1,4 +1,4 @@
--- electron/spec-main/api-browser-window-spec.ts.orig 2022-06-15 15:31:31 UTC
--- electron/spec-main/api-browser-window-spec.ts.orig 2022-06-22 15:31:20 UTC
+++ electron/spec-main/api-browser-window-spec.ts
@@ -60,7 +60,7 @@ describe('BrowserWindow module', () => {
}).not.to.throw();
@ -54,7 +54,7 @@
it('checks normal bounds when minimized', async () => {
const bounds = w.getBounds();
const minimize = emittedOnce(w, 'minimize');
@@ -2215,7 +2215,7 @@ describe('BrowserWindow module', () => {
@@ -2251,7 +2251,7 @@ describe('BrowserWindow module', () => {
describe('BrowserWindow.setOpacity(opacity)', () => {
afterEach(closeAllWindows);
@ -63,7 +63,7 @@
it('make window with initial opacity', () => {
const w = new BrowserWindow({ show: false, opacity: 0.5 });
expect(w.getOpacity()).to.equal(0.5);
@@ -2241,7 +2241,7 @@ describe('BrowserWindow module', () => {
@@ -2277,7 +2277,7 @@ describe('BrowserWindow module', () => {
});
});
@ -72,7 +72,7 @@
it('sets 1 regardless of parameter', () => {
const w = new BrowserWindow({ show: false });
w.setOpacity(0);
@@ -3047,7 +3047,7 @@ describe('BrowserWindow module', () => {
@@ -3083,7 +3083,7 @@ describe('BrowserWindow module', () => {
expect(test.versions).to.deep.equal(process.versions);
expect(test.contextId).to.be.a('string');
@ -81,7 +81,7 @@
expect(test.creationTime).to.be.null('creation time');
expect(test.systemMemoryInfo).to.be.null('system memory info');
} else {
@@ -3620,7 +3620,7 @@ describe('BrowserWindow module', () => {
@@ -3656,7 +3656,7 @@ describe('BrowserWindow module', () => {
});
});
@ -90,7 +90,7 @@
afterEach(closeAllWindows);
it('emits an event when window is maximized', async () => {
const w = new BrowserWindow({ show: false });
@@ -3879,7 +3879,7 @@ describe('BrowserWindow module', () => {
@@ -3915,7 +3915,7 @@ describe('BrowserWindow module', () => {
});
// TODO(dsanders11): Enable once maximize event works on Linux again on CI
@ -99,7 +99,7 @@
afterEach(closeAllWindows);
it('should show the window if it is not currently shown', async () => {
const w = new BrowserWindow({ show: false });
@@ -3916,7 +3916,7 @@ describe('BrowserWindow module', () => {
@@ -3952,7 +3952,7 @@ describe('BrowserWindow module', () => {
// TODO(dsanders11): Enable once minimize event works on Linux again.
// See https://github.com/electron/electron/issues/28699
@ -108,7 +108,7 @@
const w = new BrowserWindow();
const minimize = emittedOnce(w, 'minimize');
w.minimize();
@@ -4271,7 +4271,7 @@ describe('BrowserWindow module', () => {
@@ -4307,7 +4307,7 @@ describe('BrowserWindow module', () => {
});
// On Linux there is no "resizable" property of a window.
@ -117,7 +117,7 @@
const w = new BrowserWindow({ show: false });
expect(w.resizable).to.be.true('resizable');
@@ -4363,7 +4363,7 @@ describe('BrowserWindow module', () => {
@@ -4399,7 +4399,7 @@ describe('BrowserWindow module', () => {
});
});
@ -126,7 +126,7 @@
// Not implemented on Linux.
afterEach(closeAllWindows);
@@ -5287,7 +5287,7 @@ describe('BrowserWindow module', () => {
@@ -5323,7 +5323,7 @@ describe('BrowserWindow module', () => {
});
// Linux and arm64 platforms (WOA and macOS) do not return any capture sources
@ -135,7 +135,7 @@
const display = screen.getPrimaryDisplay();
const backgroundWindow = new BrowserWindow({
@@ -5329,7 +5329,7 @@ describe('BrowserWindow module', () => {
@@ -5365,7 +5365,7 @@ describe('BrowserWindow module', () => {
afterEach(closeAllWindows);
// Linux and arm64 platforms (WOA and macOS) do not return any capture sources

25
devel/electron18/files/patch-ui_gtk_gtk__compat.cc
View file

@ -1,6 +1,6 @@
--- ui/gtk/gtk_compat.cc.orig 2022-05-11 07:17:07 UTC
--- ui/gtk/gtk_compat.cc.orig 2022-06-23 06:01:33 UTC
+++ ui/gtk/gtk_compat.cc
@@ -62,27 +62,47 @@ auto DlCast(void* symbol) {
@@ -62,22 +62,38 @@ auto DlCast(void* symbol) {
}
void* GetLibGio() {
@ -12,15 +12,6 @@
return libgio;
}
void* GetLibGdkPixbuf() {
+#if defined(OS_BSD)
+ static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so");
+#else
static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
+#endif
return libgdk_pixbuf;
}
void* GetLibGdk3() {
+#if defined(OS_BSD)
+ static void* libgdk3 = DlOpen("libgdk-3.so");
@ -48,3 +39,15 @@
return libgtk4;
}
@@ -123,7 +139,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& borde
} // namespace
void* GetLibGdkPixbuf() {
+#if defined(OS_BSD)
+ static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so");
+#else
static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
+#endif
return libgdk_pixbuf;
}