Skip to content

Commit f4594d7

Browse files
tagattietagattie
committed
electron8: update to v8.5.5.
1 parent c52e8be commit f4594d7

10 files changed

+47
-50
lines changed

‎devel/electron8/Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v8.
99
https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
1010
https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
1111
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
12-
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
13-
chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \
12+
DISTFILES= chromium-${CHROMIUM_OFFICIAL_VER}${EXTRACT_SUFX}:chromium_official \
1413
${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
1514
${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
1615
electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
@@ -68,7 +67,7 @@ GH_TUPLE= nodejs:node:v${NODE_VER}:node \
6867
# Official chromium version containing "gn" which is known to work
6968
CHROMIUM_OFFICIAL_VER= 80.0.3987.163
7069
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
71-
CHROMIUM_VER= 80.0.3987.165
70+
CHROMIUM_VER= 80.0.3987.163
7271
# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
7372
CHROMIUM_NODE_MODULES_HASH= a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c
7473
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
@@ -160,7 +159,7 @@ PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
160159
POST_BUILD_TARGETS= licenses version
161160
POST_BUILD_DIST_TARGETS= electron_dist_zip electron_chromedriver_zip electron_mksnapshot_zip
162161

163-
YARN_TIMESTAMP= 1592910373
162+
YARN_TIMESTAMP= 1610263942
164163

165164
PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \
166165
ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
@@ -201,9 +200,9 @@ pre-fetch:
201200

202201
post-extract:
203202
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
204-
${RM} -r ${WRKSRC}/tools/gn
205-
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/tools/gn \
206-
${WRKSRC}/tools/gn
203+
# ${RM} -r ${WRKSRC}/tools/gn
204+
# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_OFFICIAL_VER}/tools/gn \
205+
# ${WRKSRC}/tools/gn
207206
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
208207
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \
209208
${WRKSRC}/third_party/nan
@@ -213,7 +212,7 @@ post-extract:
213212
${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
214213
cd ${WRKSRC}/electron && \
215214
${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline
216-
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
215+
# ${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/node_modules ${WRKSRC}/third_party/node
217216
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
218217

219218
pre-patch:

‎devel/electron8/Makefile.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# $FreeBSD$
22

3-
ELECTRON_VER= 8.3.3
3+
ELECTRON_VER= 8.5.5
44
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}

‎devel/electron8/distinfo‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
TIMESTAMP = 1592910979
2-
SHA256 (electron/chromium-80.0.3987.165.tar.xz) = cb0cb0c8d5e4defc764526a38af5bc42fd1f2bcf0bb2033a6aee4a4fe2333c82
3-
SIZE (electron/chromium-80.0.3987.165.tar.xz) = 1584566556
1+
TIMESTAMP = 1610264095
42
SHA256 (electron/chromium-80.0.3987.163.tar.xz) = b6ddefa9434877a9b923631b7525f7f2f80118dd986ecdac87f2c9f11f237346
53
SIZE (electron/chromium-80.0.3987.163.tar.xz) = 796981144
64
SHA256 (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = b8b23fa102ddea8b6b4b6b9161c76636fd48b37e6bcfe955e56bfe04e31ba13b
75
SIZE (electron/a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c) = 8072260
86
SHA256 (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 6e331676d098a57c53c1250821dc47ed84c47f823901bf30c4704df90d8a34be
97
SIZE (electron/a22de844e32a3f720d219e3911c3da3478039f89) = 17469927
10-
SHA256 (electron/electron-yarn-cache-8.3.3.tar.xz) = 6a39234a37086b959c88eec89e9efdbf5720dea05be1eca2c13b9bf9b021c4f7
11-
SIZE (electron/electron-yarn-cache-8.3.3.tar.xz) = 32374672
12-
SHA256 (electron/electron-electron-v8.3.3_GH0.tar.gz) = 52e4f694248a72af5855c4c47dd5be42aac8564c500ad6852c0132413a1d4dac
13-
SIZE (electron/electron-electron-v8.3.3_GH0.tar.gz) = 5547935
8+
SHA256 (electron/electron-yarn-cache-8.5.5.tar.xz) = 5b1e3c0c7363238409f179f599f330b0600c1271526893ed5d7c4b9a7c888ace
9+
SIZE (electron/electron-yarn-cache-8.5.5.tar.xz) = 32374384
10+
SHA256 (electron/electron-electron-v8.5.5_GH0.tar.gz) = 39fe9be2c3ebfbe718b4e7b439f9508c5c29f4db0ac8cf86086dbf0c2dfb2613
11+
SIZE (electron/electron-electron-v8.5.5_GH0.tar.gz) = 5880272
1412
SHA256 (electron/nodejs-node-v12.13.0_GH0.tar.gz) = 91518dc2506e33d3ac919ed781661082c620b888fa79c2483f4f902584d0e1d9
1513
SIZE (electron/nodejs-node-v12.13.0_GH0.tar.gz) = 72661495
1614
SHA256 (electron/nodejs-nan-2ee313aaca52e2b478965ac50eb5082520380d1b_GH0.tar.gz) = e6d0727f2f33d6c0fdbee3182543cb23679551dc15318cc8a2489901eabe9915

‎devel/electron8/files/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "electron",
3-
"version": "8.3.3",
3+
"version": "8.5.5",
44
"repository": "https://github.com/electron/electron",
55
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
66
"devDependencies": {

‎devel/electron8/files/patch-content_renderer_renderer__blink__platform__impl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- content/renderer/renderer_blink_platform_impl.h.orig 2020-03-03 09:21:38 UTC
1+
--- content/renderer/renderer_blink_platform_impl.h.orig 2021-01-10 07:39:02 UTC
22
+++ content/renderer/renderer_blink_platform_impl.h
33
@@ -30,7 +30,7 @@
44
#include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
@@ -9,7 +9,7 @@
99
#include "components/services/font/public/cpp/font_loader.h" // nogncheck
1010
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
1111
#endif
12-
@@ -219,7 +219,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
12+
@@ -221,7 +221,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
1313

1414
scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
1515

@@ -18,7 +18,7 @@
1818
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
1919
#endif
2020

21-
@@ -243,7 +243,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
21+
@@ -245,7 +245,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
2222
mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_;
2323
mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_;
2424

‎devel/electron8/files/patch-electron_shell_common_node__bindings.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- electron/shell/common/node_bindings.cc.orig 2020-06-18 16:52:13 UTC
1+
--- electron/shell/common/node_bindings.cc.orig 2020-11-18 20:39:37 UTC
22
+++ electron/shell/common/node_bindings.cc
3-
@@ -262,7 +262,7 @@ void NodeBindings::Initialize() {
3+
@@ -263,7 +263,7 @@ void NodeBindings::Initialize() {
44
node::g_standalone_mode = browser_env_ == BrowserEnvironment::BROWSER;
55
node::g_upstream_node_mode = false;
66

‎devel/electron8/files/patch-electron_spec-main_api-app-spec.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- electron/spec-main/api-app-spec.ts.orig 2020-06-18 16:52:13 UTC
1+
--- electron/spec-main/api-app-spec.ts.orig 2020-11-18 20:39:37 UTC
22
+++ electron/spec-main/api-app-spec.ts
33
@@ -128,7 +128,7 @@ describe('app module', () => {
44
describe('app.getLocaleCountryCode()', () => {
@@ -18,7 +18,7 @@
1818
this.skip()
1919
return
2020
}
21-
@@ -534,7 +534,7 @@ describe('app module', () => {
21+
@@ -553,7 +553,7 @@ describe('app module', () => {
2222
describe('app.badgeCount', () => {
2323
const platformIsNotSupported =
2424
(process.platform === 'win32') ||
@@ -27,7 +27,7 @@
2727
const platformIsSupported = !platformIsNotSupported
2828

2929
const expectedBadgeCount = 42
30-
@@ -590,7 +590,7 @@ describe('app module', () => {
30+
@@ -609,7 +609,7 @@ describe('app module', () => {
3131
]
3232

3333
before(function () {
@@ -36,7 +36,7 @@
3636
})
3737

3838
beforeEach(() => {
39-
@@ -665,7 +665,7 @@ describe('app module', () => {
39+
@@ -684,7 +684,7 @@ describe('app module', () => {
4040
})
4141
})
4242

@@ -45,15 +45,15 @@
4545
it('with properties', () => {
4646
it('can set accessibility support enabled', () => {
4747
expect(app.accessibilitySupportEnabled).to.eql(false)
48-
@@ -711,6 +711,7 @@ describe('app module', () => {
48+
@@ -730,6 +730,7 @@ describe('app module', () => {
4949
const logsPaths = {
5050
'darwin': path.resolve(homedir(), 'Library', 'Logs'),
5151
'linux': path.resolve(homedir(), 'AppData', app.name),
5252
+ 'freebsd': path.resolve(homedir(), 'AppData', app.name),
5353
'win32': path.resolve(homedir(), 'AppData', app.name),
5454
}
5555

56-
@@ -787,7 +788,7 @@ describe('app module', () => {
56+
@@ -806,7 +807,7 @@ describe('app module', () => {
5757
let w: BrowserWindow
5858

5959
before(function () {
@@ -62,7 +62,7 @@
6262
this.skip()
6363
}
6464
session.fromPartition('empty-certificate').setCertificateVerifyProc((req, cb) => { cb(0) })
65-
@@ -944,7 +945,7 @@ describe('app module', () => {
65+
@@ -963,7 +964,7 @@ describe('app module', () => {
6666
// We can't expect particular app names here, but these protocols should
6767
// at least have _something_ registered. Except on our Linux CI
6868
// environment apparently.
@@ -71,7 +71,7 @@
7171
this.skip()
7272
}
7373

74-
@@ -1018,7 +1019,7 @@ describe('app module', () => {
74+
@@ -1037,7 +1038,7 @@ describe('app module', () => {
7575
// doesn't affect nested `describe`s.
7676
beforeEach(function () {
7777
// FIXME Get these specs running on Linux CI
@@ -80,7 +80,7 @@
8080
this.skip()
8181
}
8282
})
83-
@@ -1088,7 +1089,7 @@ describe('app module', () => {
83+
@@ -1107,7 +1108,7 @@ describe('app module', () => {
8484
expect(entry.memory).to.have.property('privateBytes').that.is.greaterThan(0)
8585
}
8686

@@ -89,7 +89,7 @@
8989
expect(entry.sandboxed).to.be.a('boolean')
9090
}
9191

92-
@@ -1155,7 +1156,7 @@ describe('app module', () => {
92+
@@ -1174,7 +1175,7 @@ describe('app module', () => {
9393

9494
it('succeeds with complete GPUInfo', async () => {
9595
const completeInfo = await getGPUInfo('complete')
@@ -98,7 +98,7 @@
9898
// For linux and macOS complete info is same as basic info
9999
await verifyBasicGPUInfo(completeInfo)
100100
const basicInfo = await getGPUInfo('basic')
101-
@@ -1183,7 +1184,7 @@ describe('app module', () => {
101+
@@ -1202,7 +1203,7 @@ describe('app module', () => {
102102
const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox'
103103

104104
beforeEach(function (done) {

‎devel/electron8/files/patch-electron_spec-main_api-browser-window-spec.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- electron/spec-main/api-browser-window-spec.ts.orig 2020-06-18 16:52:13 UTC
1+
--- electron/spec-main/api-browser-window-spec.ts.orig 2020-11-18 20:39:37 UTC
22
+++ electron/spec-main/api-browser-window-spec.ts
3-
@@ -926,7 +926,7 @@ describe('BrowserWindow module', () => {
3+
@@ -964,7 +964,7 @@ describe('BrowserWindow module', () => {
44
w.setPosition(pos[0], pos[1])
55
})
66
})
@@ -9,16 +9,16 @@
99
it(`checks normal bounds when maximized`, (done) => {
1010
const bounds = w.getBounds()
1111
w.once('maximize', () => {
12-
@@ -949,7 +949,7 @@ describe('BrowserWindow module', () => {
13-
w.maximize()
12+
@@ -1007,7 +1007,7 @@ describe('BrowserWindow module', () => {
13+
expectBoundsEqual(w.getNormalBounds(), bounds)
1414
})
1515
})
1616
- ifdescribe(process.platform !== 'linux')(`Minimized state`, () => {
1717
+ ifdescribe(process.platform !== 'linux' && process.platform !== 'freebsd')(`Minimized state`, () => {
1818
it(`checks normal bounds when minimized`, (done) => {
1919
const bounds = w.getBounds()
2020
w.once('minimize', () => {
21-
@@ -1455,7 +1455,7 @@ describe('BrowserWindow module', () => {
21+
@@ -1533,7 +1533,7 @@ describe('BrowserWindow module', () => {
2222
describe('BrowserWindow.setOpacity(opacity)', () => {
2323
afterEach(closeAllWindows)
2424

@@ -27,7 +27,7 @@
2727
it('make window with initial opacity', () => {
2828
const w = new BrowserWindow({ show: false, opacity: 0.5 })
2929
expect(w.getOpacity()).to.equal(0.5)
30-
@@ -1481,7 +1481,7 @@ describe('BrowserWindow module', () => {
30+
@@ -1559,7 +1559,7 @@ describe('BrowserWindow module', () => {
3131
})
3232
})
3333

@@ -36,7 +36,7 @@
3636
it('sets 1 regardless of parameter', () => {
3737
const w = new BrowserWindow({ show: false })
3838
w.setOpacity(0)
39-
@@ -2274,7 +2274,7 @@ describe('BrowserWindow module', () => {
39+
@@ -2352,7 +2352,7 @@ describe('BrowserWindow module', () => {
4040
expect(test.version).to.equal(process.version)
4141
expect(test.versions).to.deep.equal(process.versions)
4242

@@ -45,7 +45,7 @@
4545
expect(test.creationTime).to.be.null('creation time')
4646
expect(test.systemMemoryInfo).to.be.null('system memory info')
4747
} else {
48-
@@ -2782,7 +2782,7 @@ describe('BrowserWindow module', () => {
48+
@@ -2860,7 +2860,7 @@ describe('BrowserWindow module', () => {
4949
})
5050
})
5151

@@ -54,7 +54,7 @@
5454
afterEach(closeAllWindows)
5555
it('emits an event when window is maximized', (done) => {
5656
const w = new BrowserWindow({show: false})
57-
@@ -3336,7 +3336,7 @@ describe('BrowserWindow module', () => {
57+
@@ -3423,7 +3423,7 @@ describe('BrowserWindow module', () => {
5858
})
5959
})
6060

@@ -63,7 +63,7 @@
6363
// Not implemented on Linux.
6464
afterEach(closeAllWindows)
6565

66-
@@ -4039,7 +4039,7 @@ describe('BrowserWindow module', () => {
66+
@@ -4126,7 +4126,7 @@ describe('BrowserWindow module', () => {
6767
})
6868

6969
const skip = features.isOffscreenRenderingEnabled() &&

‎devel/electron8/files/patch-electron_spec-main_chromium-spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- electron/spec-main/chromium-spec.ts.orig 2020-06-18 16:52:13 UTC
1+
--- electron/spec-main/chromium-spec.ts.orig 2020-11-18 20:39:37 UTC
22
+++ electron/spec-main/chromium-spec.ts
3-
@@ -1362,11 +1362,11 @@ describe('font fallback', () => {
3+
@@ -1394,11 +1394,11 @@ describe('font fallback', () => {
44
expect(fonts[0].familyName).to.equal('Arial')
55
else if (process.platform === 'darwin')
66
expect(fonts[0].familyName).to.equal('Helvetica')

‎devel/electron8/files/patch-ui_base_x_x11__shm__image__pool__base.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- ui/base/x/x11_shm_image_pool_base.cc.orig 2020-03-03 07:04:27 UTC
1+
--- ui/base/x/x11_shm_image_pool_base.cc.orig 2021-01-10 07:39:02 UTC
22
+++ ui/base/x/x11_shm_image_pool_base.cc
33
@@ -16,6 +16,7 @@
44
#include "base/environment.h"
@@ -7,8 +7,8 @@
77
+#include "base/system/sys_info.h"
88
#include "base/threading/thread_task_runner_handle.h"
99
#include "build/build_config.h"
10-
#include "ui/events/platform/platform_event_dispatcher.h"
11-
@@ -43,10 +44,14 @@ constexpr float kShmResizeShrinkThreshold =
10+
#include "net/base/url_util.h"
11+
@@ -44,10 +45,14 @@ constexpr float kShmResizeShrinkThreshold =
1212
1.0f / (kShmResizeThreshold * kShmResizeThreshold);
1313

1414
std::size_t MaxShmSegmentSizeImpl() {
@@ -23,7 +23,7 @@
2323
}
2424

2525
std::size_t MaxShmSegmentSize() {
26-
@@ -172,7 +177,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
26+
@@ -194,7 +199,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
2727
shmctl(state.shminfo_.shmid, IPC_RMID, 0);
2828
return false;
2929
}
@@ -32,7 +32,7 @@
3232
// On Linux, a shmid can still be attached after IPC_RMID if otherwise
3333
// kept alive. Detach before XShmAttach to prevent a memory leak in case
3434
// the process dies.
35-
@@ -182,7 +187,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
35+
@@ -204,7 +209,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
3636
if (!XShmAttach(display_, &state.shminfo_))
3737
return false;
3838
state.shmem_attached_to_server_ = true;

0 commit comments

Comments
 (0)