Discord update / Bug #958952

2025-06-25 17:50:01 +02:00 · 2025-06-25 17:50:01 +02:00 · f646c6e8ec
commit f646c6e8ec
parent 5fa8b6a922
6 changed files with 328 additions and 2 deletions
--- 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.96.tar.gz 105431050 BLAKE2B c4eda0596da045d3401522f66d26caf1fcf45e7ece543fc637ba9d76e5142715f03595a32fa4a08bfe1168d5e390e590e91890c0bc84857ef00c6a2fb20d869a SHA512 77d2fcd98ec9e6ac121eb56ddbe0dedb02211c79d69b345557c030b77f7666c7cb50900cb815a2868f6dbe70cfb3cb2467195404db78b3bb122e9d37baed75ec
 DIST discord-0.0.98.tar.gz 105428783 BLAKE2B f3ec0ce3950a34656af4540c6290733626d3c82543c4f7e6cbcb831e8e545272eaf976d8b46f0133fcdadfd93b8b705fe02d75aeb7db6e8adda10a5a2c834f50 SHA512 15089bfde37a16ca4d9f47d521262c6a5c1ab3342204d83d6a6c1e9851781ca09c17f51f5002b8e9b6b7b9ad81a8f35cf9dc1f70839ecd0321e666efea19ad61
-EBUILD discord-0.0.96.ebuild 3932 BLAKE2B f23fb91524730f3c3e350d26799e715c811a1fe6e33f07f608860ce57d565b3e3a667c3f6219da18a101eafabedbecfda505d2f560e7f78b97eb871c8744b468 SHA512 6f5828bcfa52b777e29b58b267d8be95fc2ddb83891779f390ebff203daacdde4faa95b796ec77b38ee66713f617dffaf90222f857dd4b065553205d7f405569
+DIST discord-0.0.99.tar.gz 105427025 BLAKE2B 76baf928d24672764e3bb6c6481e6d2f55c3649f66107b9edaf39701ad35e321446b67790cc7eb5aee1d2e4d167b46f03acd12b201ae2f3f6dc5525e98351227 SHA512 7e72dfa63b051a25eeda2939cc494c05eb972c5a429f3feb86acabe88c55c92699e2a90c3bfc508ed37edf132270e1e38169ff4d8cd397eccb0dd50152a169d5
 EBUILD discord-0.0.98.ebuild 3932 BLAKE2B 5529140a515ce8405703e6391c721dbaa632ed55b651c104c54c96bb16c89ccc1043efbc47142898e1ef39521120118e4fa6155373b41c469e5d32a38c48f03d SHA512 58d4dec11083d463b2ad8d19b7cd0db5cfa79793cf119ab1b1cab65cb72ce281f60575fe804dcf1b0ff99fcef8cf3224c5aa6c605b42d4ca846a12de8636b87d
+EBUILD discord-0.0.99.ebuild 3932 BLAKE2B f23fb91524730f3c3e350d26799e715c811a1fe6e33f07f608860ce57d565b3e3a667c3f6219da18a101eafabedbecfda505d2f560e7f78b97eb871c8744b468 SHA512 6f5828bcfa52b777e29b58b267d8be95fc2ddb83891779f390ebff203daacdde4faa95b796ec77b38ee66713f617dffaf90222f857dd4b065553205d7f405569
 MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665
