app-editors/vscodium: Bump to 1.92.2.24228-r1

This includes updates and fixes to the .desktop files as well as a local
modification that has desktop environments show the right icon.

6 files changed, 22 insertions, 49 deletions

diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 9daf08a..87e729a 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,7 +1,7 @@
-AUX vscodium-url-handler-wayland.desktop 383 BLAKE2B c3e281318290826ce9451fe517b52bd8dee6da01fcb62c57906496bb6f5b369c55571aeffdab020820029186c5ee8722c02ef611c487d81044717bb31519b512 SHA512 77347572def1aae0d643ca4166a9b4db9aa6f80e267ff93474ee3a773491e4f0ebc95a15d25ddd1d23e819a739c56a86dec2d612c566c10f56811c10ac4d41ac
-AUX vscodium-url-handler.desktop 315 BLAKE2B b514551e6256cb444f13bfda86a9e164ed926d8aedbfcb7de3a6b1c3d3c2e465c0ee158c74626814908a153c5f801434952865a708c89ffdf64bce24a83fcc20 SHA512 afcf89af009361b409330a223696013e1ee8973bc3b3068e778fb05c3355fed66063bd537a66685d6ad3578c2808532d4b9c5273a291c7d2f3a9c0b2f997f152
-AUX vscodium-wayland.desktop 609 BLAKE2B 1b25dc9e98b5a12a10f85001b9c5acc9325368a2310a7d1e2aad20e22ae07fb000aa495b694612032e999f431c8f8e47f60eb162d0c7487fcfef6e37249622d4 SHA512 1d371978a5780c8d37e6e1359ca029659055a8d80de0d672d6eb3f21b890db2b92e368fd244be7cf83ec30935271cb269f1b9aef1c7deaaae36c3d739221d8f2
-AUX vscodium.desktop 481 BLAKE2B 89f335edd1f7d0256f95eb96d335c2359d8fd984a29bdc3190218ea63ba9a19e64435eb50c7be818cf28243c8cdf9b385f8987f6917e52df565a4ca555a2a13b SHA512 234f79a5ea9b901b62fe0c094554de3b339a67e8f47ec4b3daa5c0653778b9f51d1ccd91e773b4ca27f27e30a5847d5a3172d0ed322ada4d47624028bd5d8c1b
+AUX vscodium-url-handler.desktop 334 BLAKE2B 3e089403de3df453f9c35737911846105ebee07ba17cd61443f739a035755a3b17b7a76f54231950bb4d752e0853a1e920dc489487ed3b12230dbe96037e833b SHA512 548b2df53ee5975e543a8ce5f8ac48bcc5878a86e7b6759d8e6d6d5cf7a126d91326f801a3c3548b7390dc9113b9bf37ecc38276ddd0b3354c4be8ab58b466fa
+AUX vscodium.desktop 519 BLAKE2B 9bb65cb1b0618deba7db401f314f00611970eb34a82988f349d215759aba195c3d61b51f1e2f1e58ecef0fff952d68a25551a55d75c44a817d8de6dd65562732 SHA512 12db368ca425b707e6c0d9437e987aa0e5a773ac3f8fe51c5aec8eb82768dec0494988a0fef1a8be781e238d9fb9dd22097166ac8eea924154d7481998b0c18e
 DIST vscodium-1.92.2.24228-amd64.tar.gz 130843357 BLAKE2B 3510141a3b86163a5d0fafbc3dd4d68f03d81c3d8bb2f7a6341bffdafe8690baeecd136c177561832356d1fab44bc1b173edb9b48fea2e486ae13ffa440e3dde SHA512 fe21d65de84e5b2e99fa463c198fe47bc10e254ebac6f5e24c42c0de0e5e5e086c83541cddc295a5bcc3b1698afb8d1e06cb96bcc3c7d555cda8e84cfbca1f26
