From 42ad7a399e2186c58d6e63fcc12b44064bbebd41 Mon Sep 17 00:00:00 2001 From: Jon Janzen Date: Sun, 19 Feb 2023 07:21:04 -0800 Subject: app-editors/{vscode,vscodium}: Mark ssh-askpass script as executable When using an SSH key that has a passcord, VS Code calls this script to authenticate. Without it being marked as executable the Git SSH operation fails. Signed-off-by: Jon Janzen Closes: https://github.com/gentoo/gentoo/pull/29665 Signed-off-by: Arthur Zamarin --- app-editors/vscode/vscode-1.75.0-r1.ebuild | 128 ----------------------------- app-editors/vscode/vscode-1.75.0-r2.ebuild | 128 +++++++++++++++++++++++++++++ app-editors/vscode/vscode-1.75.1-r1.ebuild | 128 +++++++++++++++++++++++++++++ app-editors/vscode/vscode-1.75.1.ebuild | 128 ----------------------------- 4 files changed, 256 insertions(+), 256 deletions(-) delete mode 100644 app-editors/vscode/vscode-1.75.0-r1.ebuild create mode 100644 app-editors/vscode/vscode-1.75.0-r2.ebuild create mode 100644 app-editors/vscode/vscode-1.75.1-r1.ebuild delete mode 100644 app-editors/vscode/vscode-1.75.1.ebuild (limited to 'app-editors/vscode') diff --git a/app-editors/vscode/vscode-1.75.0-r1.ebuild b/app-editors/vscode/vscode-1.75.0-r1.ebuild deleted file mode 100644 index 4dfa8178e6ec..000000000000 --- a/app-editors/vscode/vscode-1.75.0-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop pax-utils xdg optfeature - -DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" -HOMEPAGE="https://code.visualstudio.com" -SRC_URI=" - amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz ) - arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz ) - arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz ) -" -S="${WORKDIR}" - -RESTRICT="mirror strip bindist" - -LICENSE=" - Apache-2.0 - BSD - BSD-1 - BSD-2 - BSD-4 - CC-BY-4.0 - ISC - LGPL-2.1+ - Microsoft-vscode - MIT - MPL-2.0 - openssl - PYTHON - TextMate-bundle - Unlicense - UoI-NCSA - W3C -" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64" - -RDEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - app-crypt/libsecret[crypt] - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/mesa - net-print/cups - sys-apps/util-linux - sys-apps/dbus - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libxshmfence - x11-libs/pango -" - -QA_PREBUILT=" - /opt/vscode/bin/code-tunnel - /opt/vscode/chrome_crashpad_handler - /opt/vscode/chrome-sandbox - /opt/vscode/code - /opt/vscode/libEGL.so - /opt/vscode/libffmpeg.so - /opt/vscode/libGLESv2.so - /opt/vscode/libvk_swiftshader.so - /opt/vscode/libvulkan.so* - /opt/vscode/resources/app/extensions/* - /opt/vscode/resources/app/node_modules.asar.unpacked/* - /opt/vscode/swiftshader/libEGL.so - /opt/vscode/swiftshader/libGLESv2.so -" - -src_install() { - if use amd64; then - cd "${WORKDIR}/VSCode-linux-x64" || die - elif use arm; then - cd "${WORKDIR}/VSCode-linux-armhf" || die - elif use arm64; then - cd "${WORKDIR}/VSCode-linux-arm64" || die - else - die "Visual Studio Code only supports amd64, arm and arm64" - fi - - # Cleanup - rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die - - # Disable update server - sed -e "/updateUrl/d" -i ./resources/app/product.json || die - - # Install - pax-mark m code - insinto "/opt/${PN}" - doins -r * - fperms +x /opt/${PN}/{,bin/}code - fperms +x /opt/${PN}/chrome_crashpad_handler - fperms 4711 /opt/${PN}/chrome-sandbox - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh - fperms -R +x /opt/${PN}/resources/app/out/vs/base/node - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/node-pty/build/Release/spawn-helper - dosym "../../opt/${PN}/bin/code" "usr/bin/vscode" - dosym "../../opt/${PN}/bin/code" "usr/bin/code" - domenu "${FILESDIR}/vscode.desktop" - domenu "${FILESDIR}/vscode-url-handler.desktop" - domenu "${FILESDIR}/vscode-wayland.desktop" - domenu "${FILESDIR}/vscode-url-handler-wayland.desktop" - newicon "resources/app/resources/linux/code.png" "vscode.png" -} - -pkg_postinst() { - xdg_pkg_postinst - elog "You may want to install some additional utils, check in:" - elog "https://code.visualstudio.com/Docs/setup#_additional-tools" - optfeature "keyring support inside vscode" "gnome-base/gnome-keyring" -} diff --git a/app-editors/vscode/vscode-1.75.0-r2.ebuild b/app-editors/vscode/vscode-1.75.0-r2.ebuild new file mode 100644 index 000000000000..593a70028957 --- /dev/null +++ b/app-editors/vscode/vscode-1.75.0-r2.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop pax-utils xdg optfeature + +DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" +HOMEPAGE="https://code.visualstudio.com" +SRC_URI=" + amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz ) + arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz ) + arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz ) +" +S="${WORKDIR}" + +RESTRICT="mirror strip bindist" + +LICENSE=" + Apache-2.0 + BSD + BSD-1 + BSD-2 + BSD-4 + CC-BY-4.0 + ISC + LGPL-2.1+ + Microsoft-vscode + MIT + MPL-2.0 + openssl + PYTHON + TextMate-bundle + Unlicense + UoI-NCSA + W3C +" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret[crypt] + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/mesa + net-print/cups + sys-apps/util-linux + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon + x11-libs/libxkbfile + x11-libs/libXrandr + x11-libs/libxshmfence + x11-libs/pango +" + +QA_PREBUILT=" + /opt/vscode/bin/code-tunnel + /opt/vscode/chrome_crashpad_handler + /opt/vscode/chrome-sandbox + /opt/vscode/code + /opt/vscode/libEGL.so + /opt/vscode/libffmpeg.so + /opt/vscode/libGLESv2.so + /opt/vscode/libvk_swiftshader.so + /opt/vscode/libvulkan.so* + /opt/vscode/resources/app/extensions/* + /opt/vscode/resources/app/node_modules.asar.unpacked/* + /opt/vscode/swiftshader/libEGL.so + /opt/vscode/swiftshader/libGLESv2.so +" + +src_install() { + if use amd64; then + cd "${WORKDIR}/VSCode-linux-x64" || die + elif use arm; then + cd "${WORKDIR}/VSCode-linux-armhf" || die + elif use arm64; then + cd "${WORKDIR}/VSCode-linux-arm64" || die + else + die "Visual Studio Code only supports amd64, arm and arm64" + fi + + # Cleanup + rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die + + # Disable update server + sed -e "/updateUrl/d" -i ./resources/app/product.json || die + + # Install + pax-mark m code + insinto "/opt/${PN}" + doins -r * + fperms +x /opt/${PN}/{,bin/}code + fperms +x /opt/${PN}/chrome_crashpad_handler + fperms 4711 /opt/${PN}/chrome-sandbox + fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor,ssh-askpass}{,-empty}.sh + fperms -R +x /opt/${PN}/resources/app/out/vs/base/node + fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg + fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/node-pty/build/Release/spawn-helper + dosym "../../opt/${PN}/bin/code" "usr/bin/vscode" + dosym "../../opt/${PN}/bin/code" "usr/bin/code" + domenu "${FILESDIR}/vscode.desktop" + domenu "${FILESDIR}/vscode-url-handler.desktop" + domenu "${FILESDIR}/vscode-wayland.desktop" + domenu "${FILESDIR}/vscode-url-handler-wayland.desktop" + newicon "resources/app/resources/linux/code.png" "vscode.png" +} + +pkg_postinst() { + xdg_pkg_postinst + elog "You may want to install some additional utils, check in:" + elog "https://code.visualstudio.com/Docs/setup#_additional-tools" + optfeature "keyring support inside vscode" "gnome-base/gnome-keyring" +} diff --git a/app-editors/vscode/vscode-1.75.1-r1.ebuild b/app-editors/vscode/vscode-1.75.1-r1.ebuild new file mode 100644 index 000000000000..593a70028957 --- /dev/null +++ b/app-editors/vscode/vscode-1.75.1-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop pax-utils xdg optfeature + +DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" +HOMEPAGE="https://code.visualstudio.com" +SRC_URI=" + amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz ) + arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz ) + arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz ) +" +S="${WORKDIR}" + +RESTRICT="mirror strip bindist" + +LICENSE=" + Apache-2.0 + BSD + BSD-1 + BSD-2 + BSD-4 + CC-BY-4.0 + ISC + LGPL-2.1+ + Microsoft-vscode + MIT + MPL-2.0 + openssl + PYTHON + TextMate-bundle + Unlicense + UoI-NCSA + W3C +" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret[crypt] + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/mesa + net-print/cups + sys-apps/util-linux + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon + x11-libs/libxkbfile + x11-libs/libXrandr + x11-libs/libxshmfence + x11-libs/pango +" + +QA_PREBUILT=" + /opt/vscode/bin/code-tunnel + /opt/vscode/chrome_crashpad_handler + /opt/vscode/chrome-sandbox + /opt/vscode/code + /opt/vscode/libEGL.so + /opt/vscode/libffmpeg.so + /opt/vscode/libGLESv2.so + /opt/vscode/libvk_swiftshader.so + /opt/vscode/libvulkan.so* + /opt/vscode/resources/app/extensions/* + /opt/vscode/resources/app/node_modules.asar.unpacked/* + /opt/vscode/swiftshader/libEGL.so + /opt/vscode/swiftshader/libGLESv2.so +" + +src_install() { + if use amd64; then + cd "${WORKDIR}/VSCode-linux-x64" || die + elif use arm; then + cd "${WORKDIR}/VSCode-linux-armhf" || die + elif use arm64; then + cd "${WORKDIR}/VSCode-linux-arm64" || die + else + die "Visual Studio Code only supports amd64, arm and arm64" + fi + + # Cleanup + rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die + + # Disable update server + sed -e "/updateUrl/d" -i ./resources/app/product.json || die + + # Install + pax-mark m code + insinto "/opt/${PN}" + doins -r * + fperms +x /opt/${PN}/{,bin/}code + fperms +x /opt/${PN}/chrome_crashpad_handler + fperms 4711 /opt/${PN}/chrome-sandbox + fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor,ssh-askpass}{,-empty}.sh + fperms -R +x /opt/${PN}/resources/app/out/vs/base/node + fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg + fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/node-pty/build/Release/spawn-helper + dosym "../../opt/${PN}/bin/code" "usr/bin/vscode" + dosym "../../opt/${PN}/bin/code" "usr/bin/code" + domenu "${FILESDIR}/vscode.desktop" + domenu "${FILESDIR}/vscode-url-handler.desktop" + domenu "${FILESDIR}/vscode-wayland.desktop" + domenu "${FILESDIR}/vscode-url-handler-wayland.desktop" + newicon "resources/app/resources/linux/code.png" "vscode.png" +} + +pkg_postinst() { + xdg_pkg_postinst + elog "You may want to install some additional utils, check in:" + elog "https://code.visualstudio.com/Docs/setup#_additional-tools" + optfeature "keyring support inside vscode" "gnome-base/gnome-keyring" +} diff --git a/app-editors/vscode/vscode-1.75.1.ebuild b/app-editors/vscode/vscode-1.75.1.ebuild deleted file mode 100644 index 4dfa8178e6ec..000000000000 --- a/app-editors/vscode/vscode-1.75.1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop pax-utils xdg optfeature - -DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" -HOMEPAGE="https://code.visualstudio.com" -SRC_URI=" - amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz ) - arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz ) - arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz ) -" -S="${WORKDIR}" - -RESTRICT="mirror strip bindist" - -LICENSE=" - Apache-2.0 - BSD - BSD-1 - BSD-2 - BSD-4 - CC-BY-4.0 - ISC - LGPL-2.1+ - Microsoft-vscode - MIT - MPL-2.0 - openssl - PYTHON - TextMate-bundle - Unlicense - UoI-NCSA - W3C -" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64" - -RDEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - app-crypt/libsecret[crypt] - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/mesa - net-print/cups - sys-apps/util-linux - sys-apps/dbus - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libxshmfence - x11-libs/pango -" - -QA_PREBUILT=" - /opt/vscode/bin/code-tunnel - /opt/vscode/chrome_crashpad_handler - /opt/vscode/chrome-sandbox - /opt/vscode/code - /opt/vscode/libEGL.so - /opt/vscode/libffmpeg.so - /opt/vscode/libGLESv2.so - /opt/vscode/libvk_swiftshader.so - /opt/vscode/libvulkan.so* - /opt/vscode/resources/app/extensions/* - /opt/vscode/resources/app/node_modules.asar.unpacked/* - /opt/vscode/swiftshader/libEGL.so - /opt/vscode/swiftshader/libGLESv2.so -" - -src_install() { - if use amd64; then - cd "${WORKDIR}/VSCode-linux-x64" || die - elif use arm; then - cd "${WORKDIR}/VSCode-linux-armhf" || die - elif use arm64; then - cd "${WORKDIR}/VSCode-linux-arm64" || die - else - die "Visual Studio Code only supports amd64, arm and arm64" - fi - - # Cleanup - rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die - - # Disable update server - sed -e "/updateUrl/d" -i ./resources/app/product.json || die - - # Install - pax-mark m code - insinto "/opt/${PN}" - doins -r * - fperms +x /opt/${PN}/{,bin/}code - fperms +x /opt/${PN}/chrome_crashpad_handler - fperms 4711 /opt/${PN}/chrome-sandbox - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor}{,-empty}.sh - fperms -R +x /opt/${PN}/resources/app/out/vs/base/node - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/node-pty/build/Release/spawn-helper - dosym "../../opt/${PN}/bin/code" "usr/bin/vscode" - dosym "../../opt/${PN}/bin/code" "usr/bin/code" - domenu "${FILESDIR}/vscode.desktop" - domenu "${FILESDIR}/vscode-url-handler.desktop" - domenu "${FILESDIR}/vscode-wayland.desktop" - domenu "${FILESDIR}/vscode-url-handler-wayland.desktop" - newicon "resources/app/resources/linux/code.png" "vscode.png" -} - -pkg_postinst() { - xdg_pkg_postinst - elog "You may want to install some additional utils, check in:" - elog "https://code.visualstudio.com/Docs/setup#_additional-tools" - optfeature "keyring support inside vscode" "gnome-base/gnome-keyring" -} -- cgit v1.2.3-65-gdbad