Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mangler/files/, media-sound/mangler/
Date: Tue, 27 Apr 2021 02:58:04
Message-Id: 1619492273.1122d0558bf6a2d160d96efcc6366a6e95fa8252.prometheanfire@gentoo
1 commit: 1122d0558bf6a2d160d96efcc6366a6e95fa8252
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 27 02:57:38 2021 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 27 02:57:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1122d055
7
8 media-sound/mangler: more c++11 fixes
9
10 Closes: https://bugs.gentoo.org/784401
11 Package-Manager: Portage-3.0.18, Repoman-3.0.2
12 RepoMan-Options: --force
13 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
14
15 .../mangler/files/fix_ftbfs_narrowing_conversion.patch | 18 ++++++++++++++++++
16 ...mangler-1.2.5-r1.ebuild => mangler-1.2.5-r2.ebuild} | 5 ++++-
17 2 files changed, 22 insertions(+), 1 deletion(-)
18
19 diff --git a/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch b/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch
20 new file mode 100644
21 index 00000000000..feec0808942
22 --- /dev/null
23 +++ b/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch
24 @@ -0,0 +1,18 @@
25 +Description: Declare byte array as unsigned char rather than char to avoid narrowing
26 + A step up in pedantics in C++11 has identified a byte array that was not
27 + declared as unsigned.
28 +Author: William Panlener <wpanlener@×××××.com>
29 +Bug-Debian: https://bugs.debian.org/805160
30 +Forwarded: no
31 +
32 +--- a/src/manglerg15.h
33 ++++ b/src/manglerg15.h
34 +@@ -52,7 +52,7 @@
35 + std::vector<Glib::ustring> events;
36 + };
37 +
38 +-const char g15_blank[] = {
39 ++const unsigned char g15_blank[] = {
40 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
41 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
42 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
43
44 diff --git a/media-sound/mangler/mangler-1.2.5-r1.ebuild b/media-sound/mangler/mangler-1.2.5-r2.ebuild
45 similarity index 92%
46 rename from media-sound/mangler/mangler-1.2.5-r1.ebuild
47 rename to media-sound/mangler/mangler-1.2.5-r2.ebuild
48 index bad5f2f06fc..38b754f7ff4 100644
49 --- a/media-sound/mangler/mangler-1.2.5-r1.ebuild
50 +++ b/media-sound/mangler/mangler-1.2.5-r2.ebuild
51 @@ -33,7 +33,10 @@ RDEPEND="
52 DEPEND="${RDEPEND}"
53 BDEPEND="virtual/pkgconfig"
54
55 -PATCHES=( "${FILESDIR}/mangler-version-info.patch" )
56 +PATCHES=(
57 + "${FILESDIR}/mangler-version-info.patch"
58 + "${FILESDIR}/fix_ftbfs_narrowing_conversion.patch"
59 +)
60
61 src_configure() {
62 tc-export CC