From e3fa0160826bbd2d401e464ada0db8e0b4699e67 Mon Sep 17 00:00:00 2001 From: psykose Date: Thu, 7 Jul 2022 18:46:13 +0000 Subject: [PATCH] code-oss: upgrade to 1.69.0 --- code-oss/APKBUILD | 14 +++-- code-oss/electron-version.patch | 95 +++++---------------------------- code-oss/electron19.patch | 20 ------- 3 files changed, 19 insertions(+), 110 deletions(-) delete mode 100644 code-oss/electron19.patch diff --git a/code-oss/APKBUILD b/code-oss/APKBUILD index 3172519..3b450a3 100644 --- a/code-oss/APKBUILD +++ b/code-oss/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: psykose pkgname=code-oss -pkgver=1.68.1 -pkgrel=2 +pkgver=1.69.0 +pkgrel=0 pkgdesc="Visual Studio Code" url="https://github.com/microsoft/vscode" arch="x86_64" @@ -21,7 +21,6 @@ subpackages=" " source="$pkgname-$pkgver.tar.gz::https://github.com/microsoft/vscode/archive/refs/tags/$pkgver.tar.gz electron-version.patch - electron19.patch enable-extensions.patch launcher.patch no-git.patch @@ -38,11 +37,11 @@ prepare() { git init . -b xD yarn config set python python3 - yarn install --frozen-lockfile + yarn install } build() { - node --max_old_space_size=3000 ./node_modules/.bin/gulp vscode-linux-x64-min + node --max_old_space_size=3400 ./node_modules/.bin/gulp vscode-linux-x64-min } package() { @@ -98,9 +97,8 @@ package() { } sha512sums=" -91b1b5c610d2d9564de34634e3b3d4de9703c5422901d5fc96592fe977db663aaa8ceab70cbaddedab13cc93aca0def25b1e42244d196deb0a2eb2fadc04cd6c code-oss-1.68.1.tar.gz -fe6e6f8efc1412cf283c8a21907ceb778f4e81eef6882e198a9b61ae79ef9bcc16aa59efb3024768d27506beafd40a94f72d97bbc9066f7fe463e9f1964a1732 electron-version.patch -211345de4d34be2a14df69dc027e8440627363aa9937010146211317cf4c1cd699e7085305cfc197680db6ccdeabfccd36797064c416857d9c4156da6b581e29 electron19.patch +415418d382123478596801ef83a8b3644e276da984c5d49d3536687da01c80db770977de371bc7840c677c9f776d3f47e4883b25d0529c5621f459ee15caa7ce code-oss-1.69.0.tar.gz +2d35c518c19caf3e7bbbe51a0e91b78ea9a6349136f08692b1e28b9066dd8fd5e40e9668a518dbf2966920d9f8b79365c01188c9fd5b08002f11cdae42a07e8b electron-version.patch c074df64f63a8f8d733b748d05e8b91b7de0cbb39788dba972032672eea5ddc3c21b72c2df3029b241207c2c61a292eb2dd200f5eb0a6033a0c5db4e8377f69e enable-extensions.patch 445fde371eab1df87a74024cb624bf8f89cf7dd2c50c912de2ab9f6fa05546b2fbb1595dd316e7febca959c5c671c554faf8fef499de520811ea91b48bd1ee15 launcher.patch b91c35bed74da482d63137f43529ec38dc10a293f52a4d1d1c0d6955d84d5f19e61512147302eaa0901152632bf148bf7b99775315e8e0c00bcf2a2e9e585a0a no-git.patch diff --git a/code-oss/electron-version.patch b/code-oss/electron-version.patch index 58c743a..83ee78a 100644 --- a/code-oss/electron-version.patch +++ b/code-oss/electron-version.patch @@ -1,88 +1,19 @@ ---- a/package.json -+++ b/package.json -@@ -136,7 +136,7 @@ - "cssnano": "^4.1.11", - "debounce": "^1.0.0", - "deemon": "^1.4.0", -- "electron": "17.4.7", -+ "electron": "19.0.6", - "eslint": "8.7.0", - "eslint-plugin-header": "3.1.1", - "eslint-plugin-jsdoc": "^19.1.0", --- a/.yarnrc +++ b/.yarnrc @@ -1,4 +1,4 @@ disturl "https://electronjs.org/headers" --target "17.4.7" -+target "19.0.6" +-target "18.3.5" ++target "19.0.8" runtime "electron" build_from_source "true" ---- a/yarn.lock -+++ b/yarn.lock -@@ -716,7 +716,7 @@ - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d" - integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== - --"@electron/get@^1.12.4": -+"@electron/get@^1.12.4", "@electron/get@^1.14.1": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" - integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== -@@ -732,22 +732,6 @@ - global-agent "^3.0.0" - global-tunnel-ng "^2.7.1" - --"@electron/get@^1.13.0": -- version "1.13.1" -- resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" -- integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== -- dependencies: -- debug "^4.1.1" -- env-paths "^2.2.0" -- fs-extra "^8.1.0" -- got "^9.6.0" -- progress "^2.0.3" -- semver "^6.2.0" -- sumchecker "^3.0.1" -- optionalDependencies: -- global-agent "^3.0.0" -- global-tunnel-ng "^2.7.1" -- - "@eslint/eslintrc@^1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318" -@@ -1346,10 +1330,10 @@ - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e" - integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ== - --"@types/node@^14.6.2": -- version "14.14.37" -- resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e" -- integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw== -+"@types/node@^16.11.26": -+ version "16.11.41" -+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.41.tgz#88eb485b1bfdb4c224d878b7832239536aa2f813" -+ integrity sha512-mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ== - - "@types/q@^1.5.1": - version "1.5.4" -@@ -4287,13 +4271,13 @@ - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.45.tgz#cf1144091d6683cbd45a231954a745f02fb24598" - integrity sha512-czF9eYVuOmlY/vxyMQz2rGlNSjZpxNQYBe1gmQv7al171qOIhgyO9k7D5AKlgeTCSPKk+LHhj5ZyIdmEub9oNg== - --electron@17.4.7: -- version "17.4.7" -- resolved "https://registry.yarnpkg.com/electron/-/electron-17.4.7.tgz#5ae9105f2ee28e6405c79c7101f0c956676da697" -- integrity sha512-CMdUpd6oEwqbF7wcXwy9VNNXfTTbaeRg+zrGZciPzyzsEmJ9vzWcR1WpOxIQ4sIMjUyo1pFbvaD0VOgI2t4x3A== -+electron@19.0.6: -+ version "19.0.6" -+ resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.6.tgz#7aacfa4e968f134eecc36a1b03e3f9954ed8f6a5" -+ integrity sha512-S9Yud32nKhB0iWC0lGl2JXz4FQnCiLCnP5Vehm1/CqyeICcQGmgQaZl2HYpCJ2pesKIsYL9nsgmku/10cxm/gg== - dependencies: -- "@electron/get" "^1.13.0" -- "@types/node" "^14.6.2" -+ "@electron/get" "^1.14.1" -+ "@types/node" "^16.11.26" - extract-zip "^1.0.3" - - elliptic@^6.5.3: +--- a/package.json ++++ b/package.json +@@ -138,7 +138,7 @@ + "cssnano": "^4.1.11", + "debounce": "^1.0.0", + "deemon": "^1.4.0", +- "electron": "18.3.5", ++ "electron": "^19.0.0", + "eslint": "8.7.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-jsdoc": "^39.3.2", diff --git a/code-oss/electron19.patch b/code-oss/electron19.patch deleted file mode 100644 index 8a64703..0000000 --- a/code-oss/electron19.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts -+++ b/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts -@@ -228,7 +228,6 @@ - contextIsolation: false, - enableWebSQL: false, - spellcheck: false, -- nativeWindowOpen: true, - images: false, - webgl: false - } ---- a/src/vs/platform/windows/electron-main/window.ts -+++ b/src/vs/platform/windows/electron-main/window.ts -@@ -195,7 +195,6 @@ - v8CacheOptions: this.environmentMainService.useCodeCache ? 'bypassHeatCheck' : 'none', - enableWebSQL: false, - spellcheck: false, -- nativeWindowOpen: true, - zoomFactor: zoomLevelToZoomFactor(windowSettings?.zoomLevel), - // Enable experimental css highlight api https://chromestatus.com/feature/5436441440026624 - // Refs https://github.com/microsoft/vscode/issues/140098