[gentoo-commits] repo/gentoo:master commit in: media-sound/mangler/files/, media-sound/mangler/

[gentoo-commits] repo/gentoo:master commit in: media-sound/mangler/files/, media-sound/mangler/

[Matthew Thode]

commit:     979f9b8b7ba7307bcd7679ba92e5eb2f7b9ec4a7
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  9 15:58:27 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Apr  9 15:58:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979f9b8b

media-sound/mangler: fix version-info bug

Closes: https://bugs.gentoo.org/778377
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 media-sound/mangler/files/mangler-version-info.patch | 19 +++++++++++++++++++
 media-sound/mangler/mangler-1.2.5-r1.ebuild          |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/media-sound/mangler/files/mangler-version-info.patch b/media-sound/mangler/files/mangler-version-info.patch
new file mode 100644
index 00000000000..200c8e7ecab
--- /dev/null
+++ b/media-sound/mangler/files/mangler-version-info.patch
@@ -0,0 +1,19 @@
+commit 2581fbd54434df6dc4babd48bb41eaf7f5d6d06a
+Author: orbea <orbea@riseup.net>
+Date:   Wed Apr 7 10:01:31 2021 -0700
+
+    libventrilo3: Fix -version-info typo.
+
+diff --git a/libventrilo3/Makefile.am b/libventrilo3/Makefile.am
+index a934acf..c2fea99 100644
+--- a/libventrilo3/Makefile.am
++++ b/libventrilo3/Makefile.am
+@@ -7,7 +7,7 @@ libventrilo3_la_SOURCES = libventrilo3.c  libventrilo3_message.c  ventrilo3_hand
+ 
+ libventrilo3_la_LIBADD = $(speex_LIBS) $(opus_LIBS) $(LIBS) -lm
+ 
+-libventrilo3_la_LDFLAGS = -version 0:0:0
++libventrilo3_la_LDFLAGS = -version-info 0:0:0
+ 
+ include_HEADERS = ventrilo3.h
+ 

diff --git a/media-sound/mangler/mangler-1.2.5-r1.ebuild b/media-sound/mangler/mangler-1.2.5-r1.ebuild
index 8f58aefd5e7..bad5f2f06fc 100644
--- a/media-sound/mangler/mangler-1.2.5-r1.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/mangler-version-info.patch" )
+
 src_configure() {
 	tc-export CC
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/mangler/files/, media-sound/mangler/

[Matthew Thode]

commit:     1122d0558bf6a2d160d96efcc6366a6e95fa8252
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 02:57:38 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 02:57:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1122d055

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 <prometheanfire <AT> gentoo.org>

 .../mangler/files/fix_ftbfs_narrowing_conversion.patch | 18 ++++++++++++++++++
 ...mangler-1.2.5-r1.ebuild => mangler-1.2.5-r2.ebuild} |  5 ++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

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 00000000000..feec0808942
--- /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 <wpanlener@gmail.com>
+Bug-Debian: https://bugs.debian.org/805160
+Forwarded: no
+
+--- a/src/manglerg15.h
++++ b/src/manglerg15.h
+@@ -52,7 +52,7 @@
+         std::vector<Glib::ustring> 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-r2.ebuild
similarity index 92%
rename from media-sound/mangler/mangler-1.2.5-r1.ebuild
rename to media-sound/mangler/mangler-1.2.5-r2.ebuild
index bad5f2f06fc..38b754f7ff4 100644
--- a/media-sound/mangler/mangler-1.2.5-r1.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r2.ebuild
@@ -33,7 +33,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/mangler-version-info.patch" )
+PATCHES=(
+	"${FILESDIR}/mangler-version-info.patch"
+	"${FILESDIR}/fix_ftbfs_narrowing_conversion.patch"
+)
 
 src_configure() {
 	tc-export CC