From 4c96469e4c91456af4bf53ed91a07fedbc32d0f7 Mon Sep 17 00:00:00 2001
From: Torsten Kurbad <torsten@tk-webart.de>
Date: Mon, 2 Sep 2024 09:29:44 +0200
Subject: [PATCH] Updated discord

---
 net-im/discord/Manifest                       |  4 +--
 ...rd-0.0.61.ebuild => discord-0.0.66.ebuild} | 30 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)
 rename net-im/discord/{discord-0.0.61.ebuild => discord-0.0.66.ebuild} (80%)

diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index 035e10a..5a8b762 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1,6 +1,6 @@
 AUX launcher.sh 452 BLAKE2B ada0054ea8cc1c383c153794e7769cabfb97144d9e5abe5ff9fb9f3165bef47f7efa365d214c88647f9e04109898ff9ee8d5eb62fab56be483a711960e85581d SHA512 a6c25ff0ae0f0e14258bddfd93210c33fbbd350e87165d28fcd5943576634c58ccb723f9962d3b160af079553ffd039326c402eceaa8a760d547405787650239
-DIST discord-0.0.61.tar.gz 103547728 BLAKE2B 8b8e37e0a5940a3a2dce93cdcafe4e3866ccb96e22c6f7bf994890704f3e5ee455eefcb647f73e4f4495e8627e8a97e50690fe66b8cd4243ad6d9e39c01b7837 SHA512 2b7955e93f2352a244ab0838c24399b556174179eb3aa7ef8ed32d914f7ab1e49165cf8ab374b15c90bddd8ec8150146d2ebcc94c7e1aa8c914c56d4b6a03d29
 DIST discord-0.0.62.tar.gz 103553356 BLAKE2B cb319ee0ce9a3a1d9d8acf4810ab36f9ed4f93b1a82a15deb6ca05d50ad612a90d94f234eb38183e925444afa4f5035cd6bc0acbf3abaca3dec79f5f757e004c SHA512 6271382410340c0f38c4403af766fe18ea7548279f3bc75ebe748a75281c304d7738e2d857e208b8867a2330b2a9e22d292ad63421578db35b79e4d16267456f
-EBUILD discord-0.0.61.ebuild 3517 BLAKE2B 376f475de1231064440fa4508621101f2668319cc0d1b91592bfed39e5673994fc2c7a6fbd4e8df88e301d17ca6975e75cb2a5ecc0db591ad608235ad29769c1 SHA512 2e7678d3c65b235ec6d955e13af6b73447a1e32cd79592bcca1948ab232cb5f6f270cc6cc61c8f356f9c32ad539d9920f613d2df749590fd9498a1195532e751
+DIST discord-0.0.66.tar.gz 103548096 BLAKE2B 0016fca8c62e20848f9d65f9ca4c8b36d6bcd1c035f097db98a9c73187b2c1cd60887215b7c4403e85bb49dbedde8aaa680cbd2b470464db686621e885b722d2 SHA512 e521af930bf68d8da4fa9db1d86be84d17ad661213ba20a29eb05a67042625630d9d2ce5d8147146276b5c1356e07a0beba9312b0b558eb5cc5861244418e32b
 EBUILD discord-0.0.62.ebuild 3953 BLAKE2B 5108ee5a095f59114ad00d853f9d146ef0919aa802be7a84c3d61f134021e942c8abf699dbd066c82b310992629a80fd2764dc326b37fd0c6ad879ddfe8e5c9d SHA512 7d9a6560cf066d77301a87d83bcf54619f0291eabdd831911a7ead97eb5b4cecbc5db4b5f0adacbdba244c3c7ebdce4fb3fbc319964ca6c7b251e38697f1d92c
+EBUILD discord-0.0.66.ebuild 3953 BLAKE2B 5108ee5a095f59114ad00d853f9d146ef0919aa802be7a84c3d61f134021e942c8abf699dbd066c82b310992629a80fd2764dc326b37fd0c6ad879ddfe8e5c9d SHA512 7d9a6560cf066d77301a87d83bcf54619f0291eabdd831911a7ead97eb5b4cecbc5db4b5f0adacbdba244c3c7ebdce4fb3fbc319964ca6c7b251e38697f1d92c
 MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665
diff --git a/net-im/discord/discord-0.0.61.ebuild b/net-im/discord/discord-0.0.66.ebuild
similarity index 80%
rename from net-im/discord/discord-0.0.61.ebuild
rename to net-im/discord/discord-0.0.66.ebuild
index fefed5b..9c133ac 100644
--- a/net-im/discord/discord-0.0.61.ebuild
+++ b/net-im/discord/discord-0.0.66.ebuild
@@ -15,7 +15,7 @@ CHROMIUM_LANGS="
 inherit chromium-2 desktop linux-info optfeature unpacker xdg
 
 DESCRIPTION="All-in-one voice and text chat for gamers"
-HOMEPAGE="https://discordapp.com"
+HOMEPAGE="https://discord.com/"
 SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
 S="${WORKDIR}/${MY_PN^}"
 
@@ -23,7 +23,7 @@ LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="amd64"
 
-IUSE="appindicator +seccomp"
+IUSE="appindicator +seccomp wayland"
 RESTRICT="bindist mirror strip test"
 
 RDEPEND="
@@ -81,15 +81,26 @@ src_prepare() {
 	pushd "locales/" >/dev/null || die "location change for language cleanup failed"
 	chromium_remove_language_paks
 	popd >/dev/null || die "location reset for language cleanup failed"
+
 	# fix .desktop exec location
-	sed -i "/Exec/s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" \
+	sed --in-place --expression "/^Exec=/s:/usr/share/discord/Discord:/usr/bin/${MY_PN}:" \
 		"${MY_PN}.desktop" ||
 		die "fixing of exec location on .desktop failed"
-	# USE seccomp
-	if ! use seccomp; then
-		sed -i '/Exec/s/Discord/Discord --disable-seccomp-filter-sandbox/' \
-			"${MY_PN}.desktop" ||
-			die "sed failed for seccomp"
+
+	# Update exec location in launcher
+	sed --expression "s:@@DESTDIR@@:${DESTDIR}:" \
+		"${FILESDIR}/launcher.sh" > "${T}/launcher.sh" || die "updating of exec location in launcher failed"
+
+	# USE seccomp in launcher
+	if use seccomp; then
+		sed --in-place --expression '/^EBUILD_SECCOMP=/s/false/true/' \
+			"${T}/launcher.sh" || die "sed failed for seccomp"
+	fi
+
+	# USE wayland in launcher
+	if use wayland; then
+		sed --in-place --expression '/^EBUILD_WAYLAND=/s/false/true/' \
+			"${T}/launcher.sh" || die "sed failed for wayland"
 	fi
 }
 
@@ -117,7 +128,8 @@ src_install() {
 	# See #903616 and #890595
 	[[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler
 
-	dosym "${DESTDIR}/${MY_PN^}" "/usr/bin/${MY_PN}"
+	exeinto "/usr/bin"
+	newexe "${T}/launcher.sh" "discord" || die "failing to install launcher"
 
 	# https://bugs.gentoo.org/898912
 	if use appindicator; then