diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest index a33e3e6..cd4a95b 100644 --- a/net-im/discord/Manifest +++ b/net-im/discord/Manifest @@ -1,6 +1,8 @@ +AUX launcher-r1.sh 531 BLAKE2B 5b4aa029dbbc3b2c042933c5cda0a1e22d79757f94ef9841ff65e88926a0f7095e868d7edd8327dd6ac191bd2d2dcaacd6ddbce70b50b0d58d5f661468e38a02 SHA512 d0feb61901d747769c77dbe310dacf76e2b240eb706bdc6e925c7001d80a8a4d02a87ac0845afd396846b3ea645a80c85da892ce42b6fa170366b67e2e4e1645 AUX launcher.sh 452 BLAKE2B ada0054ea8cc1c383c153794e7769cabfb97144d9e5abe5ff9fb9f3165bef47f7efa365d214c88647f9e04109898ff9ee8d5eb62fab56be483a711960e85581d SHA512 a6c25ff0ae0f0e14258bddfd93210c33fbbd350e87165d28fcd5943576634c58ccb723f9962d3b160af079553ffd039326c402eceaa8a760d547405787650239 -DIST discord-0.0.118.tar.gz 108665429 BLAKE2B f7bd5c5668d79da24bee169604a97966568999e494d8e46687f5f3bbfacaf13ef69df2cd7bd97824d2d2bc2cfbebdd91af98fa19ed24a705445cf409b42c41e1 SHA512 3658600194b60dfc7df9c2a77922be343ab181367a0fbc187699a8b6c2d06c6b1c2a67cb55aa8c8bf694ab4d190b6a8677618c5e5987edc0a1fdc5dbafd3300c DIST discord-0.0.119.tar.gz 108665433 BLAKE2B 7d245d4fdab2e447c4d2f69587f3185903edeb6563dd353430ef52d792acf362af1186902bf814104493ca4348eebfc13fcc50789f598242f91b9252351e194f SHA512 bb981f4458c87c9af3d278112e3ac6d650ae96cc0dd8ca184d60954b18a5fdab2dfc3dfada66fad599de2f303903bc8445831aae07b2573d99da14217f568117 -EBUILD discord-0.0.118.ebuild 4150 BLAKE2B 8dabbf0fff5126299e01a983e4e75cabd2a3b6225969cf2009f4d3c12b07bf89f5f4cace8892494b96a9f462b0cb501b1ea24b009f21bfbd8e593e0b51d4cdf6 SHA512 8b565ec217c9aa499dda301de4f2330b1204f61e4712609e1ea34c57684619c514b48b1297ec0ed3d9a6ae60eb1f2748e9f363c00960984d59d2c495a1412e49 +DIST discord-0.0.122.tar.gz 108677457 BLAKE2B 1af1c39b08f19d14663ef371de0a58f75d6d06fce78af72a1c1b278fa7424d4682cb718ba74b5315d88e0f67931631052767d4744bc310ab995cfe533a2eea43 SHA512 1aa6f3b26d095052988e69ef886b3e61ad32883ea64852f20ca5071b12308652952e1d4d66139d3cca46c3c127ca97f53c7bd543eba21937d388b630a181faf4 +DIST discord-disable-breaking-updates-2f26748a667045d26bc19841f1a731b4be7a7514.py 1299 BLAKE2B b6c923c450a28405e2a439e0d1b8a83e01e0536c62095fafbae74612aa4e891df733aa13999ce6a8be3618fd14e154aec802aa4ee21aad1303b05626ffd23314 SHA512 a7ef493a216c71a5b02685cff6866bfc3940aaf9cdc73b58859c962d0d33b613349289ef7027359f184f42dddaed486b84f6d85b9023ab8530ab7ba66431c3c7 EBUILD discord-0.0.119.ebuild 3932 BLAKE2B 5529140a515ce8405703e6391c721dbaa632ed55b651c104c54c96bb16c89ccc1043efbc47142898e1ef39521120118e4fa6155373b41c469e5d32a38c48f03d SHA512 58d4dec11083d463b2ad8d19b7cd0db5cfa79793cf119ab1b1cab65cb72ce281f60575fe804dcf1b0ff99fcef8cf3224c5aa6c605b42d4ca846a12de8636b87d +EBUILD discord-0.0.122.ebuild 4717 BLAKE2B f3feefa520f15ca99a4aa2c50e20ee5f5a8f5f48c6d6ee818ccf0a31992c032cdba56913e169fa191dd598e82ada1a1f2ab8a3669e5637da92d609c4f174f689 SHA512 8f8c74ec38afacc61769397a080883ed4dd76ead276a596bf2fc2ae8e59e3256ee4be02a07e12247496dfb45fc6c00cd268afd439c475887d9eef8abadc70799 MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665 diff --git a/net-im/discord/discord-0.0.118.ebuild b/net-im/discord/discord-0.0.122.ebuild similarity index 81% rename from net-im/discord/discord-0.0.118.ebuild rename to net-im/discord/discord-0.0.122.ebuild index 30c43d4..13a8e82 100644 --- a/net-im/discord/discord-0.0.118.ebuild +++ b/net-im/discord/discord-0.0.122.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,12 +11,18 @@ CHROMIUM_LANGS=" hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk ur vi zh-CN zh-TW " +PYTHON_COMPAT=( python3_{11..14} ) +UPDATE_DISABLER_COMMIT="2f26748a667045d26bc19841f1a731b4be7a7514" -inherit chromium-2 desktop linux-info optfeature unpacker xdg +inherit chromium-2 desktop linux-info optfeature python-single-r1 unpacker xdg DESCRIPTION="All-in-one voice and text chat for gamers" HOMEPAGE="https://discord.com/" -SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz" +SRC_URI=" + https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz + https://github.com/flathub/com.discordapp.Discord/raw/${UPDATE_DISABLER_COMMIT}/disable-breaking-updates.py + -> discord-disable-breaking-updates-${UPDATE_DISABLER_COMMIT}.py +" S="${WORKDIR}/${MY_PN^}" LICENSE="all-rights-reserved" @@ -24,9 +30,11 @@ SLOT="0" KEYWORDS="amd64" IUSE="appindicator +seccomp wayland" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="bindist mirror strip test" RDEPEND=" + ${PYTHON_DEPS} >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 @@ -88,7 +96,7 @@ src_prepare() { # Update exec location in launcher sed --expression "s:@@DESTDIR@@:${DESTDIR}:" \ - "${FILESDIR}/launcher.sh" > "${T}/launcher.sh" || die "updating of exec location in launcher failed" + "${FILESDIR}/launcher-r1.sh" > "${T}/launcher.sh" || die "updating of exec location in launcher failed" # USE seccomp in launcher if use seccomp; then @@ -127,6 +135,10 @@ src_install() { # See #903616 and #890595 [[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler + # https://bugs.gentoo.org/905289 + newins "${DISTDIR}/discord-disable-breaking-updates-${UPDATE_DISABLER_COMMIT}.py" disable-breaking-updates.py + python_fix_shebang "${ED}/${DESTDIR}/disable-breaking-updates.py" + exeinto "/usr/bin" newexe "${T}/launcher.sh" "discord" || die "failing to install launcher" diff --git a/net-im/discord/files/launcher-r1.sh b/net-im/discord/files/launcher-r1.sh new file mode 100644 index 0000000..b3a9f1b --- /dev/null +++ b/net-im/discord/files/launcher-r1.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# coding: UTF-8 + + +declare -a discord_parameters + +# Variables set during ebuild configuration +EBUILD_SECCOMP=false +EBUILD_WAYLAND=false + +"${EBUILD_SECCOMP}" || discord_parameters+=( --disable-seccomp-filter-sandbox ) + +"${EBUILD_WAYLAND}" && \ +[[ -n "${WAYLAND_DISPLAY}" ]] && discord_parameters+=( + --enable-features=UseOzonePlatform + --ozone-platform=wayland + --enable-wayland-ime +) + + +# https://bugs.gentoo.org/905289 +@@DESTDIR@@/disable-breaking-updates.py + +@@DESTDIR@@/Discord "${discord_parameters[@]}" "$@"