commit: 231c25c4604b7812654dbadd8191b2cdbfe45ea2 Author: Lorenzo Torres <lorenzo <AT> sagittarius-a <DOT> org> AuthorDate: Mon Dec 8 19:12:55 2025 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Mon Dec 8 20:08:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231c25c4
net-im/discord: add 0.0.118 Manifest fixed by sarnex. Signed-off-by: Lorenzo Torres <lorenzo <AT> sagittarius-a.org> Part-of: https://github.com/gentoo/gentoo/pull/44959 Closes: https://github.com/gentoo/gentoo/pull/44959 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> net-im/discord/Manifest | 1 + ...cord-0.0.117.ebuild => discord-0.0.118-r1.ebuild} | 20 ++++++++++++++++---- ...discord-0.0.117.ebuild => discord-0.0.118.ebuild} | 0 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest index 4037fee53ef5..837bb129cd5d 100644 --- a/net-im/discord/Manifest +++ b/net-im/discord/Manifest @@ -1,3 +1,4 @@ DIST discord-0.0.116.tar.gz 108661413 BLAKE2B 0e5a4e2e1f31586ed50f2730f59a9036e41de84222982d18232593dab854b68843ba2db6106c2e0b9da2c473773f1e318e1f7807d73ae2cf2c665ecf77bede00 SHA512 801a228ff7c84aba76ce4565535d1da1d0ee3e7c30e2c381a118db32b2c7dcbdfe0f52ea8caa369732ca29c5a23a3ef7bb5439adc57e70243beb6ab7fc539a7f DIST discord-0.0.117.tar.gz 108661808 BLAKE2B 2e5ff667f1fa1ee9ba9cbdb7edb37de72ac90af6a71ecada95db7372a28c0c2bc9f6c143f9d2d11fd19a593a4c6785e922fac0288c726364b7e748266f938818 SHA512 3c2b3e835cfd8f785f33e3c1a37c6c69dacc6b8d45151364ee46f220ef97022f862ac8e42a5e3915d3010e8443fc4caa5b5c1c209f698bda3fe847632207036b +DIST discord-0.0.118.tar.gz 108665429 BLAKE2B f7bd5c5668d79da24bee169604a97966568999e494d8e46687f5f3bbfacaf13ef69df2cd7bd97824d2d2bc2cfbebdd91af98fa19ed24a705445cf409b42c41e1 SHA512 3658600194b60dfc7df9c2a77922be343ab181367a0fbc187699a8b6c2d06c6b1c2a67cb55aa8c8bf694ab4d190b6a8677618c5e5987edc0a1fdc5dbafd3300c DIST discord-disable-breaking-updates-2f26748a667045d26bc19841f1a731b4be7a7514.py 1299 BLAKE2B b6c923c450a28405e2a439e0d1b8a83e01e0536c62095fafbae74612aa4e891df733aa13999ce6a8be3618fd14e154aec802aa4ee21aad1303b05626ffd23314 SHA512 a7ef493a216c71a5b02685cff6866bfc3940aaf9cdc73b58859c962d0d33b613349289ef7027359f184f42dddaed486b84f6d85b9023ab8530ab7ba66431c3c7 diff --git a/net-im/discord/discord-0.0.117.ebuild b/net-im/discord/discord-0.0.118-r1.ebuild similarity index 82% copy from net-im/discord/discord-0.0.117.ebuild copy to net-im/discord/discord-0.0.118-r1.ebuild index 30c43d42ca79..92b45af3dd96 100644 --- a/net-im/discord/discord-0.0.117.ebuild +++ b/net-im/discord/discord-0.0.118-r1.ebuild @@ -11,22 +11,30 @@ 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" SLOT="0" -KEYWORDS="amd64" +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/discord-0.0.117.ebuild b/net-im/discord/discord-0.0.118.ebuild similarity index 100% rename from net-im/discord/discord-0.0.117.ebuild rename to net-im/discord/discord-0.0.118.ebuild
