From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D2460158451 for ; Sun, 14 Jan 2024 20:27:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7757CE29DE; Sun, 14 Jan 2024 20:27:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 549ADE29DE for ; Sun, 14 Jan 2024 20:27:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 664903431FE for ; Sun, 14 Jan 2024 20:27:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF28411A0 for ; Sun, 14 Jan 2024 20:27:45 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1705263990.2c4aee0e7ed1a19b15e4e1975dde9189a9bd2351.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vscode/, app-editors/vscode/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/vscode/files/vscode-url-handler-wayland.desktop app-editors/vscode/files/vscode-url-handler.desktop app-editors/vscode/files/vscode-wayland.desktop app-editors/vscode/files/vscode.desktop app-editors/vscode/metadata.xml app-editors/vscode/vscode-1.85.0-r1.ebuild app-editors/vscode/vscode-1.85.0.ebuild app-editors/vscode/vscode-1.85.1-r1.ebuild app-editors/vscode/vscode-1.85.1.ebuild X-VCS-Directories: app-editors/vscode/files/ app-editors/vscode/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 2c4aee0e7ed1a19b15e4e1975dde9189a9bd2351 X-VCS-Branch: master Date: Sun, 14 Jan 2024 20:27:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 59892cd0-ce92-4dae-93c4-fd653026373a X-Archives-Hash: acc9c62cb5b0cd7e2b3fae69a3f84e83 commit: 2c4aee0e7ed1a19b15e4e1975dde9189a9bd2351 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Sun Jan 14 18:19:31 2024 +0000 Commit: Arthur Zamarin gentoo 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 zegrapher.com> Signed-off-by: Arthur Zamarin 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 @@ proxy-maint@gentoo.org Proxy Maintainers + + Run in wayland mode under wayland sessions, xwayland otherwise. This flag doesn't affect x11 sessions. + 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" }