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

[Joonas Niilola]

commit:     6b7cac79fda891fda9210afbdf30326f4b71d9be
Author:     Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Fri Sep 10 11:43:31 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=6b7cac79

app-editors/vscodium: 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/vscodium/Manifest                      |   3 +
 ...esktop => vscodium-url-handler-wayland.desktop} |   8 +-
 .../vscodium/files/vscodium-url-handler.desktop    |   2 +-
 .../{vscodium.desktop => vscodium-wayland.desktop} |   8 +-
 app-editors/vscodium/files/vscodium.desktop        |   2 +-
 app-editors/vscodium/vscodium-1.60.0.ebuild        | 112 +++++++++++++++++++++
 6 files changed, 125 insertions(+), 10 deletions(-)

diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index b1be82025ec..0c13ad4f344 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -4,3 +4,6 @@ DIST vscodium-1.58.2-arm64.tar.gz 115052512 BLAKE2B d1047b34bf6132f47b7423e35a7c
 DIST vscodium-1.59.1-amd64.tar.gz 110191208 BLAKE2B e7cc44d690fb0f3c25e0ef39198784ac651bcdc13e84918d44fdfb99b48d918dae8a1c7b9129b482cbe34e98a26bd44d9eb47d5df5daf73fdcffae7b5482b506 SHA512 401df889b5dea5c045fccb3d93fa5f5bcfaeb162977e434498e7600f67efb877c64effac7371f29f51e297c713640df2cad1f4db9540797f7146608e4d8f530b
 DIST vscodium-1.59.1-arm.tar.gz 100781835 BLAKE2B 36f463f93b03afc9a191aebaf96cc6eb9c43feb0274a167cca6a983d85381821e10c9cdcba3f384a09d431bb3c4b55fcdd248b9ce93614ac3ddf2129c80f6f87 SHA512 3df672daa85b838bc45a4cb4da3e9001a008ff66ce469f6b9f25d066bdbfaad951f4e8e392cde59fa90024d3977f707b2c5d1d079797803caa538ddc56133b73
 DIST vscodium-1.59.1-arm64.tar.gz 115349031 BLAKE2B 9762a344b490ea0278cbb36e0f27a5d62417b8b356b08c62bc1577a4c959f5c65997676a4c8555832bd62ec6af4c3ce253a1c277881cf0430e0af15d56071201 SHA512 b47c2718889cc6bacb79fd73e3e4090a94078768992ca0bb2be77030266d547ad8c8d884deaa7d3925e4c94e74ed3bda8a5fca678459dfd6e64c3d2a752ee9c0
+DIST vscodium-1.60.0-amd64.tar.gz 106732940 BLAKE2B 97fabc0050343f0d31083d681a89221b8352b042ad24306d80a2612774dd520a7b84f9207935bf7b72464458cfe1c9f9121f3bdb70ac13961f2d1068cab848a1 SHA512 ac20c429a82725206ab86745989bc7ef0d154b6f21d1aa78ddc67c89496797440c77d07e52b64e8fcec3f5071d8b6e3bb9717177edeef443fc8b6bf31191ac38
+DIST vscodium-1.60.0-arm.tar.gz 97322846 BLAKE2B 858f6ef4af9e625838a3b26b4ab234d8c01254a1c683460dc2969127c4de3d84ab188c533ba759c48036b523aa138eeb4a00a608a8ae943f0deff916ca5bdc93 SHA512 3de67b031bf827e5c186627538476372a6eedb7f7d5bbbdae805e0d3c4c3d6604afd6452c79d85472dbc827b3ed5862c94f48feeffb1d12c36c440a5ee0ba522
+DIST vscodium-1.60.0-arm64.tar.gz 111888114 BLAKE2B 4167a4fbaeccdefc7c43b16accfea03f0eede612417fbd6538646cc02f216cc9b8189d68fe723b95e1c27f126c22c0ac9c24392bdeb80737d94cbe80d27200fe SHA512 c73252affe1c15619937376a9798784754424134c7ab944fd9656dbb782f195ed5cab6881aafcbd6f2d08762afb44146ad5d5fa4242c7bc2f89f3db3c2fa3b8b

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

diff --git a/app-editors/vscodium/files/vscodium-url-handler.desktop b/app-editors/vscodium/files/vscodium-url-handler.desktop
index 780fb6d5558..e61b3418cdc 100644
--- a/app-editors/vscodium/files/vscodium-url-handler.desktop
+++ b/app-editors/vscodium/files/vscodium-url-handler.desktop
@@ -9,4 +9,4 @@ NoDisplay=true
 StartupNotify=true
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=x-scheme-handler/vscodium;
-Keywords=vscode;
+Keywords=vscode;vscodium;code;

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

diff --git a/app-editors/vscodium/files/vscodium.desktop b/app-editors/vscodium/files/vscodium.desktop
index bea1b284d39..072c74bac03 100644
--- a/app-editors/vscodium/files/vscodium.desktop
+++ b/app-editors/vscodium/files/vscodium.desktop
@@ -10,7 +10,7 @@ StartupWMClass=VSCodium
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=text/plain;inode/directory;application/x-code-workspace;
 Actions=new-empty-window;
-Keywords=vscode;
+Keywords=vscode;vscodium;code;
 
 [Desktop Action new-empty-window]
 Name=New Empty Window

diff --git a/app-editors/vscodium/vscodium-1.60.0.ebuild b/app-editors/vscodium/vscodium-1.60.0.ebuild
new file mode 100644
index 00000000000..798132d28e0
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.60.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
+	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
+	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
+"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE=""
+
+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/vscodium/codium
+	/opt/vscodium/libEGL.so
+	/opt/vscodium/libffmpeg.so
+	/opt/vscodium/libGLESv2.so
+	/opt/vscodium/libvulkan.so*
+	/opt/vscodium/chrome-sandbox
+	/opt/vscodium/libvk_swiftshader.so
+	/opt/vscodium/swiftshader/libEGL.so
+	/opt/vscodium/swiftshader/libGLESv2.so
+	/opt/vscodium/resources/app/extensions/*
+	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	# Cleanup
+	rm "${S}/resources/app/LICENSE.txt" || die
+
+	# Install
+	pax-mark m codium
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}codium
+	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/codium" "usr/bin/vscodium"
+	dosym "../../opt/${PN}/bin/codium" "usr/bin/codium"
+	domenu "${FILESDIR}/vscodium.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler.desktop"
+	domenu "${FILESDIR}/vscodium-wayland.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "When compared to the regular VSCode, VSCodium has a few quirks"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+}