commit: 57ce2bc602b7bc1f2b356ef5e93d34f7a250c9d4
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Sun Jan 14 20:24:01 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 20:39:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ce2bc6
app-editors/vscodium: 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/vscodium-url-handler-wayland.desktop | 12 ------------
.../vscodium/files/vscodium-url-handler.desktop | 2 +-
.../vscodium/files/vscodium-wayland.desktop | 18 ------------------
app-editors/vscodium/files/vscodium.desktop | 4 ++--
app-editors/vscodium/metadata.xml | 3 +++
...3319.ebuild => vscodium-1.84.2.23319-r1.ebuild} | 22 +++++++++++++++++-----
...3348.ebuild => vscodium-1.85.1.23348-r1.ebuild} | 22 +++++++++++++++++-----
7 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop
b/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop
deleted file mode 100644
index d853f3e5c908..000000000000
--- a/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=VSCodium Wayland - URL Handler
-Comment=Editing evolved
-GenericName=Code Editor
-Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform
--ozone-platform=wayland --open-url %U
-Icon=vscodium
-Type=Application
-NoDisplay=true
-StartupNotify=true
-Categories=Utility;TextEditor;Development;IDE;
-MimeType=x-scheme-handler/vscodium;
-Keywords=vscode;vscodium;code;codium;
diff --git a/app-editors/vscodium/files/vscodium-url-handler.desktop
b/app-editors/vscodium/files/vscodium-url-handler.desktop
index 48c7d3d369cb..0ca181bf7960 100644
--- a/app-editors/vscodium/files/vscodium-url-handler.desktop
+++ b/app-editors/vscodium/files/vscodium-url-handler.desktop
@@ -2,7 +2,7 @@
Name=VSCodium - URL Handler
Comment=Editing evolved
GenericName=Code Editor
-Exec=/usr/bin/vscodium --open-url %U
+Exec=/usr/bin/vscodium @exec_extra_flags@ --open-url %U
Icon=vscodium
Type=Application
NoDisplay=true
diff --git a/app-editors/vscodium/files/vscodium-wayland.desktop
b/app-editors/vscodium/files/vscodium-wayland.desktop
deleted file mode 100644
index 7719bf19ad74..000000000000
--- a/app-editors/vscodium/files/vscodium-wayland.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=VSCodium Wayland
-Comment=Editing evolved
-GenericName=Code Editor
-Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform
--ozone-platform=wayland --unity-launch %F
-Icon=vscodium
-Type=Application
-StartupNotify=false
-StartupWMClass=VSCodium
-Categories=Utility;TextEditor;Development;IDE;
-MimeType=text/plain;inode/directory;application/x-code-workspace;
-Actions=new-empty-window;
-Keywords=vscode;vscodium;code;codium;
-
-[Desktop Action new-empty-window]
-Name=New Empty Window
-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 f3557c1adf7e..e12a430172ae 100644
--- a/app-editors/vscodium/files/vscodium.desktop
+++ b/app-editors/vscodium/files/vscodium.desktop
@@ -2,7 +2,7 @@
Name=VSCodium
Comment=Editing evolved
GenericName=Code Editor
-Exec=/usr/bin/vscodium --unity-launch %F
+Exec=/usr/bin/vscodium @exec_extra_flags@ --unity-launch %F
Icon=vscodium
Type=Application
StartupNotify=false
@@ -14,5 +14,5 @@ Keywords=vscode;vscodium;code;codium;
[Desktop Action new-empty-window]
Name=New Empty Window
-Exec=/usr/bin/vscodium --new-window %F
+Exec=/usr/bin/vscodium @exec_extra_flags@ --new-window %F
Icon=vscodium
diff --git a/app-editors/vscodium/metadata.xml
b/app-editors/vscodium/metadata.xml
index 42083f1bbf65..bf602df2c98c 100644
--- a/app-editors/vscodium/metadata.xml
+++ b/app-editors/vscodium/metadata.xml
@@ -13,6 +13,9 @@
<email>[email protected]</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>
Microsoft’s vscode source code is open source (MIT-licensed),
but the product available for download (Visual Studio Code) is licensed under
the Microsoft-vscode license (a copy can be found in the licenses folder of
your gentoo repository) and contains telemetry/tracking. The VSCodium project
exists so that you don’t have to download+build from source. This project
includes special build scripts that clone Microsoft’s vscode repo, run the
build commands, and upload the resulting binaries for you to GitHub releases.
These binaries are licensed under the MIT license. Telemetry is disabled.
</longdescription>
diff --git a/app-editors/vscodium/vscodium-1.84.2.23319.ebuild
b/app-editors/vscodium/vscodium-1.84.2.23319-r1.ebuild
similarity index 82%
rename from app-editors/vscodium/vscodium-1.84.2.23319.ebuild
rename to app-editors/vscodium/vscodium-1.84.2.23319-r1.ebuild
index 13fca65036bb..851a49f88afb 100644
--- a/app-editors/vscodium/vscodium-1.84.2.23319.ebuild
+++ b/app-editors/vscodium/vscodium-1.84.2.23319-r1.ebuild
@@ -42,7 +42,7 @@ LICENSE="
"
SLOT="0"
KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="kerberos"
+IUSE="kerberos wayland"
RESTRICT="strip bindist"
RDEPEND="
@@ -99,10 +99,22 @@ src_install() {
dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
dosym -r "/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"
+
+ 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}/vscodium-url-handler.desktop" \
+ > "${T}/vscodium-url-handler.desktop" || die
+
+ sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+ "${FILESDIR}/vscodium.desktop" \
+ > "${T}/vscodium.desktop" || die
+
+ domenu "${T}/vscodium.desktop"
+ domenu "${T}/vscodium-url-handler.desktop"
newicon "resources/app/resources/linux/code.png" "vscodium.png"
}
diff --git a/app-editors/vscodium/vscodium-1.85.1.23348.ebuild
b/app-editors/vscodium/vscodium-1.85.1.23348-r1.ebuild
similarity index 82%
rename from app-editors/vscodium/vscodium-1.85.1.23348.ebuild
rename to app-editors/vscodium/vscodium-1.85.1.23348-r1.ebuild
index 050d31616210..ceadf3473c69 100644
--- a/app-editors/vscodium/vscodium-1.85.1.23348.ebuild
+++ b/app-editors/vscodium/vscodium-1.85.1.23348-r1.ebuild
@@ -42,7 +42,7 @@ LICENSE="
"
SLOT="0"
KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE="kerberos"
+IUSE="kerberos wayland"
RESTRICT="strip bindist"
RDEPEND="
@@ -99,10 +99,22 @@ src_install() {
dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
dosym -r "/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"
+
+ 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}/vscodium-url-handler.desktop" \
+ > "${T}/vscodium-url-handler.desktop" || die
+
+ sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+ "${FILESDIR}/vscodium.desktop" \
+ > "${T}/vscodium.desktop" || die
+
+ domenu "${T}/vscodium.desktop"
+ domenu "${T}/vscodium-url-handler.desktop"
newicon "resources/app/resources/linux/code.png" "vscodium.png"
}
