From 16146734f8ddc3fcf93261cf8b5c6e0752da27c7 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 12 Apr 2026 22:56:04 +0200 Subject: [PATCH] net-voip/mumble: drop 1.5.735-r2 x86 stabilisation timeout. Closes: https://bugs.gentoo.org/955963 Signed-off-by: Andreas Sturmlechner --- net-voip/mumble/Manifest | 1 - ...ble-1.5.735-Fix-building-with-GCC-15.patch | 36 ---- net-voip/mumble/mumble-1.5.735-r2.ebuild | 161 ------------------ 3 files changed, 198 deletions(-) delete mode 100644 net-voip/mumble/files/mumble-1.5.735-Fix-building-with-GCC-15.patch delete mode 100644 net-voip/mumble/mumble-1.5.735-r2.ebuild diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest index bacff1d422fec..c07857b777a26 100644 --- a/net-voip/mumble/Manifest +++ b/net-voip/mumble/Manifest @@ -1,3 +1,2 @@ -DIST mumble-1.5.735.tar.gz 26010842 BLAKE2B 3eeb3e51f691f2179848341ba9e7d31a31cd1a66bd9c1edabeec90c99885a9630c74374d8c357d5fbfb9ee205d63aceeabcafd718350cc34c57c4fe1e7a5bf94 SHA512 1dba58e6f39dbef88c6e0d1501530bee62af5bd6c798dcfdbe6c9d94c1ec22ab91d157ba3ccb96d810daf31907ac2bbec876be20b8c9613664488e6bb03a5b5b DIST mumble-1.6.0_pre20250920.tar.xz 18005236 BLAKE2B 272a5be3593b0e6347966841387f72ab9ddeb8e02e900e6ff3cfa60e22107af4248bafa1cc5c1c89ee3997e3758f402db967e0b4508de11d2a32f365001666ae SHA512 29d08c8b6e5621fbbf15c7677ec8dd98e0cb590bdd23fb1927c7cbf45e8d40f33963875d8b5a593ee7ddbc1f27fee397473ddc0eac75d8435bed5ca84e2fd56b DIST mumble-1.6.0_pre20260215.tar.xz 19794688 BLAKE2B c1ee1dc1ef90e47351569e279595d9d0aba46953195150cbe53d759df4c56ba99f786f1920dec956ee3bb7f49d5a6a6facb9824e3e918712b9788daaabf0197f SHA512 fb011a4815479b7777ab7f273e0ee25d0c90ec57eed15069255fae3abe87bc08a2afc45e93eb85233c1dc77e9d464573b0d1822b8f89f2d7e0fa7b957aa487c0 diff --git a/net-voip/mumble/files/mumble-1.5.735-Fix-building-with-GCC-15.patch b/net-voip/mumble/files/mumble-1.5.735-Fix-building-with-GCC-15.patch deleted file mode 100644 index 4bd4623da82d0..0000000000000 --- a/net-voip/mumble/files/mumble-1.5.735-Fix-building-with-GCC-15.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f4259722553335d79e9d28948ab7bdb00293a5ec Mon Sep 17 00:00:00 2001 -From: Carl George -Date: Tue, 8 Apr 2025 23:25:52 -0500 -Subject: [PATCH] BUILD(overlay): Fix building with GCC 15 - -C23 added the bool keyword, which results in an error if you try to -define an identifier named bool and then build with GCC 15. We can use -stdbool.h to define bool instead. - -https://gcc.gnu.org/gcc-15/porting_to.html#c23-new-keywords ---- - overlay_gl/overlay.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/overlay_gl/overlay.c b/overlay_gl/overlay.c -index 680241e1bbb..bf3051e540f 100644 ---- a/overlay_gl/overlay.c -+++ b/overlay_gl/overlay.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -37,9 +38,6 @@ - - # include - --typedef unsigned char bool; --# define true 1 --# define false 0 - #elif defined(TARGET_MAC) - # include - # include diff --git a/net-voip/mumble/mumble-1.5.735-r2.ebuild b/net-voip/mumble/mumble-1.5.735-r2.ebuild deleted file mode 100644 index 4b15cb0b9e34a..0000000000000 --- a/net-voip/mumble/mumble-1.5.735-r2.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake flag-o-matic multilib python-any-r1 xdg - -DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" -HOMEPAGE="https://wiki.mumble.info" -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git" - - # needed for the included 3rdparty license script, - # even if these components may not be compiled in - EGIT_SUBMODULES=( - '-*' - 3rdparty/cmake-compiler-flags - 3rdparty/FindPythonInterpreter - 3rdparty/flag-icons - 3rdparty/minhook - 3rdparty/renamenoise - 3rdparty/speexdsp - 3rdparty/tracy - ) -else - if [[ "${PV}" == *_pre* ]] ; then - SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz" - else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz" - S="${WORKDIR}/${P/_*}" - fi - KEYWORDS="amd64 arm64 ppc64 x86" -fi - -LICENSE="BSD MIT" -SLOT="0" -IUSE="+alsa debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-cpp/ms-gsl - >=dev-libs/openssl-1.0.0b:0= - dev-libs/poco:=[util,xml,zip] - >=dev-libs/protobuf-2.2.0:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - >=media-libs/libsndfile-1.0.20[-minimal] - >=media-libs/opus-1.3.1 - >=media-libs/speex-1.2.0 - media-libs/speexdsp - sys-apps/lsb-release - x11-libs/libX11 - x11-libs/libXi - alsa? ( media-libs/alsa-lib ) - g15? ( app-misc/g15daemon:= ) - jack? ( virtual/jack ) - rnnoise? ( media-libs/rnnoise ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-libs/libpulse ) - pipewire? ( media-video/pipewire ) - speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-cpp/nlohmann_json - dev-qt/qtconcurrent:5 - dev-qt/qttest:5 - dev-libs/boost - x11-base/xorg-proto -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.735-Fix-building-with-GCC-15.patch -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die - - # required because of xdg.eclass also providing src_prepare - cmake_src_prepare -} - -src_configure() { - - local mycmakeargs=( - -Dalsa="$(usex alsa)" - -Dbundled-gsl="OFF" - -Dbundled-json="OFF" - -Dbundled-speex="OFF" - -Dg15="$(usex g15)" - -Djackaudio="$(usex jack)" - -Doverlay="ON" - -Dportaudio="$(usex portaudio)" - -Doverlay-xcompile="$(usex multilib)" - -Dpipewire="$(usex pipewire)" - -Dpulseaudio="$(usex pulseaudio)" - -Drenamenoise="$(usex rnnoise)" - -Dserver="OFF" - -Dspeechd="$(usex speech)" - -Dtests="$(usex test)" - -Dtracy="OFF" - -Dtranslations="$(usex nls)" - -Dupdate="OFF" - -Dwarnings-as-errors="OFF" - -Dzeroconf="$(usex zeroconf)" - ) - - if [[ "${PV}" != 9999 ]] ; then - mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) - fi - - # https://bugs.gentoo.org/832978 - # fix tests (and possibly runtime issues) on arches with unsigned chars - append-cxxflags -fsigned-char - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use amd64 && use multilib ; then - # The 32bit overlay library gets built when multilib is enabled. - # Install it into the correct 32bit lib dir. - local libdir_64="/usr/$(get_libdir)/mumble" - local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble" - dodir ${libdir_32} - mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \ - "${ED}"/${libdir_32}/ || die - fi - - insinto /usr/share/mumble - doins -r samples -} - -pkg_postinst() { - xdg_pkg_postinst - echo - elog "Visit https://wiki.mumble.info/ for futher configuration instructions." - elog "Run 'mumble-overlay ' to start the OpenGL overlay (after starting mumble)." - echo -}