Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Jun 2024 20:18:26 GMT
From:      Hiroki Tagato <tagattie@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 72d04ff33dcd - main - devel/electron30: update to 30.1.1
Message-ID:  <202406192018.45JKIQVV067806@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=72d04ff33dcdce8eb8e172847c082ed62ce9ea32

commit 72d04ff33dcdce8eb8e172847c082ed62ce9ea32
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2024-06-19 20:15:55 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2024-06-19 20:18:17 +0000

    devel/electron30: update to 30.1.1
    
    Changelog:
    - https://github.com/electron/electron/releases/tag/v30.1.0
    - https://github.com/electron/electron/releases/tag/v30.1.1
    
    Reported by:    GitHub (watch releases)
---
 devel/electron30/Makefile                              |  6 +++---
 devel/electron30/Makefile.version                      |  2 +-
 devel/electron30/distinfo                              | 18 +++++++++---------
 .../files/patch-electron_shell_browser_browser.h       |  4 ++--
 ...tch-third__party_electron__node_deps_cares_BUILD.gn | 18 ++++++++++++++++++
 ...atch-third__party_sqlite_src_amalgamation_sqlite3.c | 11 ++++++++++-
 devel/electron30/files/yarn.lock                       |  6 +++---
 7 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/devel/electron30/Makefile b/devel/electron30/Makefile
index 416a179bab86..f12a4f415275 100644
--- a/devel/electron30/Makefile
+++ b/devel/electron30/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v30.0.9/:chromium \
+MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v30.1.1/:chromium \
 		https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
 PKGNAMESUFFIX=	${ELECTRON_VER_MAJOR}
@@ -221,13 +221,13 @@ SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 # See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
-CHROMIUM_VER=			124.0.6367.233
+CHROMIUM_VER=			124.0.6367.243
 # See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
 CHROMIUM_NODE_MODULES_HASH=	97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2
 # 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
-NODE_VER=			20.11.1
+NODE_VER=			20.14.0
 # See ${WRKSRC}/electron/DEPS for NAN_VER
 NAN_VER=			e14bdcd1f72d62bca1d541b66da43130384ec213
 # See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
diff --git a/devel/electron30/Makefile.version b/devel/electron30/Makefile.version
index f78f39b30457..00169e9e8531 100644
--- a/devel/electron30/Makefile.version
+++ b/devel/electron30/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	30.0.9
+ELECTRON_VER=	30.1.1
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron30/distinfo b/devel/electron30/distinfo
index fd0ca1b44599..c1c02b6f190e 100644
--- a/devel/electron30/distinfo
+++ b/devel/electron30/distinfo
@@ -1,16 +1,16 @@
-TIMESTAMP = 1717224350
-SHA256 (electron/chromium-124.0.6367.233.tar.xz) = fd32510c63a86c5352ffb44ca4e5745459efbcbe0af855d0348c58ac5f6e3a5c
-SIZE (electron/chromium-124.0.6367.233.tar.xz) = 1632409680
+TIMESTAMP = 1718267333
+SHA256 (electron/chromium-124.0.6367.243.tar.xz) = 53ed2f29769fe105ae884e37fd9fd9d9756931cf1d6d16c6a252f5982b8496cb
+SIZE (electron/chromium-124.0.6367.243.tar.xz) = 1633060772
 SHA256 (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = dcfaea4d353d1df3d4ac2d245ea7e32ad177d4bea1351f363714c9c22ca5c4f8
 SIZE (electron/97a0b3c4c39cf05de1eafb6ffdec0fddd643f0a2) = 9761601
 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-30.0.9.tar.xz) = bfe45219c248d463ef8fcbdce755ad4d5deb9b757984da4760f47c20630aee84
