From afc960cb03b862c89be6840332deee8059dc3f5d Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 15 Jun 2020 11:54:00 +0200 Subject: media-sound/mumble: Security bump to version 1.3.1 Bug: https://bugs.gentoo.org/727598 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Lars Wendler --- media-sound/mumble/Manifest | 2 +- .../mumble/files/mumble-1.3.1_rc1-qt-5.15.patch | 28 ---- media-sound/mumble/mumble-1.3.1.ebuild | 160 ++++++++++++++++++++ media-sound/mumble/mumble-1.3.1_rc1.ebuild | 162 --------------------- 4 files changed, 161 insertions(+), 191 deletions(-) delete mode 100644 media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch create mode 100644 media-sound/mumble/mumble-1.3.1.ebuild delete mode 100644 media-sound/mumble/mumble-1.3.1_rc1.ebuild (limited to 'media-sound/mumble') diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest index 105fb3e2f1ff..c6056d2712ba 100644 --- a/media-sound/mumble/Manifest +++ b/media-sound/mumble/Manifest @@ -1,2 +1,2 @@ DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122 -DIST mumble-1.3.1-rc1.tar.gz 8796775 BLAKE2B e229734c2a23da3be7cc9ef5fe9f5c15a423c27b7dd610a5d855089167dca8739f8e32c88efa126b5f08f0391324da7b16454468c2465d2275019179b15b893e SHA512 b05533545aaecb24f403f1876b8b1eb771d39724b1a4db65776cfbc09419b81f4c1017ec99aad7f0e4b5d16e6962d72817467e7a3dec628b4a9b66ab8de555cc +DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7 diff --git a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch deleted file mode 100644 index 4268d56e8290..000000000000 --- a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4539fd92462b9dd1a99b4bfe307abae4e2d89045 Mon Sep 17 00:00:00 2001 -From: Marco Genasci -Date: Mon, 1 Jun 2020 21:01:00 +0200 -Subject: [PATCH] src/mumble/OverlayText.h: add missing - include for Qt 5.15 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -../../release/.moc/mumble/../../../src/mumble/OverlayText.h:42:16: error: field ‘qpp’ has incomplete type ‘QPainterPath’ - 42 | QPainterPath qpp; - | ^~~ ---- - src/mumble/OverlayText.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h -index f06f2b63a8..c1cd9efdd7 100644 ---- a/src/mumble/OverlayText.h -+++ b/src/mumble/OverlayText.h -@@ -6,6 +6,7 @@ - #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_ - #define MUMBLE_MUMBLE_OVERLAYTEXT_H_ - -+#include - #include - #include - diff --git a/media-sound/mumble/mumble-1.3.1.ebuild b/media-sound/mumble/mumble-1.3.1.ebuild new file mode 100644 index 000000000000..69f5d7055e0d --- /dev/null +++ b/media-sound/mumble/mumble-1.3.1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop multilib-build qmake-utils 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" + EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src ) +else + if [[ "${PV}" == *_pre* ]] ; then + SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" + else + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz + https://dl.mumble.info/${MY_P}.tar.gz" + S="${WORKDIR}/${P/_*}" + fi + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="BSD MIT" +SLOT="0" +IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf" + +RDEPEND=" + dev-qt/qtcore: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 + >=dev-libs/protobuf-2.2.0:= + >=media-libs/libsndfile-1.0.20[-minimal] + >=media-libs/speex-1.2.0 + media-libs/speexdsp + sys-apps/lsb-release + x11-libs/libX11 + x11-libs/libXi + alsa? ( media-libs/alsa-lib ) + dbus? ( dev-qt/qtdbus:5 ) + g15? ( app-misc/g15daemon ) + jack? ( virtual/jack ) + !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) + libressl? ( dev-libs/libressl ) + opus? ( >=media-libs/opus-1.0.1 ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-sound/pulseaudio ) + speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) +" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.41.0 + x11-base/xorg-proto +" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +# NB: qmake does not support multilib but it's fine to configure +# for the native ABI here +src_configure() { + myuse() { + [[ -n "${1}" ]] || die "myuse: No use option given" + use ${1} || echo no-${1} + } + + local conf_add=( + bundled-celt + no-bundled-opus + no-bundled-speex + no-embed-qt-translations + no-server + no-update + $(myuse alsa) + $(myuse dbus) + $(usex debug 'symbols debug' release) + $(myuse g15) + $(usex jack '' no-jackaudio) + $(myuse opus) + $(myuse oss) + $(myuse portaudio) + $(myuse pulseaudio) + $(myuse rnnoise) + $(usex speech '' no-speechd) + $(usex zeroconf '' no-bonjour) + ) + + use pch || conf_add+=( no-pch ) + + eqmake5 "${S}/main.pro" -recursive \ + CONFIG+="${conf_add[*]}" \ + DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" +} + +multilib_src_compile() { + local emake_args=( + # place libmumble* in a subdirectory + DESTDIR_ADD="/${MULTILIB_ABI_FLAG}" + {C,L}FLAGS_ADD="$(get_abi_CFLAGS)" + ) + # build only overlay library for other ABIs + multilib_is_native_abi || emake_args+=( -C overlay_gl ) + emake "${emake_args[@]}" + emake clean +} + +src_compile() { + multilib_foreach_abi multilib_src_compile +} + +multilib_src_install() { + local dir=$(usex debug debug release) + dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* + if multilib_is_native_abi; then + dobin "${dir}"/mumble + dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* + fi +} + +src_install() { + multilib_foreach_abi multilib_src_install + + newdoc README.Linux README + dodoc CHANGES + dobin scripts/mumble-overlay + + insinto /usr/share/services + doins scripts/mumble.protocol + + domenu scripts/mumble.desktop + + doicon -s scalable icons/mumble.svg + + doman man/mumble-overlay.1 + doman man/mumble.1 +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + xdg_pkg_postinst + echo + elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions." + elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." + echo +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1_rc1.ebuild deleted file mode 100644 index f23f44786ac9..000000000000 --- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop multilib-build qmake-utils 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" - EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src ) -else - if [[ "${PV}" == *_pre* ]] ; then - SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" - else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz - https://dl.mumble.info/${MY_P}.tar.gz" - S="${WORKDIR}/${P/_*}" - fi - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -LICENSE="BSD MIT" -SLOT="0" -IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf" - -RDEPEND=" - dev-qt/qtcore: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 - >=dev-libs/protobuf-2.2.0:= - >=media-libs/libsndfile-1.0.20[-minimal] - >=media-libs/speex-1.2.0 - media-libs/speexdsp - sys-apps/lsb-release - x11-libs/libX11 - x11-libs/libXi - alsa? ( media-libs/alsa-lib ) - dbus? ( dev-qt/qtdbus:5 ) - g15? ( app-misc/g15daemon ) - jack? ( virtual/jack ) - !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) - libressl? ( dev-libs/libressl ) - opus? ( >=media-libs/opus-1.0.1 ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${RDEPEND} - >=dev-libs/boost-1.41.0 - x11-base/xorg-proto -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # in git master; bug #726692 - -# NB: qmake does not support multilib but it's fine to configure -# for the native ABI here -src_configure() { - myuse() { - [[ -n "${1}" ]] || die "myuse: No use option given" - use ${1} || echo no-${1} - } - - local conf_add=( - bundled-celt - no-bundled-opus - no-bundled-speex - no-embed-qt-translations - no-server - no-update - $(myuse alsa) - $(myuse dbus) - $(usex debug 'symbols debug' release) - $(myuse g15) - $(usex jack '' no-jackaudio) - $(myuse opus) - $(myuse oss) - $(myuse portaudio) - $(myuse pulseaudio) - $(myuse rnnoise) - $(usex speech '' no-speechd) - $(usex zeroconf '' no-bonjour) - ) - - use pch || conf_add+=( no-pch ) - - eqmake5 "${S}/main.pro" -recursive \ - CONFIG+="${conf_add[*]}" \ - DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" -} - -multilib_src_compile() { - local emake_args=( - # place libmumble* in a subdirectory - DESTDIR_ADD="/${MULTILIB_ABI_FLAG}" - {C,L}FLAGS_ADD="$(get_abi_CFLAGS)" - ) - # build only overlay library for other ABIs - multilib_is_native_abi || emake_args+=( -C overlay_gl ) - emake "${emake_args[@]}" - emake clean -} - -src_compile() { - multilib_foreach_abi multilib_src_compile -} - -multilib_src_install() { - local dir=$(usex debug debug release) - dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so* - if multilib_is_native_abi; then - dobin "${dir}"/mumble - dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so* - fi -} - -src_install() { - multilib_foreach_abi multilib_src_install - - newdoc README.Linux README - dodoc CHANGES - dobin scripts/mumble-overlay - - insinto /usr/share/services - doins scripts/mumble.protocol - - domenu scripts/mumble.desktop - - doicon -s scalable icons/mumble.svg - - doman man/mumble-overlay.1 - doman man/mumble.1 -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - echo - elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions." - elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)." - echo -} - -pkg_postrm() { - xdg_pkg_postrm -} -- cgit v1.2.3-65-gdbad