[gentoo-commits] repo/gentoo:master commit in: app-editors/vscode/, app-editors/vscode/files/

[Joonas Niilola]

commit:     9cfd21d6e5bd33376c6a0b82ab5c6c4d4233e280
Author:     Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Fri Sep 10 11:44:19 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 07:38:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfd21d6

app-editors/vscode: version bump to 1.60.0 + wayland support

Closes: https://bugs.gentoo.org/809401
Closes: https://bugs.gentoo.org/811759
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-editors/vscode/Manifest                        |   3 +
 ....desktop => vscode-url-handler-wayland.desktop} |   6 +-
 .../vscode/files/vscode-url-handler.desktop        |   4 +-
 .../{vscode.desktop => vscode-wayland.desktop}     |   8 +-
 app-editors/vscode/files/vscode.desktop            |   4 +-
 app-editors/vscode/vscode-1.60.0.ebuild            | 121 +++++++++++++++++++++
 6 files changed, 135 insertions(+), 11 deletions(-)

diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 8653148b0cc..6cef25b32a0 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -4,3 +4,6 @@ DIST vscode-1.58.2-arm64.tar.gz 110942132 BLAKE2B 3fb2a83087789690ba930ae0910b93
 DIST vscode-1.59.1-amd64.tar.gz 106142213 BLAKE2B eed73d0e98ea0275ed005586f18e14b3671a4dea301f44f469798bae3c298d8eb7e819c896957f9a1cd3e978ce171ff9d3a7433ede540b0647cae735b2d53bcd SHA512 c7ae7417bd233498b6be0dbcbc67ee44283a14938bfecb3b61d224533a4edf31c291bebdb90e87d769cb52afb9ac17f2fb20ba64dab7773d1ce965aa9d7bfae6
 DIST vscode-1.59.1-arm.tar.gz 97705768 BLAKE2B daf2b56ecbf45b57d6b147e4b839000621e367caac66189151b9021ade6901941a8d641291a132d1c1bbdf40bb411bc65d8663743307e896670cfaf24d335feb SHA512 ade1499986a4cefad933cbcf9a073230e74b1a554248e41f1b58480d53b68f6ed0fa0e8faa6f52e59eebc94dcc5127bdbedf77deeab0b108ec7832c71cfd3f6f
 DIST vscode-1.59.1-arm64.tar.gz 111284699 BLAKE2B c349c47208a6caf868070f9bb5bb6b23ff6eaa11de8d754edf8bec8fdd6fdd81c0ff246829a7ef4a92697ecb6356b779456aa8c1781f50ca4c7891297788aa43 SHA512 27b8aeac5ed2bac8bc6dc502ca39cac94f7e8ea4ea6baedffaa3b44dea451738e798674976444268db5543b6a144d55cadd47ded755a66c484c4c05cd5d20ad8
+DIST vscode-1.60.0-amd64.tar.gz 105538376 BLAKE2B 2d624015210031d067752d9dce79eea7a1163b824030d67613534a7987babfb30400a21cf48dd228bd00617bf5ede4770ae2dc4f5b884fad88e35b75b3867764 SHA512 b18d74d05f3b7005939a074e2095e66520ab98040df2cfc06c54b72367cea85e990995d51605070975f80fd20578333ee71631599491d705b217b8eec6d5557b
+DIST vscode-1.60.0-arm.tar.gz 94231473 BLAKE2B c7e64028a661cc7a1ded78c5810583eaab576825328c0e6dc90e21b9aa324580ea498bc93383711ab8c7817990775d1985eb7928c20142974b52d74e80ff9f49 SHA512 1ec6b4fcfe494cf0e234eeb6c3d71e315f95041243cb7ca04bf1dd53ee44d978137f1cf1e92e60fd584fedc945e05bacd316574f1daf04c9710361457566166a
+DIST vscode-1.60.0-arm64.tar.gz 107828500 BLAKE2B add0cc04b795f1181747862eca9fd9c984847358f7c644ac9472d46a05bf369cef5f85224dcbe060fbd16216a35c466b1043c4ceed0c68114b3fd89abdd20cef SHA512 963ab8d05497b537f758b227fa8d101234be82effcac99bf4f9c53d7f995f842e996ceaf905a76bceb6ed9e5233ab40be6b1629319af49fa15614b1835b45702