--- a/net-im/discord/discord-0.0.99.ebuild
+++ b/net-im/discord/discord-0.0.99.ebuild
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@ -0,0 +1,4 @@
+AUX 2.48.3-fix-ftbfs-riscv64.patch 1469 BLAKE2B c6e74307539730b31e3c67f8d80b54c5b8ae39fadfd6623d0bb964553510a3f6c0797183d89589ef0a29ab843adea341b3a00ced422f72352ca9aaa29dcda42b SHA512 2835d3b4093f1c0fe369494d401f75645df166eb60da97a983a2396407b71ef7485646d7e7f7c2d7cc2d15e7160e45fb62b6bcfcf0e08197c7c0ff93b52011f7
+DIST webkitgtk-2.48.3.tar.xz 44171964 BLAKE2B d07afd02ca3159e2a8998167818614eb586754f6485ea5b998a10686df44a16c99c5890b6fc7ccb3c1aa4aef82f1626be39cd67a4e60dbbe9eda466fd17aa002 SHA512 0724e0d22403552409d0f621d9ed3a6404813ca63d445b9ac8f99682a544c95a3cf8108ac880cb3bcadc0ecd5a772db40e68f753c286700ffc7f2851bba12e84
+EBUILD webkit-gtk-2.48.3-r410.ebuild 8262 BLAKE2B ab22d294384133d585fbee59c06519cdf4b9a7f348fb2cf92e7db5c6f275abdf1f3ade30d9e757600d9c3005476fa87009e2fd8503be181dd1387dc66ee00641 SHA512 f50e6c75551b143853d50e9975de6e5c1f78b30a3ab71a7dfcaf506ae713187711eee4359f670c9b0e20ae52b4d7aecff4835042b3db036a8c8be8df0bd5abae
+MISC metadata.xml 790 BLAKE2B cc1db6c1cd6771cafe9b2690790b12a34a7ea49f3dd00c9439ad05a18099c96dd1c5a6575c884c55d09e34f6dc247ca05256a52facb35a54376e61640eececd0 SHA512 b9e123a69e0353a20661ce817ead87b61370d0a68ef175cdf1ced00afacf67204c67bb549aac2006326d8aab7d6e41a841b00d16fc4431626e7ad7782f6158db
--- a/net-libs/webkit-gtk/files/2.48.3-fix-ftbfs-riscv64.patch
+++ b/net-libs/webkit-gtk/files/2.48.3-fix-ftbfs-riscv64.patch
@ -0,0 +1,40 @@
+From: Alberto Garcia <berto@igalia.com>
+Description: Use WTF_CPU_UNKNOWN when building for riscv64
+ WebKitGTK doesn't build on riscv64 even with the JIT disabled.
+ Treating the CPU as unknown is perhaps a bit severe, but it allows us
+ to get the build done until someone steps up to maintain this
+ properly.
+Bug: https://bugs.webkit.org/show_bug.cgi?id=271371
+Forwarded: no
+Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/PlatformCPU.h
+++ webkitgtk/Source/WTF/wtf/PlatformCPU.h
+@@ -285,14 +285,6 @@
+ 
+ #endif /* ARM */
+ 
+-/* CPU(RISCV64) - RISC-V 64-bit */
+-#if    defined(__riscv) \
+-    && defined(__riscv_xlen) \
+-    && (__riscv_xlen == 64)
+-#define WTF_CPU_RISCV64 1
+-#define WTF_CPU_KNOWN 1
+-#endif
+-
+ #if !CPU(KNOWN)
+ #define WTF_CPU_UNKNOWN 1
+ #endif
+Index: webkitgtk/Source/cmake/WebKitCommon.cmake
+===================================================================
+--- webkitgtk.orig/Source/cmake/WebKitCommon.cmake
+++ webkitgtk/Source/cmake/WebKitCommon.cmake
+@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+         set(WTF_CPU_PPC64 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
+         set(WTF_CPU_PPC64LE 1)
+-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
+-        set(WTF_CPU_RISCV64 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
+         set(WTF_CPU_LOONGARCH64 1)
+     else ()
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="examples">Install the MiniBrowser example application</flag>
+    <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
+    <flag name="jumbo-build">Combine source files to speed up build process</flag>
+  </use>
+  <upstream>
+    <bugs-to>https://bugs.webkit.org</bugs-to>
+    <changelog>https://www.webkitgtk.org/news.html</changelog>
+    <doc>https://webkitgtk.org/reference/webkitgtk/stable/</doc>
+    <remote-id type="github">WebKit/WebKit</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/net-libs/webkit-gtk/webkit-gtk-2.48.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.48.3-r410.ebuild
@ -0,0 +1,263 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..13} )
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies can be found in Source/cmake/OptionsGTK.cmake.
+#
+# * Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream.
+#
+# * media-libs/mesa dep is for libgbm
+#
+# * >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+#
+# * TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#         with GLX set, but that's a bit automagic too to fix
+#
+# * Cairo is only needed on big-endian systems, where Skia is not officially
+#   supported (the build system will choose a backend for you). We could probably
+#   hard-code a list of BE arches here, to avoid the extra dependency? But I am
+#   holding out hope that this might actually get fixed before we need to do that.
+#
+# * dev-util/sysprof-capture is disabled because it was a new dependency in 2.46
+#   and we don't need any more new problems.
+#
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libgcrypt:0=
+	dev-libs/libtasn1:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libjpeg-turbo:0=
+	media-libs/libepoxy[egl(+)]
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	media-libs/libwebp:=
+	media-libs/mesa
+	media-libs/woff2
+	net-libs/libsoup:3.0[introspection?]
+	sys-libs/zlib:0
+	x11-libs/cairo[X?]
+	x11-libs/gtk+:3[aqua?,introspection?,wayland?,X?]
+	x11-libs/libdrm
+	avif? ( media-libs/libavif:= )
+	gamepad? ( dev-libs/libmanette )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0[egl,opengl,X?]
+		media-plugins/gst-plugins-opus:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	jpegxl? ( media-libs/libjxl:= )
+	keyring? ( app-crypt/libsecret )
+	lcms? ( media-libs/lcms:2 )
+	seccomp? (
+		sys-apps/bubblewrap
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+	spell? ( app-text/enchant:2 )
+	systemd? ( sys-apps/systemd:= )
+	X? ( x11-libs/libX11 )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	app-accessibility/at-spi2-core
+	dev-lang/perl
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	dev-util/unifdef
+	sys-devel/bison
+	sys-devel/gettext
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# https://bugs.gentoo.org/938162, see also mycmakeargs
+	eapply "${FILESDIR}"/2.48.3-fix-ftbfs-riscv64.patch
+
+	# We don't want -Werror for gobject-introspection (bug #947761)
+	sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_DRAG_SUPPORT=ON # This should be ON or it breaks stuff like Evolution: https://bugs.gentoo.org/958952
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_SPEECH_SYNTHESIS=OFF
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_TOUCH_EVENTS=OFF
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=OFF
+		-DENABLE_WEBGL=ON
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=OFF
+		-DUSE_SYSPROF_CAPTURE=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# Temporary workaround for bug 938162 (upstream bug 271371)
+	# in concert with our Debian patch. The idea to enable C_LOOP
+	# is also stolen from Debian's build.
+	use riscv && mycmakeargs+=(
+		-DENABLE_WEBASSEMBLY=OFF
+		-DENABLE_JIT=OFF
+		-DENABLE_C_LOOP=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}