-SIZE (electron/electron-yarn-cache-30.0.9.tar.xz) = 29229056
-SHA256 (electron/electron-electron-v30.0.9_GH0.tar.gz) = 23e8553c2a2e2b4087281cbed943cd4f289cb35a89c481769e7ad79dd7432c2d
-SIZE (electron/electron-electron-v30.0.9_GH0.tar.gz) = 13352877
-SHA256 (electron/nodejs-node-v20.11.1_GH0.tar.gz) = 82e77c282f273947f85440c8c5e6f8ccf368177eaa79bf1e112b8c6c0db924e5
-SIZE (electron/nodejs-node-v20.11.1_GH0.tar.gz) = 115530287
+SHA256 (electron/electron-yarn-cache-30.1.1.tar.xz) = 7bf31c8b9c55ee317c217cd6605eb85ed015cef96246188be0ab3b2681200368
+SIZE (electron/electron-yarn-cache-30.1.1.tar.xz) = 29229388
+SHA256 (electron/electron-electron-v30.1.1_GH0.tar.gz) = 6ddee025d5b530dd3fe0c5e6a96046a3a8ae9488209a8f9c6412092cad5dbfe7
+SIZE (electron/electron-electron-v30.1.1_GH0.tar.gz) = 13351289
+SHA256 (electron/nodejs-node-v20.14.0_GH0.tar.gz) = 69c7e7cdd95580e74d7f8dbe8a408652db09a9099c4f97c196d056279e7f523c
+SIZE (electron/nodejs-node-v20.14.0_GH0.tar.gz) = 115425089
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
 SIZE (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 180646
 SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01
diff --git a/devel/electron30/files/patch-electron_shell_browser_browser.h b/devel/electron30/files/patch-electron_shell_browser_browser.h
index 14d4c1319294..36529c18419e 100644
--- a/devel/electron30/files/patch-electron_shell_browser_browser.h
+++ b/devel/electron30/files/patch-electron_shell_browser_browser.h
@@ -1,4 +1,4 @@
---- electron/shell/browser/browser.h.orig	2024-04-16 14:29:17 UTC
+--- electron/shell/browser/browser.h.orig	2024-06-12 10:49:40 UTC
 +++ electron/shell/browser/browser.h
 @@ -145,7 +145,7 @@ class Browser : public WindowListObserver {
  
@@ -9,7 +9,7 @@
    // get the name, icon and path for an application
    v8::Local<v8::Promise> GetApplicationInfoForProtocol(v8::Isolate* isolate,
                                                         const GURL& url);
-@@ -269,10 +269,10 @@ class Browser : public WindowListObserver {
+@@ -273,10 +273,10 @@ class Browser : public WindowListObserver {
    PCWSTR GetAppUserModelID();
  #endif  // BUILDFLAG(IS_WIN)
  
diff --git a/devel/electron30/files/patch-third__party_electron__node_deps_cares_BUILD.gn b/devel/electron30/files/patch-third__party_electron__node_deps_cares_BUILD.gn
new file mode 100644
index 000000000000..13e57fddd2b5
--- /dev/null
+++ b/devel/electron30/files/patch-third__party_electron__node_deps_cares_BUILD.gn
@@ -0,0 +1,18 @@
+--- third_party/electron_node/deps/cares/BUILD.gn.orig	2024-06-13 08:39:37 UTC
++++ third_party/electron_node/deps/cares/BUILD.gn
+@@ -151,9 +151,14 @@ static_library("cares") {
+     defines += [ "HAVE_CONFIG_H" ]
+   }
+ 
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     include_dirs += [ "config/linux" ]
+     sources += [ "config/linux/ares_config.h" ]
++  }
++
++  if (is_freebsd) {
++    include_dirs += [ "config/freebsd" ]
++    sources += [ "config/freebsd/ares_config.h" ]
+   }
+ 
+   if (is_mac) {
diff --git a/devel/electron30/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/devel/electron30/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
index 6170c0673141..fdd1f88197b4 100644
--- a/devel/electron30/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
+++ b/devel/electron30/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,5 +1,14 @@
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-04-15 20:35:12 UTC
+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-06-13 07:46:18 UTC
 +++ third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14117,7 +14117,7 @@ struct fts5_api {
+ ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
+ ** it.
+ */
+-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
++#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__FreeBSD__)
+ #  define _XOPEN_SOURCE 600
+ #endif
+ 
 @@ -44768,7 +44768,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
    memset(zBuf, 0, nBuf);
    randomnessPid = osGetpid(0);
diff --git a/devel/electron30/files/yarn.lock b/devel/electron30/files/yarn.lock
index 12711fc4f638..2556f713b6d8 100644
--- a/devel/electron30/files/yarn.lock
+++ b/devel/electron30/files/yarn.lock
@@ -220,9 +220,9 @@
     vscode-uri "^3.0.7"
 
 "@electron/typescript-definitions@^8.15.2":
-  version "8.15.2"
-  resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.15.2.tgz#1152e3d3731d236b50a3dee5a108176ce43fd703"
-  integrity sha512-6vlWnnNfZrg9QFOGgoLaQZ/nTCg+Y1laz02pUsRRmCJIpJZOY3HnWnIuav7e8g5IIwHMVc8JSohR+YRgiRk/eA==
+  version "8.15.6"
+  resolved "https://registry.yarnpkg.com/@electron/typescript-definitions/-/typescript-definitions-8.15.6.tgz#a578ee3de6e6dcfdb5765da58f303900a34b2d06"
+  integrity sha512-9YR2jG7AdRLvZMhQLgTljZzkoaKNP1wbQq+/qjBCCCCCbUpECvMRk1/UeuZErZEmddhSYanQZgXiftF1T072uQ==
   dependencies:
     "@types/node" "^11.13.7"
     chalk "^2.4.2"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406192018.45JKIQVV067806>