From 2fff32bf3cdadb5fbd17a59dc9be983a9d0d9487 Mon Sep 17 00:00:00 2001 From: Hiroki Tagato Date: Fri, 28 Jul 2023 18:16:48 +0900 Subject: devel/electron25: update to 25.3.2 Changelog: https://github.com/electron/electron/releases/tag/v25.3.2 Reported by: GitHub (watch releases) (cherry picked from commit 959ab8d38f30cb0e87e153bec93f1d000b3298c8) --- devel/electron25/Makefile | 6 +++--- devel/electron25/Makefile.version | 2 +- devel/electron25/distinfo | 14 +++++++------- .../files/patch-electron_shell_browser_native__window.cc | 8 ++++---- .../electron25/files/patch-electron_spec_chromium-spec.ts | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/devel/electron25/Makefile b/devel/electron25/Makefile index 2c29ffba43ca..7a9d0d582ea0 100644 --- a/devel/electron25/Makefile +++ b/devel/electron25/Makefile @@ -2,7 +2,7 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} CATEGORIES= devel -MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v25.3.1/:chromium \ +MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v25.3.2/:chromium \ https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \ https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR} @@ -207,7 +207,7 @@ SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER -CHROMIUM_VER= 114.0.5735.243 +CHROMIUM_VER= 114.0.5735.248 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH CHROMIUM_NODE_MODULES_HASH= de0af8ec3401004cd1a420ab25892880330464c8 # See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH @@ -223,7 +223,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76 # See ${WRKSRC}/electron/DEPS for MANTLE_VER MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948 -YARN_TIMESTAMP= 1689920505 +YARN_TIMESTAMP= 1690458722 .include "Makefile.version" .include diff --git a/devel/electron25/Makefile.version b/devel/electron25/Makefile.version index 02856a3b8b67..5d37a7b44fa8 100644 --- a/devel/electron25/Makefile.version +++ b/devel/electron25/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 25.3.1 +ELECTRON_VER= 25.3.2 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron25/distinfo b/devel/electron25/distinfo index f9454c9b85d4..1984b89ca0fe 100644 --- a/devel/electron25/distinfo +++ b/devel/electron25/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1689924314 -SHA256 (electron/chromium-114.0.5735.243.tar.xz) = 59d3d13796599a22638274a85c77fb4bf273e995ab3c3054314803fc8cbaf225 -SIZE (electron/chromium-114.0.5735.243.tar.xz) = 1414281296 +TIMESTAMP = 1690459296 +SHA256 (electron/chromium-114.0.5735.248.tar.xz) = a2401bc4dcbc53662071120bfc946408ca555be9250ec9b7bd68025303940a17 +SIZE (electron/chromium-114.0.5735.248.tar.xz) = 1414185000 SHA256 (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 401097f07b4feb3e03ce7c2412e978b32aea5334f4fbaf26f873e60e8bb92647 SIZE (electron/de0af8ec3401004cd1a420ab25892880330464c8) = 8880520 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-25.3.1.tar.xz) = 9282b310822d9a782b34fd8b8e7e49aee2472c678ae26a88d634039c4b3e6bfa -SIZE (electron/electron-yarn-cache-25.3.1.tar.xz) = 41289008 -SHA256 (electron/electron-electron-v25.3.1_GH0.tar.gz) = 10fbdf0a327ec6567c5d3e1712225c6543ce3bde5eb5dba7929b61d9aa3e9f32 -SIZE (electron/electron-electron-v25.3.1_GH0.tar.gz) = 11270244 +SHA256 (electron/electron-yarn-cache-25.3.2.tar.xz) = cb36f72f96a1b13528df0572621aafa5f1d1d907081e61fa55453422393efc53 +SIZE (electron/electron-yarn-cache-25.3.2.tar.xz) = 41288772 +SHA256 (electron/electron-electron-v25.3.2_GH0.tar.gz) = 7f4171ba8ebcf0e9ce09c54691a57ac2e5e4fcac7699a27e99d6443a7ba0b685 +SIZE (electron/electron-electron-v25.3.2_GH0.tar.gz) = 11273260 SHA256 (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 33c4b5b77c98398a3c0d99a146f602d164e014ff3a5713697beef1a971faf573 SIZE (electron/nodejs-node-v18.15.0_GH0.tar.gz) = 111925667 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron25/files/patch-electron_shell_browser_native__window.cc b/devel/electron25/files/patch-electron_shell_browser_native__window.cc index 74c6be10e6f8..d8099d8071b3 100644 --- a/devel/electron25/files/patch-electron_shell_browser_native__window.cc +++ b/devel/electron25/files/patch-electron_shell_browser_native__window.cc @@ -1,4 +1,4 @@ ---- electron/shell/browser/native_window.cc.orig 2023-07-19 13:20:24 UTC +--- electron/shell/browser/native_window.cc.orig 2023-07-26 13:27:22 UTC +++ electron/shell/browser/native_window.cc @@ -197,7 +197,7 @@ void NativeWindow::InitFromOptions(const gin_helper::D } else { @@ -6,6 +6,6 @@ } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool resizable; - if (options.Get(options::kResizable, &resizable)) { - SetResizable(resizable); + bool closable; + if (options.Get(options::kClosable, &closable)) { + SetClosable(closable); diff --git a/devel/electron25/files/patch-electron_spec_chromium-spec.ts b/devel/electron25/files/patch-electron_spec_chromium-spec.ts index cfc0037995fe..6734c4850b8e 100644 --- a/devel/electron25/files/patch-electron_spec_chromium-spec.ts +++ b/devel/electron25/files/patch-electron_spec_chromium-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/chromium-spec.ts.orig 2023-07-19 13:20:24 UTC +--- electron/spec/chromium-spec.ts.orig 2023-07-26 13:27:22 UTC +++ electron/spec/chromium-spec.ts @@ -470,13 +470,13 @@ describe('command line switches', () => { it('should not set an invalid locale', async () => testLocale('asdfkl', `${currentLocale}|${currentSystemLocale}|${currentPreferredLanguages}`)); @@ -18,7 +18,7 @@ }); describe('--remote-debugging-pipe switch', () => { -@@ -2324,12 +2324,12 @@ describe('font fallback', () => { +@@ -2412,12 +2412,12 @@ describe('font fallback', () => { expect(fonts[0].familyName).to.equal('Arial'); } else if (process.platform === 'darwin') { expect(fonts[0].familyName).to.equal('Helvetica'); @@ -33,7 +33,7 @@ const html = ` -@@ -2723,7 +2723,7 @@ describe('navigator.clipboard.write', () => { +@@ -2811,7 +2811,7 @@ describe('navigator.clipboard.write', () => { }); }); -- cgit v1.2.3