diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-sound/mangler | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'media-sound/mangler')
-rw-r--r-- | media-sound/mangler/Manifest | 6 | ||||
-rw-r--r-- | media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch | 18 | ||||
-rw-r--r-- | media-sound/mangler/files/mangler-version-info.patch | 19 | ||||
-rw-r--r-- | media-sound/mangler/mangler-1.2.5-r2.ebuild (renamed from media-sound/mangler/mangler-1.2.5-r1.ebuild) | 7 | ||||
-rw-r--r-- | media-sound/mangler/metadata.xml | 2 |
5 files changed, 48 insertions, 4 deletions
diff --git a/media-sound/mangler/Manifest b/media-sound/mangler/Manifest index f04cb043514d..2d9675124ac0 100644 --- a/media-sound/mangler/Manifest +++ b/media-sound/mangler/Manifest @@ -1,3 +1,5 @@ +AUX fix_ftbfs_narrowing_conversion.patch 709 BLAKE2B d58fcc3a241a0d35e73509ac01922035f47ca9b13791c90decef9f0e7c52214d2bfbd11fb713eaadb441e4d629ce3f07b8162d8bd633672c180dbabf965b8d0c SHA512 7c83c998db7523a8704ae98c14c8f62a2804b6b60caddc9aa01fd3c2b9c07c69f028d4debb306c784f8c4eeeb076afca8fa19dfef40379384d1ef7709130dfbd +AUX mangler-version-info.patch 610 BLAKE2B 2ecee647ca16da9a807cbc5aac964f1495a5519c6d70213a4aade73ac073e0e6d3e82959f155250efd442221a56fa96af770d9f96b1c8182f3634da769eff83d SHA512 877822f936ed7f1aeca17cf02a105c15195b77ec3fa73df63928d7449eee7306719d10b5592bdd17823285bc72ae3950bc6b748755df91b7ed9bee37787b4d4e DIST mangler-1.2.5.tar.bz2 5390985 BLAKE2B b2b61d49683b356be5bcaf111d0e75cc0ff30cbb131b0de360128e2973a415eb87736b55a965fb30651e5d3580a2274754ddb8a44b345c55fc6ba0caa26de0a5 SHA512 e72eb2f408ba925d10563c6821e08406007bd0b7586f9ee054a1de421a6195351140a2df9656a45389f5f568ebf44f53fb719fbf6fb113695f230dd4bad21e38 -EBUILD mangler-1.2.5-r1.ebuild 1273 BLAKE2B c1ebb869c10de4ebe45bb1bf6e64ab3a14820ba3e901e4fa081b29c955c072756ded5f74c63939c80d1c626f709b35ed70d8d0446ad84590fc206e76f5e28bd5 SHA512 97602659cd9ad37e2a7f9a23578a784d8d09676ad5c30c7860ceb217dab590bd663c064f810e995df30179d9fbeeb5bd9170eafd152e9b98a51413be4ef0b1b9 -MISC metadata.xml 470 BLAKE2B dba7ffdefd9ed484e5397a60c4b13f051879ffd760fc32cf423f51343242cca71578ab6d3d87471250f9b223d0247bd92ba3ee2ff1b5b2d05f92dd4ee89b72f1 SHA512 dec3e027307afb3b5589f56e595371026232d5f328fe9520b6d21282eba626b736dbefa7768cb06c4821e75b45340a04a7252e0a1b1380b618ef1f9d54b1692c +EBUILD mangler-1.2.5-r2.ebuild 1380 BLAKE2B 3fdd53a0092910b46833990b49fbbc352c13822c6d800db6af6532b128238d5031cb1dfc16d3bd5ad358b731ea35b1caede0d6782ba652c6a7f6d58c3b5f2e2f SHA512 623097a18c82fd2a62d9fcb3dd1e77586528de6ff3e9fb73e51dd3a6aeff09f54a87835b64649e0186774687b49d04ab97c070c7910cb96de7dc56b0e5198ae5 +MISC metadata.xml 472 BLAKE2B 4fe3d0cd01024a5d02e189adf6e42bd15180c39734db8b5e1cae8f9369e4df9834c7eabaa80c8b9945624f3a5877e7a9cb1f3f4a8bb01157aeae76cbf736cee5 SHA512 e527083dd60ac548ee6e1acadddcf7de55c7b8d6b58d10c4c34750c7bfee839d8b4a1c4a65dc732b1d3587f058b2a037de212ab583f240993223990608546f23 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 <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/files/mangler-version-info.patch b/media-sound/mangler/files/mangler-version-info.patch new file mode 100644 index 000000000000..200c8e7ecab9 --- /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-r2.ebuild index 8f58aefd5e7c..38b754f7ff44 100644 --- a/media-sound/mangler/mangler-1.2.5-r1.ebuild +++ b/media-sound/mangler/mangler-1.2.5-r2.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,11 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/mangler-version-info.patch" + "${FILESDIR}/fix_ftbfs_narrowing_conversion.patch" +) + src_configure() { tc-export CC diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml index 1ca96e6372cb..cd29bd7d1973 100644 --- a/media-sound/mangler/metadata.xml +++ b/media-sound/mangler/metadata.xml @@ -8,7 +8,7 @@ <maintainer type="person"> <email>prometheanfire@gentoo.org</email> </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>sound@gentoo.org</email> <name>Gentoo Sound project</name> </maintainer> |