From 1122d0558bf6a2d160d96efcc6366a6e95fa8252 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 26 Apr 2021 21:57:38 -0500 Subject: media-sound/mangler: more c++11 fixes Closes: https://bugs.gentoo.org/784401 Package-Manager: Portage-3.0.18, Repoman-3.0.2 RepoMan-Options: --force Signed-off-by: Matthew Thode --- .../files/fix_ftbfs_narrowing_conversion.patch | 18 +++++++ media-sound/mangler/mangler-1.2.5-r1.ebuild | 59 -------------------- media-sound/mangler/mangler-1.2.5-r2.ebuild | 62 ++++++++++++++++++++++ 3 files changed, 80 insertions(+), 59 deletions(-) create mode 100644 media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch delete mode 100644 media-sound/mangler/mangler-1.2.5-r1.ebuild create mode 100644 media-sound/mangler/mangler-1.2.5-r2.ebuild (limited to 'media-sound') diff --git a/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch b/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch new file mode 100644 index 000000000000..feec08089421 --- /dev/null +++ b/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch @@ -0,0 +1,18 @@ +Description: Declare byte array as unsigned char rather than char to avoid narrowing + A step up in pedantics in C++11 has identified a byte array that was not + declared as unsigned. +Author: William Panlener +Bug-Debian: https://bugs.debian.org/805160 +Forwarded: no + +--- a/src/manglerg15.h ++++ b/src/manglerg15.h +@@ -52,7 +52,7 @@ + std::vector events; + }; + +-const char g15_blank[] = { ++const unsigned char g15_blank[] = { + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/media-sound/mangler/mangler-1.2.5-r1.ebuild b/media-sound/mangler/mangler-1.2.5-r1.ebuild deleted file mode 100644 index bad5f2f06fcd..000000000000 --- a/media-sound/mangler/mangler-1.2.5-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers" -HOMEPAGE="http://www.mangler.org/" -SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2" - -LICENSE="GPL-3 LGPL-2.1 ZLIB" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+alsa opus espeak g15 +gsm oss pulseaudio +speex +xosd" - -RDEPEND=" - dev-cpp/gtkmm:2.4 - gnome-base/librsvg - >=dev-libs/dbus-glib-0.80 - >=dev-libs/glib-2.20.1:2 - >=x11-libs/gtk+-2.16:2 - x11-libs/libX11 - x11-libs/libXi - alsa? ( media-libs/alsa-lib ) - opus? ( media-libs/opus ) - espeak? ( app-accessibility/espeak ) - g15? ( app-misc/g15daemon ) - gsm? ( media-sound/gsm ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.14 ) - speex? ( >=media-libs/speex-1.2_rc1 ) - xosd? ( x11-libs/xosd )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/mangler-version-info.patch" ) - -src_configure() { - tc-export CC - - econf \ - --disable-static \ - $(use_enable gsm) \ - $(use_enable speex) \ - $(use_enable opus) \ - $(use_enable xosd) \ - $(use_enable g15) \ - $(use_enable espeak) \ - $(use_with pulseaudio) \ - $(use_with alsa) \ - $(use_with oss) -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-sound/mangler/mangler-1.2.5-r2.ebuild b/media-sound/mangler/mangler-1.2.5-r2.ebuild new file mode 100644 index 000000000000..38b754f7ff44 --- /dev/null +++ b/media-sound/mangler/mangler-1.2.5-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers" +HOMEPAGE="http://www.mangler.org/" +SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2" + +LICENSE="GPL-3 LGPL-2.1 ZLIB" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+alsa opus espeak g15 +gsm oss pulseaudio +speex +xosd" + +RDEPEND=" + dev-cpp/gtkmm:2.4 + gnome-base/librsvg + >=dev-libs/dbus-glib-0.80 + >=dev-libs/glib-2.20.1:2 + >=x11-libs/gtk+-2.16:2 + x11-libs/libX11 + x11-libs/libXi + alsa? ( media-libs/alsa-lib ) + opus? ( media-libs/opus ) + espeak? ( app-accessibility/espeak ) + g15? ( app-misc/g15daemon ) + gsm? ( media-sound/gsm ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.14 ) + speex? ( >=media-libs/speex-1.2_rc1 ) + xosd? ( x11-libs/xosd )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/mangler-version-info.patch" + "${FILESDIR}/fix_ftbfs_narrowing_conversion.patch" +) + +src_configure() { + tc-export CC + + econf \ + --disable-static \ + $(use_enable gsm) \ + $(use_enable speex) \ + $(use_enable opus) \ + $(use_enable xosd) \ + $(use_enable g15) \ + $(use_enable espeak) \ + $(use_with pulseaudio) \ + $(use_with alsa) \ + $(use_with oss) +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3-65-gdbad