Skip to content

Commit

Permalink
devel/electron26: update to 26.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tagattie committed Sep 16, 2023
1 parent 1e0071d commit 2649b98
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 18 deletions.
4 changes: 2 additions & 2 deletions devel/electron26/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,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= 116.0.5845.179
CHROMIUM_VER= 116.0.5845.188
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286
# See ${WRKSRC}/electron/DEPS for NODE_VER
Expand All @@ -228,7 +228,7 @@ REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948

YARN_TIMESTAMP= 1694075460
YARN_TIMESTAMP= 1694838685

.include "Makefile.version"
.include <bsd.port.pre.mk>
Expand Down
2 changes: 1 addition & 1 deletion devel/electron26/Makefile.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ELECTRON_VER= 26.2.0
ELECTRON_VER= 26.2.1
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
14 changes: 7 additions & 7 deletions devel/electron26/distinfo
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
TIMESTAMP = 1694076119
SHA256 (electron/chromium-116.0.5845.179.tar.xz) = 8bf9b56381bfeb960a2d8c0dd130253820701fb49c12e52fa4d697ac11896025
SIZE (electron/chromium-116.0.5845.179.tar.xz) = 1599723164
TIMESTAMP = 1694839025
SHA256 (electron/chromium-116.0.5845.188.tar.xz) = c7c84340e29edd3526a6ded30307d0af1bdb94ef55aa9b44a75bc45731d7567c
SIZE (electron/chromium-116.0.5845.188.tar.xz) = 1599722120
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
SHA256 (electron/electron-yarn-cache-26.2.0.tar.xz) = 7ca2dca7357ff72f05a52ebbe22e6765de71a777064adb05bc06e773e35c8815
SIZE (electron/electron-yarn-cache-26.2.0.tar.xz) = 32345404
SHA256 (electron/electron-electron-v26.2.0_GH0.tar.gz) = 148bd1e10eda0d4b1d1ffc1bba76dd4ef99dea4b8750d9c87e0a49fb03757645
SIZE (electron/electron-electron-v26.2.0_GH0.tar.gz) = 11284579
SHA256 (electron/electron-yarn-cache-26.2.1.tar.xz) = 40c0e66d130f12441888b86c49ee10d58063cad472fd4d69338c06f9f1a47674
SIZE (electron/electron-yarn-cache-26.2.1.tar.xz) = 32344636
SHA256 (electron/electron-electron-v26.2.1_GH0.tar.gz) = ab2a763f49487de5f92b43583684a209a971ab6bd3c8dddc37907af4a04d6160
SIZE (electron/electron-electron-v26.2.1_GH0.tar.gz) = 11287658
SHA256 (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 750b09907a0b7054bda042bfc26879b9ccb84f9f436182a820ea188b654ce77b
SIZE (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 112039326
SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39
Expand Down
4 changes: 2 additions & 2 deletions devel/electron26/files/patch-electron_lib_browser_init.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- electron/lib/browser/init.ts.orig 2022-05-18 15:31:32 UTC
--- electron/lib/browser/init.ts.orig 2023-09-12 14:03:39 UTC
+++ electron/lib/browser/init.ts
@@ -149,7 +149,7 @@ const mainStartupScript = packageJson.main || 'index.j
@@ -158,7 +158,7 @@ const mainStartupScript = packageJson.main || 'index.j
const KNOWN_XDG_DESKTOP_VALUES = ['Pantheon', 'Unity:Unity7', 'pop:GNOME'];

function currentPlatformSupportsAppIndicator () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-09-06 17:53:56 UTC
--- electron/shell/browser/api/electron_api_web_contents.cc.orig 2023-09-12 14:03:39 UTC
+++ electron/shell/browser/api/electron_api_web_contents.cc
@@ -154,11 +154,11 @@
#include "ui/base/cocoa/defaults_utils.h"
Expand Down Expand Up @@ -41,7 +41,7 @@
// A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
// Instead we send an explicit IPC to crash on the renderer's IO thread.
rph->ForceCrash();
@@ -3284,7 +3284,7 @@ void WebContents::CopyImageAt(int x, int y) {
@@ -3276,7 +3276,7 @@ void WebContents::CopyImageAt(int x, int y) {
void WebContents::Focus() {
// Focusing on WebContents does not automatically focus the window on macOS
// and Linux, do it manually to match the behavior on Windows.
Expand All @@ -50,7 +50,7 @@
if (owner_window())
owner_window()->Focus(true);
#endif
@@ -4098,7 +4098,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
@@ -4090,7 +4090,7 @@ ui::ImageModel WebContents::GetDevToolsWindowIcon() {
}
#endif

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- electron/spec/api-content-tracing-spec.ts.orig 2023-09-16 04:46:51 UTC
+++ electron/spec/api-content-tracing-spec.ts
@@ -6,7 +6,7 @@ import { setTimeout } from 'timers/promises';
import { ifdescribe } from './lib/spec-helpers';

// FIXME: The tests are skipped on linux arm/arm64
-ifdescribe(!(['arm', 'arm64'].includes(process.arch)) || (process.platform !== 'linux'))('contentTracing', () => {
+ifdescribe(!(['arm', 'arm64'].includes(process.arch)) || (process.platform !== 'linux' && process.platform !== 'freebsd'))('contentTracing', () => {
const record = async (options: TraceConfig | TraceCategoriesAndOptions, outputFilePath: string | undefined, recordTimeInMilliseconds = 1e1) => {
await app.whenReady();

6 changes: 3 additions & 3 deletions devel/electron26/files/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@
vscode-uri "^3.0.7"

"@electron/typescript-definitions@^8.14.5":
version "8.14.5"
resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.14.5.tgz#07ffc7dac6008e0f659215e3b88bc0d7c6bc6ece"
integrity sha512-68JfMTcj6X7B0dhjhj8lGGnnOlfuiR4f+2UBEtQDYRHfeSuFriKErno3Lh+jAolGSqhw39qr4lLO+FGToVdCew==
version "8.14.6"
resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.14.6.tgz#78ba1fa8314f06255bb9309791b33c9695ac42ef"
integrity sha512-HK70Q3nrp6h4cCxb/P65vFixdJ99vABLIG8TpqU21/fmuHdYboL4zcleWaYhXhU2EwduuOPfORFMrUTdBRc+lw==
dependencies:
"@types/node" "^11.13.7"
chalk "^2.4.2"
Expand Down

0 comments on commit 2649b98

Please sign in to comment.