-EBUILD vscodium-1.92.2.24228.ebuild 2583 BLAKE2B 159db20e29b97139c91815c61a8d1cef38358a64e37791dde190c750093ea874ac15c552f1cf860b0f7424f199b055c24356b019eefb7a3028295f6c08c21cc6 SHA512 ef14119497f469b1cca718da06f6a2aa6e61cf73360af0b5bfbfae7024cbc113a4ae312f617cb313af847f8ff34de088f6d908222c4ebe1c813c807bc50af1a6
+DIST vscodium-1.92.2.24228-arm.tar.gz 119300483 BLAKE2B ab542195ac209dc68dc5fe9b63b9892495df146675268bb2e3c559ffb9ada1bd05f97b6907be50ca356358c72906cdfd6449ae86ebf5a4ce391aae165260ef51 SHA512 0930206931dfdd38c4ce53699b395d2bfb439e9a8579b5429c6c9594910aafe82a35d1fcfcecaf0132325a179b96abf9d73c88866789978da24325a1cd0bb31b
+DIST vscodium-1.92.2.24228-arm64.tar.gz 130895581 BLAKE2B a6b205ba449a34c7ba695a12dbbc8ef3a4b1f6dfe2dd6dc0c2285af549cc7750de7d7aa044ea1354c325deae995d49e808e02a0d2a4001b7764c233d49245d09 SHA512 fe0b6c5a3269fc12f91251035a5c8162861e2301e67bbf49895a2a58ecc542b376ac95e673dadb04b1f7e1849f18e8d8821f95e819e7fb7d9c66674be460de73
+EBUILD vscodium-1.92.2.24228-r1.ebuild 2808 BLAKE2B efdcf8573ce1a07ec828e9cd9169add6c03e2185e47a5347ecfe99b66d0d448a4885d566982150ef8c1ddd0cda8462200cdfa2d95bea27e94bd8c241ca5103fe SHA512 ea3f092776cdb39fbc38a8634dd70346242309e71c30b287b11b02d37f69605c784e8c2ed199c0ca36cc8c4ab42ebb5cebbcadc0264f0ac9b9d73fa3938d6f4f
 MISC metadata.xml 1009 BLAKE2B b6d55ed2217637eac68413eb685a6219a38f80e0b4698877a0bc4d88e65f42c4fcbbd2ea50e810aadbda1de65df85fd724ee1b2ad7ef29dbc3f871efcd7069bf SHA512 c3edf84c187732debc55b847c7e707df13f8dfeffca06312ada10c531ec37d83c137e28db2f288b1b8a61ac5851754b52ba66866048a3765c689bcdc4f85ff7a
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 d853f3e..0000000
--- 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 48c7d3d..0ca181b 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 7719bf1..0000000
--- 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 f3557c1..e12a430 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/vscodium-1.92.2.24228.ebuild b/app-editors/vscodium/vscodium-1.92.2.24228-r1.ebuild
index 3911101..9f4deaf 100644
--- a/app-editors/vscodium/vscodium-1.92.2.24228.ebuild
+++ b/app-editors/vscodium/vscodium-1.92.2.24228-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,11 @@ arch_src_uri() {
 
 DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
 HOMEPAGE="https://vscodium.com/"
-SRC_URI="$(arch_src_uri amd64 x64)"
+SRC_URI="
+	$(arch_src_uri amd64 x64)
+	$(arch_src_uri arm armhf)
+	$(arch_src_uri arm64 arm64)
+"
 S="${WORKDIR}"
 
 LICENSE="
@@ -37,8 +41,8 @@ LICENSE="
 	W3C
 "
 SLOT="0"
-KEYWORDS="amd64"
-IUSE="egl kerberos wayland"
+KEYWORDS="-* amd64 ~arm ~arm64"
+IUSE="wayland"
 RESTRICT="strip bindist"
 
 RDEPEND="
@@ -50,7 +54,6 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/libcanberra[gtk3]
 	media-libs/libglvnd
 	media-libs/mesa
 	net-misc/curl
@@ -74,10 +77,13 @@ RDEPEND="
 QA_PREBUILT="*"
 
 src_install() {
-	# Cleanup
-	rm "${S}/resources/app/LICENSE.txt" || die
+	# Cleanup license file - it exists only in amd64 tarball
+	rm -f "${S}/resources/app/LICENSE.txt" || die
 	rm -r "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die
 
+	# Fix wrong desktopName, https://github.com/VSCodium/vscodium/issues/1901 (not flatpak-specific)
+	sed -i "s|codium-url-handler\.desktop|vscodium.desktop|g" "${S}/resources/app/package.json" || die
+
 	# Install
 	pax-mark m codium
 	mkdir -p "${ED}/opt/${PN}" || die
@@ -91,9 +97,6 @@ src_install() {
 	if use wayland; then
 		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" )
 	fi
-	if use egl; then
-		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
-	fi
 
 	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
 		"${FILESDIR}/vscodium-url-handler.desktop" \
@@ -111,6 +114,6 @@ src_install() {
 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"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/docs/index.md"
 	optfeature "keyring support inside vscode" "virtual/secret-service"
 }