diff --git a/devel/electron27/Makefile b/devel/electron27/Makefile index 583a728b4f5a7..92437e371c5e7 100644 --- a/devel/electron27/Makefile +++ b/devel/electron27/Makefile @@ -24,7 +24,8 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386 FETCH_DEPENDS= yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX} EXTRACT_DEPENDS=yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX} -PATCH_DEPENDS= git:devel/git +PATCH_DEPENDS= git:devel/git \ + jq:textproc/jq BUILD_DEPENDS= gperf:devel/gperf \ yasm:devel/yasm \ ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \ diff --git a/devel/electron27/Makefile.version b/devel/electron27/Makefile.version index aa87185f34f1e..8ee1bf3c36f65 100644 --- a/devel/electron27/Makefile.version +++ b/devel/electron27/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 27.3.2 +ELECTRON_VER= 27.3.3 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron27/distinfo b/devel/electron27/distinfo index 16d6bc6b8dcb0..b353f57c79584 100644 --- a/devel/electron27/distinfo +++ b/devel/electron27/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1707374284 +TIMESTAMP = 1708684875 SHA256 (electron/chromium-118.0.5993.159.tar.xz) = 47fdd7677470f4f4daf68e59dcacbafb99f5ed0c07501162b6af168f760b4359 SIZE (electron/chromium-118.0.5993.159.tar.xz) = 1602730244 SHA256 (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = f7f7f38661b107fc1d91b7918f36362d9180e87f34e3027562eb5db8735746fe SIZE (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = 8881070 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-27.3.2.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75 -SIZE (electron/electron-yarn-cache-27.3.2.tar.xz) = 29116528 -SHA256 (electron/electron-electron-v27.3.2_GH0.tar.gz) = 434954405df3e139696624a5ebf9859351018e311d3be96d0b0bb2940674cc25 -SIZE (electron/electron-electron-v27.3.2_GH0.tar.gz) = 11423413 +SHA256 (electron/electron-yarn-cache-27.3.3.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75 +SIZE (electron/electron-yarn-cache-27.3.3.tar.xz) = 29116528 +SHA256 (electron/electron-electron-v27.3.3_GH0.tar.gz) = 4c1408adf045c66f150a6bbcbdfbf2d5f9893eb30b05f1d83c89c9d44ccae9ee +SIZE (electron/electron-electron-v27.3.3_GH0.tar.gz) = 11429098 SHA256 (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 1cc1670bc183eaf9e0afe0258391695d1d6ae1be02ba4c26e0218cf5f19b96f7 SIZE (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 112512847 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 diff --git a/devel/electron27/files/apply-electron-patches.sh b/devel/electron27/files/apply-electron-patches.sh index 9d974b536054c..367de24e9a711 100644 --- a/devel/electron27/files/apply-electron-patches.sh +++ b/devel/electron27/files/apply-electron-patches.sh @@ -12,7 +12,7 @@ PATCH_CONF=${WRKSRC}/electron/patches/config.json ${GIT_CMD} status "${WRKSRC}" > /dev/null 2>&1 && IS_GIT_REPO=1 -PATCHD_REPOD_PAIRS=$(sed -e '1d; $d; /^$/d; s/[",]//g; s/: */:/' "${PATCH_CONF}") +PATCHD_REPOD_PAIRS=$(jq -r '.[] | .patch_dir + ":" + .repo' "${PATCH_CONF}") for prp in ${PATCHD_REPOD_PAIRS}; do pd=$(echo "${prp}" | awk -F: '{print $1}' | sed -e 's/src/./') rd=$(echo "${prp}" | awk -F: '{print $2}' | sed -e 's/src/./') diff --git a/devel/electron27/files/patch-electron_spec_webview-spec.ts b/devel/electron27/files/patch-electron_spec_webview-spec.ts index 129f81f3f0182..b7f177946c1f1 100644 --- a/devel/electron27/files/patch-electron_spec_webview-spec.ts +++ b/devel/electron27/files/patch-electron_spec_webview-spec.ts @@ -1,6 +1,6 @@ ---- electron/spec/webview-spec.ts.orig 2023-08-14 18:19:06 UTC +--- electron/spec/webview-spec.ts.orig 2024-02-20 14:35:53 UTC +++ electron/spec/webview-spec.ts -@@ -529,7 +529,7 @@ describe(' tag', function () { +@@ -554,7 +554,7 @@ describe(' tag', function () { }); // FIXME(zcbenz): Fullscreen events do not work on Linux.