diff --git a/app-editors/vscode/files/vscode-url-handler.desktop b/app-editors/vscode/files/vscode-url-handler-wayland.desktop
similarity index 59%
copy from app-editors/vscode/files/vscode-url-handler.desktop
copy to app-editors/vscode/files/vscode-url-handler-wayland.desktop
index ec5bb1732c3..a3214afa7d3 100644
--- a/app-editors/vscode/files/vscode-url-handler.desktop
+++ b/app-editors/vscode/files/vscode-url-handler-wayland.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Name=Visual Studio Code - URL Handler
+Name=VSCode - URL Handler
 Comment=Editing evolved
 GenericName=Code Editor
-Exec=/usr/bin/vscode --open-url %U
+Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --open-url %U
 Icon=vscode
 Type=Application
 NoDisplay=true
 StartupNotify=true
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=x-scheme-handler/vscode;
-Keywords=vscode;
+Keywords=vscode;code;

diff --git a/app-editors/vscode/files/vscode-url-handler.desktop b/app-editors/vscode/files/vscode-url-handler.desktop
index ec5bb1732c3..73e3834801b 100644
--- a/app-editors/vscode/files/vscode-url-handler.desktop
+++ b/app-editors/vscode/files/vscode-url-handler.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Visual Studio Code - URL Handler
+Name=VSCode - URL Handler
 Comment=Editing evolved
 GenericName=Code Editor
 Exec=/usr/bin/vscode --open-url %U
@@ -9,4 +9,4 @@ NoDisplay=true
 StartupNotify=true
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=x-scheme-handler/vscode;
-Keywords=vscode;
+Keywords=vscode;code;

diff --git a/app-editors/vscode/files/vscode.desktop b/app-editors/vscode/files/vscode-wayland.desktop
similarity index 58%
copy from app-editors/vscode/files/vscode.desktop
copy to app-editors/vscode/files/vscode-wayland.desktop
index 31711273999..1c12a97ffd0 100644
--- a/app-editors/vscode/files/vscode.desktop
+++ b/app-editors/vscode/files/vscode-wayland.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Visual Studio Code
+Name=VSCode Wayland
 Comment=Editing evolved
 GenericName=Code Editor
-Exec=/usr/bin/vscode --unity-launch %F
+Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --unity-launch %F
 Icon=vscode
 Type=Application
 StartupNotify=false
@@ -10,9 +10,9 @@ StartupWMClass=Code
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=text/plain;inode/directory;application/x-code-workspace;
 Actions=new-empty-window;
-Keywords=vscode;
+Keywords=vscode;code;
 
 [Desktop Action new-empty-window]
 Name=New Empty Window
-Exec=/usr/bin/vscode --new-window %F
+Exec=/usr/bin/vscode  --enable-features=UseOzonePlatform --ozone-platform=wayland --new-window %F
 Icon=vscode

diff --git a/app-editors/vscode/files/vscode.desktop b/app-editors/vscode/files/vscode.desktop
index 31711273999..d648416a26c 100644
--- a/app-editors/vscode/files/vscode.desktop
+++ b/app-editors/vscode/files/vscode.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Visual Studio Code
+Name=VSCode
 Comment=Editing evolved
 GenericName=Code Editor
 Exec=/usr/bin/vscode --unity-launch %F
@@ -10,7 +10,7 @@ StartupWMClass=Code
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=text/plain;inode/directory;application/x-code-workspace;
 Actions=new-empty-window;
-Keywords=vscode;
+Keywords=vscode;code;
 
 [Desktop Action new-empty-window]
 Name=New Empty Window

diff --git a/app-editors/vscode/vscode-1.60.0.ebuild b/app-editors/vscode/vscode-1.60.0.ebuild
new file mode 100644
index 00000000000..dbed711c205
--- /dev/null
+++ b/app-editors/vscode/vscode-1.60.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+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-atk:2
+	app-accessibility/at-spi2-core:2
+	app-crypt/libsecret[crypt]
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	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/code
+	/opt/vscode/libEGL.so
+	/opt/vscode/libffmpeg.so
+	/opt/vscode/libGLESv2.so
+	/opt/vscode/libvulkan.so*
+	/opt/vscode/chrome-sandbox
+	/opt/vscode/libvk_swiftshader.so
+	/opt/vscode/swiftshader/libEGL.so
+	/opt/vscode/swiftshader/libGLESv2.so
+	/opt/vscode/resources/app/extensions/*
+	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+"
+
+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
+
+	# Install
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}code
+	fperms 4711 /opt/${PN}/chrome-sandbox
+	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/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
+	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"
+}