public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-editors/vscode/, app-editors/vscode/files/
@ 2021-05-27  7:26 Joonas Niilola
  0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2021-05-27  7:26 UTC (permalink / raw
  To: gentoo-commits

commit:     f611be487a31ee398da4275c436a761c5d59511a
Author:     Adel KARA SLIMANE <adel <AT> karaslimane <DOT> com>
AuthorDate: Fri May  7 00:43:58 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu May 27 07:26:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f611be48

app-editors/vscode: New package

Visual Studio Code is a lightweight but powerful source code editor which
runs on your desktop and is available for Windows, macOS and Linux. It
comes with built-in support for JavaScript, TypeScript and Node.js and has
a rich ecosystem of extensions for other languages (such as C++, C#, Java,
Python, PHP, Go) and runtimes (such as .NET and Unity).

Closes: https://bugs.gentoo.org/657628
Closes: https://github.com/gentoo/gentoo/pull/20710
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 +
 .../vscode/files/vscode-url-handler.desktop        |  12 +++
 app-editors/vscode/files/vscode.desktop            |  18 ++++
 app-editors/vscode/metadata.xml                    |  23 +++++
 app-editors/vscode/vscode-1.56.2.ebuild            | 105 +++++++++++++++++++++
 5 files changed, 161 insertions(+)

diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
new file mode 100644
index 00000000000..8d4c4f054dd
--- /dev/null
+++ b/app-editors/vscode/Manifest
@@ -0,0 +1,3 @@
+DIST vscode-1.56.2-amd64.tar.gz 104824843 BLAKE2B 608cc74daad0534a91d3c6200827b82efa0c2a9634c3cd9f031d4744a35f25c5201a7310011d6dfe57f761845e79574d068678a4500650c47d8404d2bd810f4d SHA512 35ef320b92a66d05a8c2b61a81978d659245f37ef0b2f05002083386a265a232ed163dcc06ddee9bc2bc8f1205fa80e7841268bf66fdddcabe4a8ed35fb50a35
+DIST vscode-1.56.2-arm.tar.gz 95395040 BLAKE2B e948f09a97a39f898276fe4bbc9f7f35fa96b833732a48058e402aaa0246790d79c5422f5e209c842b94c6c46d19b657cdeefa9caa1e255331f81e91e0760c69 SHA512 4486d030d2d611aa0d29a156ba5c2beb2bd0ab1950684c7bdea44460fb05f3a18b62419c346d99a84cd71bb595f7802dab10730b40600879e442ee3181129e6f
+DIST vscode-1.56.2-arm64.tar.gz 110174990 BLAKE2B 3b512136911b3ca431fbf71951655490c85f1c7cc707c6ddea3fd4d41b956fbf33dd8264e279d1d6e69564506aefcd9588397665133a3a34997d916605c9aa73 SHA512 bc3fb6b78e33286486411aa78b538693c371b309e86a84ee7361a2fd78d2d8e0dd4e9dd761f9278ced4e3a31a532e2534cdde001635935dfda92dfab85eb9e51

diff --git a/app-editors/vscode/files/vscode-url-handler.desktop b/app-editors/vscode/files/vscode-url-handler.desktop
new file mode 100644
index 00000000000..ec5bb1732c3
--- /dev/null
+++ b/app-editors/vscode/files/vscode-url-handler.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Visual Studio Code - URL Handler
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscode --open-url %U
+Icon=vscode
+Type=Application
+NoDisplay=true
+StartupNotify=true
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=x-scheme-handler/vscode;
+Keywords=vscode;

diff --git a/app-editors/vscode/files/vscode.desktop b/app-editors/vscode/files/vscode.desktop
new file mode 100644
index 00000000000..31711273999
--- /dev/null
+++ b/app-editors/vscode/files/vscode.desktop
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=Visual Studio Code
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscode --unity-launch %F
+Icon=vscode
+Type=Application
+StartupNotify=false
+StartupWMClass=Code
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=text/plain;inode/directory;application/x-code-workspace;
+Actions=new-empty-window;
+Keywords=vscode;
+
+[Desktop Action new-empty-window]
+Name=New Empty Window
+Exec=/usr/bin/vscode --new-window %F
+Icon=vscode

diff --git a/app-editors/vscode/metadata.xml b/app-editors/vscode/metadata.xml
new file mode 100644
index 00000000000..9aea48978a9
--- /dev/null
+++ b/app-editors/vscode/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>adel.ks@zegrapher.com</email>
+		<name>Adel KARA SLIMANE</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Visual Studio Code is a lightweight but powerful source code editor which
+		runs on your desktop and is available for Windows, macOS and Linux. It
+		comes with built-in support for JavaScript, TypeScript and Node.js and has
+		a rich ecosystem of extensions for other languages (such as C++, C#, Java,
+		Python, PHP, Go) and runtimes (such as .NET and Unity).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">microsoft/vscode</remote-id>
+		<bugs-to>https://github.com/microsoft/vscode/issues</bugs-to>
+	</upstream>
+</pkgmetadata>

diff --git a/app-editors/vscode/vscode-1.56.2.ebuild b/app-editors/vscode/vscode-1.56.2.ebuild
new file mode 100644
index 00000000000..9f849c2af23
--- /dev/null
+++ b/app-editors/vscode/vscode-1.56.2.ebuild
@@ -0,0 +1,105 @@
+# 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 )
+"
+
+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"
+IUSE=""
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret[crypt]
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libpng:0/16
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	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/*
+"
+
+pkg_setup() {
+	if use amd64; then
+		S="${WORKDIR}/VSCode-linux-x64"
+	elif use arm; then
+		S="${WORKDIR}/VSCode-linux-armhf"
+	elif use arm64; then
+		S="${WORKDIR}/VSCode-linux-arm64"
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+}
+
+src_install() {
+	# Cleanup
+	rm -r "${S}/resources/app/LICENSES.chromium.html" "${S}/resources/app/LICENSE.rtf" "${S}/resources/app/licenses" || die
+
+	# Install
+	pax-mark m code
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}code
+	fperms +x /opt/${PN}/chrome-sandbox
+	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"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.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"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/vscode/, app-editors/vscode/files/
@ 2021-09-14  7:39 Joonas Niilola
  0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2021-09-14  7:39 UTC (permalink / raw
  To: gentoo-commits

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"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/vscode/, app-editors/vscode/files/
@ 2024-01-14 20:27 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2024-01-14 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2c4aee0e7ed1a19b15e4e1975dde9189a9bd2351
Author:     Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Sun Jan 14 18:19:31 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 20:26:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c4aee0e

app-editors/vscode: add 'wayland' USE flag

So we merge the two desktop entries that trip DEs
(at least KDE on X11) into one

Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../files/vscode-url-handler-wayland.desktop       | 12 ------------
 .../vscode/files/vscode-url-handler.desktop        |  2 +-
 app-editors/vscode/files/vscode-wayland.desktop    | 18 ------------------
 app-editors/vscode/files/vscode.desktop            |  4 ++--
 app-editors/vscode/metadata.xml                    |  3 +++
 ...scode-1.85.0.ebuild => vscode-1.85.0-r1.ebuild} | 22 +++++++++++++++++-----
 ...scode-1.85.1.ebuild => vscode-1.85.1-r1.ebuild} | 22 +++++++++++++++++-----
 7 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/app-editors/vscode/files/vscode-url-handler-wayland.desktop b/app-editors/vscode/files/vscode-url-handler-wayland.desktop
deleted file mode 100644
index a3214afa7d32..000000000000
--- a/app-editors/vscode/files/vscode-url-handler-wayland.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=VSCode - URL Handler
-Comment=Editing evolved
-GenericName=Code Editor
-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;code;

diff --git a/app-editors/vscode/files/vscode-url-handler.desktop b/app-editors/vscode/files/vscode-url-handler.desktop
index 73e3834801b4..fe65d7527069 100644
--- a/app-editors/vscode/files/vscode-url-handler.desktop
+++ b/app-editors/vscode/files/vscode-url-handler.desktop
@@ -2,7 +2,7 @@
 Name=VSCode - URL Handler
 Comment=Editing evolved
 GenericName=Code Editor
-Exec=/usr/bin/vscode --open-url %U
+Exec=/usr/bin/vscode @exec_extra_flags@ --open-url %U
 Icon=vscode
 Type=Application
 NoDisplay=true

diff --git a/app-editors/vscode/files/vscode-wayland.desktop b/app-editors/vscode/files/vscode-wayland.desktop
deleted file mode 100644
index 1c12a97ffd01..000000000000
--- a/app-editors/vscode/files/vscode-wayland.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=VSCode Wayland
-Comment=Editing evolved
-GenericName=Code Editor
-Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --unity-launch %F
-Icon=vscode
-Type=Application
-StartupNotify=false
-StartupWMClass=Code
-Categories=Utility;TextEditor;Development;IDE;
-MimeType=text/plain;inode/directory;application/x-code-workspace;
-Actions=new-empty-window;
-Keywords=vscode;code;
-
-[Desktop Action new-empty-window]
-Name=New Empty Window
-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 d648416a26ca..ec697eca68b6 100644
--- a/app-editors/vscode/files/vscode.desktop
+++ b/app-editors/vscode/files/vscode.desktop
@@ -2,7 +2,7 @@
 Name=VSCode
 Comment=Editing evolved
 GenericName=Code Editor
-Exec=/usr/bin/vscode --unity-launch %F
+Exec=/usr/bin/vscode @exec_extra_flags@ --unity-launch %F
 Icon=vscode
 Type=Application
 StartupNotify=false
@@ -14,5 +14,5 @@ Keywords=vscode;code;
 
 [Desktop Action new-empty-window]
 Name=New Empty Window
-Exec=/usr/bin/vscode --new-window %F
+Exec=/usr/bin/vscode @exec_extra_flags@ --new-window %F
 Icon=vscode

diff --git a/app-editors/vscode/metadata.xml b/app-editors/vscode/metadata.xml
index 5e8dfffc3faa..177d32d281e8 100644
--- a/app-editors/vscode/metadata.xml
+++ b/app-editors/vscode/metadata.xml
@@ -13,6 +13,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="wayland">Run in wayland mode under wayland sessions, xwayland otherwise. This flag doesn't affect x11 sessions.</flag>
+	</use>
 	<longdescription>
 		Visual Studio Code is a lightweight but powerful source code editor which
 		runs on your desktop and is available for Windows, macOS and Linux. It

diff --git a/app-editors/vscode/vscode-1.85.0.ebuild b/app-editors/vscode/vscode-1.85.0-r1.ebuild
similarity index 83%
rename from app-editors/vscode/vscode-1.85.0.ebuild
rename to app-editors/vscode/vscode-1.85.0-r1.ebuild
index dc88161cc376..e41624cd8829 100644
--- a/app-editors/vscode/vscode-1.85.0.ebuild
+++ b/app-editors/vscode/vscode-1.85.0-r1.ebuild
@@ -35,7 +35,7 @@ LICENSE="
 "
 SLOT="0"
 KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="kerberos"
+IUSE="kerberos wayland"
 RESTRICT="mirror strip bindist"
 
 RDEPEND="
@@ -104,10 +104,22 @@ src_install() {
 
 	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
 	dosym -r "/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"
+
+	local EXEC_EXTRA_FLAGS=()
+	if use wayland; then
+		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" )
+	fi
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/vscode-url-handler.desktop" \
+		> "${T}/vscode-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/vscode.desktop" \
+		> "${T}/vscode.desktop" || die
+
+	domenu "${T}/vscode.desktop"
+	domenu "${T}/vscode-url-handler.desktop"
 	newicon "resources/app/resources/linux/code.png" "vscode.png"
 }
 

diff --git a/app-editors/vscode/vscode-1.85.1.ebuild b/app-editors/vscode/vscode-1.85.1-r1.ebuild
similarity index 83%
rename from app-editors/vscode/vscode-1.85.1.ebuild
rename to app-editors/vscode/vscode-1.85.1-r1.ebuild
index dc88161cc376..e41624cd8829 100644
--- a/app-editors/vscode/vscode-1.85.1.ebuild
+++ b/app-editors/vscode/vscode-1.85.1-r1.ebuild
@@ -35,7 +35,7 @@ LICENSE="
 "
 SLOT="0"
 KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="kerberos"
+IUSE="kerberos wayland"
 RESTRICT="mirror strip bindist"
 
 RDEPEND="
@@ -104,10 +104,22 @@ src_install() {
 
 	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
 	dosym -r "/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"
+
+	local EXEC_EXTRA_FLAGS=()
+	if use wayland; then
+		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" )
+	fi
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/vscode-url-handler.desktop" \
+		> "${T}/vscode-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/vscode.desktop" \
+		> "${T}/vscode.desktop" || die
+
+	domenu "${T}/vscode.desktop"
+	domenu "${T}/vscode-url-handler.desktop"
 	newicon "resources/app/resources/linux/code.png" "vscode.png"
 }
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/vscode/, app-editors/vscode/files/
@ 2024-02-18  5:37 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2024-02-18  5:37 UTC (permalink / raw
  To: gentoo-commits

commit:     dc15838b4224f5bdf4be3b7f1bbba9d46711b33b
Author:     Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Sat Feb 17 01:30:59 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 05:37:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc15838b

app-editors/vscode: fix .desktop file icon issue

Closes: https://bugs.gentoo.org/924454

Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../{vscode-url-handler.desktop => code-url-handler.desktop} |  0
 app-editors/vscode/files/{vscode.desktop => code.desktop}    |  0
 .../vscode/{vscode-1.86.1.ebuild => vscode-1.86.1-r1.ebuild} | 12 ++++++------
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-editors/vscode/files/vscode-url-handler.desktop b/app-editors/vscode/files/code-url-handler.desktop
similarity index 100%
rename from app-editors/vscode/files/vscode-url-handler.desktop
rename to app-editors/vscode/files/code-url-handler.desktop

diff --git a/app-editors/vscode/files/vscode.desktop b/app-editors/vscode/files/code.desktop
similarity index 100%
rename from app-editors/vscode/files/vscode.desktop
rename to app-editors/vscode/files/code.desktop

diff --git a/app-editors/vscode/vscode-1.86.1.ebuild b/app-editors/vscode/vscode-1.86.1-r1.ebuild
similarity index 92%
rename from app-editors/vscode/vscode-1.86.1.ebuild
rename to app-editors/vscode/vscode-1.86.1-r1.ebuild
index 75ef1fe52ecb..ac7c312270de 100644
--- a/app-editors/vscode/vscode-1.86.1.ebuild
+++ b/app-editors/vscode/vscode-1.86.1-r1.ebuild
@@ -113,15 +113,15 @@ src_install() {
 	fi
 
 	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/vscode-url-handler.desktop" \
-		> "${T}/vscode-url-handler.desktop" || die
+		"${FILESDIR}/code-url-handler.desktop" \
+		> "${T}/code-url-handler.desktop" || die
 
 	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/vscode.desktop" \
-		> "${T}/vscode.desktop" || die
+		"${FILESDIR}/code.desktop" \
+		> "${T}/code.desktop" || die
 
-	domenu "${T}/vscode.desktop"
-	domenu "${T}/vscode-url-handler.desktop"
+	domenu "${T}/code.desktop"
+	domenu "${T}/code-url-handler.desktop"
 	newicon "resources/app/resources/linux/code.png" "vscode.png"
 }
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/vscode/, app-editors/vscode/files/
@ 2024-12-28  8:33 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2024-12-28  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     c65de41abed1204ef5fba09d17e54a10cf834bf4
Author:     Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Thu Dec 26 02:08:52 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 08:32:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65de41a

app-editors/vscode: add desktop file to open files in new window

Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-editors/vscode/files/code-open-in-new-window.desktop | 13 +++++++++++++
 app-editors/vscode/vscode-1.96.0.ebuild                  |  5 +++++
 app-editors/vscode/vscode-1.96.1.ebuild                  |  5 +++++
 app-editors/vscode/vscode-1.96.2.ebuild                  |  5 +++++
 4 files changed, 28 insertions(+)

diff --git a/app-editors/vscode/files/code-open-in-new-window.desktop b/app-editors/vscode/files/code-open-in-new-window.desktop
new file mode 100644
index 000000000000..78185549b3d4
--- /dev/null
+++ b/app-editors/vscode/files/code-open-in-new-window.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=VSCode (in new window)
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscode @exec_extra_flags@ --new-window -- %F
+Icon=vscode
+NoDisplay=true
+Type=Application
+StartupNotify=false
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=text/plain;inode/directory;application/x-code-workspace;
+Actions=new-empty-window;
+Keywords=vscode;code;

diff --git a/app-editors/vscode/vscode-1.96.0.ebuild b/app-editors/vscode/vscode-1.96.0.ebuild
index 67e7780619ca..57c59f907d74 100644
--- a/app-editors/vscode/vscode-1.96.0.ebuild
+++ b/app-editors/vscode/vscode-1.96.0.ebuild
@@ -119,8 +119,13 @@ src_install() {
 		"${FILESDIR}/code.desktop" \
 		> "${T}/code.desktop" || die
 
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-open-in-new-window.desktop" \
+		> "${T}/code-open-in-new-window.desktop" || die
+
 	domenu "${T}/code.desktop"
 	domenu "${T}/code-url-handler.desktop"
+	domenu "${T}/code-open-in-new-window.desktop"
 	newicon "resources/app/resources/linux/code.png" "vscode.png"
 }
 

diff --git a/app-editors/vscode/vscode-1.96.1.ebuild b/app-editors/vscode/vscode-1.96.1.ebuild
index 67e7780619ca..57c59f907d74 100644
--- a/app-editors/vscode/vscode-1.96.1.ebuild
+++ b/app-editors/vscode/vscode-1.96.1.ebuild
@@ -119,8 +119,13 @@ src_install() {
 		"${FILESDIR}/code.desktop" \
 		> "${T}/code.desktop" || die
 
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-open-in-new-window.desktop" \
+		> "${T}/code-open-in-new-window.desktop" || die
+
 	domenu "${T}/code.desktop"
 	domenu "${T}/code-url-handler.desktop"
+	domenu "${T}/code-open-in-new-window.desktop"
 	newicon "resources/app/resources/linux/code.png" "vscode.png"
 }
 

diff --git a/app-editors/vscode/vscode-1.96.2.ebuild b/app-editors/vscode/vscode-1.96.2.ebuild
index 67e7780619ca..57c59f907d74 100644
--- a/app-editors/vscode/vscode-1.96.2.ebuild
+++ b/app-editors/vscode/vscode-1.96.2.ebuild
@@ -119,8 +119,13 @@ src_install() {
 		"${FILESDIR}/code.desktop" \
 		> "${T}/code.desktop" || die
 
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-open-in-new-window.desktop" \
+		> "${T}/code-open-in-new-window.desktop" || die
+
 	domenu "${T}/code.desktop"
 	domenu "${T}/code-url-handler.desktop"
+	domenu "${T}/code-open-in-new-window.desktop"
 	newicon "resources/app/resources/linux/code.png" "vscode.png"
 }
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-12-28  8:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-18  5:37 [gentoo-commits] repo/gentoo:master commit in: app-editors/vscode/, app-editors/vscode/files/ Arthur Zamarin
  -- strict thread matches above, loose matches on Subject: below --
2024-12-28  8:33 Arthur Zamarin
2024-01-14 20:27 Arthur Zamarin
2021-09-14  7:39 Joonas Niilola
2021-05-27  7:26 Joonas Niilola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox