From db660a39c957823b7eff05c6bc6234f6ffc950ea Mon Sep 17 00:00:00 2001 From: psykose Date: Sat, 9 Jul 2022 10:12:55 +0000 Subject: [PATCH] code-oss: remove upstreamed --- code-oss/APKBUILD | 105 ------------------------------- code-oss/electron-version.patch | 19 ------ code-oss/enable-extensions.patch | 20 ------ code-oss/launcher.patch | 25 -------- code-oss/no-git.patch | 9 --- 5 files changed, 178 deletions(-) delete mode 100644 code-oss/APKBUILD delete mode 100644 code-oss/electron-version.patch delete mode 100644 code-oss/enable-extensions.patch delete mode 100644 code-oss/launcher.patch delete mode 100644 code-oss/no-git.patch diff --git a/code-oss/APKBUILD b/code-oss/APKBUILD deleted file mode 100644 index 3b450a3..0000000 --- a/code-oss/APKBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# Maintainer: psykose -pkgname=code-oss -pkgver=1.69.0 -pkgrel=0 -pkgdesc="Visual Studio Code" -url="https://github.com/microsoft/vscode" -arch="x86_64" -license="haha" -depends="electron ripgrep" -makedepends=" - libsecret-dev - libxkbfile-dev - nodejs - npm - python3 - yarn - " -subpackages=" - $pkgname-bash-completion - $pkgname-zsh-completion - " -source="$pkgname-$pkgver.tar.gz::https://github.com/microsoft/vscode/archive/refs/tags/$pkgver.tar.gz - electron-version.patch - enable-extensions.patch - launcher.patch - no-git.patch - " -builddir="$srcdir/vscode-$pkgver" -options="!check" - -export ELECTRON_SKIP_BINARY_DOWNLOAD=1 -export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 - -prepare() { - default_prepare - # fuck you husky - git init . -b xD - - yarn config set python python3 - yarn install -} - -build() { - node --max_old_space_size=3400 ./node_modules/.bin/gulp vscode-linux-x64-min -} - -package() { - mkdir -p "$pkgdir"/usr/share/applications - sed -e "s|@@NAME_LONG@@|Code - OSS|g" \ - -e "s|@@NAME_SHORT@@|Code - OSS|g" \ - -e "s|@@NAME@@|code-oss|g" \ - -e "s|@@EXEC@@|/usr/bin/code-oss|g" \ - -e "s|@@ICON@@|com.visualstudio.code.oss|g" \ - -e "s|@@URLPROTOCOL@@|code-oss|g" \ - resources/linux/code.desktop > "$pkgdir"/usr/share/applications/code-oss.desktop - sed -e "s|@@NAME_LONG@@|Code - OSS|g" \ - -e "s|@@NAME_SHORT@@|Code - OSS|g" \ - -e "s|@@NAME@@|code-oss|g" \ - -e "s|@@EXEC@@|/usr/bin/code-oss|g" \ - -e "s|@@ICON@@|com.visualstudio.code.oss|g" \ - -e "s|@@URLPROTOCOL@@|code-oss|g" \ - resources/linux/code-url-handler.desktop > "$pkgdir"/usr/share/applications/code-oss-url-handler.desktop - - install -Dm644 resources/linux/code.png "$pkgdir"/usr/share/pixmaps/com.visualstudio.code.oss.png - - mkdir -p "$pkgdir"/usr/share/appdata - sed -e "s|@@NAME_LONG@@|Code - OSS|g" \ - -e "s|@@NAME@@|code-oss|g" \ - -e "s|@@LICENSE@@|MIT|g" \ - resources/linux/code.appdata.xml > "$pkgdir"/usr/share/appdata/code-oss.appdata.xml - - mkdir -p "$pkgdir"/usr/share/mime/packages - sed -e "s|@@NAME_LONG@@|Code - OSS|g" \ - -e "s|@@NAME@@|code-oss|g" \ - resources/linux/code-workspace.xml > "$pkgdir"/usr/share/mime/packages/code-oss-workspace.xml - - mkdir -p "$pkgdir"/usr/share/bash-completion/completions - sed -e "s|@@APPNAME@@|code-oss|g" \ - resources/completions/bash/code > "$pkgdir"/usr/share/bash-completion/completions/code-oss - - mkdir -p "$pkgdir"/usr/share/zsh/site-functions - sed -e "s|@@APPNAME@@|code-oss|g" \ - resources/completions/zsh/_code > "$pkgdir"/usr/share/zsh/site-functions/_code-oss - - mkdir -p "$pkgdir"/usr/lib/code-oss/resources - cp -a ../VSCode-linux-x64/resources/app "$pkgdir"/usr/lib/code-oss/resources/ - ln -sfv /usr/bin/rg \ - "$pkgdir"/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg - - mkdir -p "$pkgdir"/usr/bin - sed \ - -e "s|VSCODE_PATH=/usr/share/vscode|VSCODE_PATH=/usr/lib/code-oss|g" \ - -e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron/electron|g" \ - -e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \ - ../VSCode-linux-x64/bin/code-oss > "$pkgdir"/usr/bin/code-oss - chmod +x "$pkgdir"/usr/bin/code-oss -} - -sha512sums=" -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 deleted file mode 100644 index 83ee78a..0000000 --- a/code-oss/electron-version.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/.yarnrc -+++ b/.yarnrc -@@ -1,4 +1,4 @@ - disturl "https://electronjs.org/headers" --target "18.3.5" -+target "19.0.8" - runtime "electron" - build_from_source "true" ---- 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/enable-extensions.patch b/code-oss/enable-extensions.patch deleted file mode 100644 index db886c9..0000000 --- a/code-oss/enable-extensions.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/product.json -+++ b/product.json -@@ -28,6 +28,17 @@ - "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new", - "urlProtocol": "code-oss", - "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/3c8520fab514b9f56070214496b26ff68d1b1cb5/out/vs/workbench/contrib/webview/browser/pre/", -+ "quality": "stable", -+ "extensionsGallery": { -+ "nlsBaseUrl": "https://www.vscode-unpkg.net/_nls/", -+ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", -+ "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", -+ "itemUrl": "https://marketplace.visualstudio.com/items", -+ "publisherUrl": "https://marketplace.visualstudio.com/publishers", -+ "resourceUrlTemplate": "https://{publisher}.vscode-unpkg.net/{publisher}/{name}/{version}/{path}", -+ "controlUrl": "https://az764295.vo.msecnd.net/extensions/marketplace.json", -+ "recommendationsUrl": "https://az764295.vo.msecnd.net/extensions/workspaceRecommendations.json.gz" -+ }, - "builtInExtensions": [ - { - "name": "ms-vscode.js-debug-companion", diff --git a/code-oss/launcher.patch b/code-oss/launcher.patch deleted file mode 100644 index 1d63b40..0000000 --- a/code-oss/launcher.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/resources/linux/bin/code.sh -+++ b/resources/linux/bin/code.sh -@@ -44,20 +44,9 @@ - fi - fi - --if [ ! -L "$0" ]; then -- # if path is not a symlink, find relatively -- VSCODE_PATH="$(dirname "$0")/.." --else -- if command -v readlink >/dev/null; then -- # if readlink exists, follow the symlink and find relatively -- VSCODE_PATH="$(dirname "$(readlink -f "$0")")/.." -- else -- # else use the standard install location -- VSCODE_PATH="/usr/share/@@APPNAME@@" -- fi --fi -+VSCODE_PATH="/usr/lib/code-oss" - --ELECTRON="$VSCODE_PATH/@@APPNAME@@" -+ELECTRON="/usr/bin/electron" - CLI="$VSCODE_PATH/resources/app/out/cli.js" - ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node "$@" - exit $? diff --git a/code-oss/no-git.patch b/code-oss/no-git.patch deleted file mode 100644 index 1d47170..0000000 --- a/code-oss/no-git.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/build/npm/postinstall.js -+++ b/build/npm/postinstall.js -@@ -72,6 +72,3 @@ - - yarnInstall(dir, opts); - } -- --cp.execSync('git config pull.rebase merges'); --cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');