Gentoo Archives: gentoo-commits

From: Thomas Beierlein <tomjbe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/svxlink/files/, media-radio/svxlink/
Date: Wed, 27 Dec 2017 17:46:51
Message-Id: 1514396775.0ca6aa99f6e02dc23c1b27269c681a67cada472e.tomjbe@gentoo
1 commit: 0ca6aa99f6e02dc23c1b27269c681a67cada472e
2 Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 27 17:40:46 2017 +0000
4 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 27 17:46:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca6aa99
7
8 media-radio/svxlink: Backport fix for newer gcc from github.
9
10 Thanks toralf.
11
12 Closes: https://bugs.gentoo.org/639592
13 Package-Manager: Portage-2.3.19, Repoman-2.3.6
14
15 media-radio/svxlink/files/svxlink-15.11-gcc72.patch | 12 ++++++++++++
16 media-radio/svxlink/svxlink-15.11.ebuild | 5 ++++-
17 2 files changed, 16 insertions(+), 1 deletion(-)
18
19 diff --git a/media-radio/svxlink/files/svxlink-15.11-gcc72.patch b/media-radio/svxlink/files/svxlink-15.11-gcc72.patch
20 new file mode 100644
21 index 00000000000..a55894c62f3
22 --- /dev/null
23 +++ b/media-radio/svxlink/files/svxlink-15.11-gcc72.patch
24 @@ -0,0 +1,12 @@
25 +# backported fix for newer compilers
26 +--- src/async/audio/AsyncAudioDeviceAlsa.cpp.orig 2017-12-27 16:32:27.185098621 +0000
27 ++++ src/async/audio/AsyncAudioDeviceAlsa.cpp 2017-12-27 16:33:33.468067578 +0000
28 +@@ -548,7 +548,7 @@
29 + return false;
30 + }
31 +
32 +- if (::abs(real_rate - sample_rate) > 100)
33 ++ if (::abs(static_cast<int>(real_rate) - sample_rate) > 100)
34 + {
35 + cerr << "*** ERROR: The sample rate could not be set to "
36 + << sample_rate << "Hz for ALSA device \"" << dev_name << "\". "
37
38 diff --git a/media-radio/svxlink/svxlink-15.11.ebuild b/media-radio/svxlink/svxlink-15.11.ebuild
39 index de0def111ea..0eac5fc40fe 100644
40 --- a/media-radio/svxlink/svxlink-15.11.ebuild
41 +++ b/media-radio/svxlink/svxlink-15.11.ebuild
42 @@ -2,7 +2,7 @@
43 # Distributed under the terms of the GNU General Public License v2
44
45 EAPI=5
46 -inherit cmake-utils qt4-r2 user
47 +inherit cmake-utils eutils qt4-r2 user
48
49 CMAKE_USE_DIR="${S}/src"
50
51 @@ -34,6 +34,9 @@ pkg_setup() {
52 }
53
54 src_prepare() {
55 + # fix compilation problem with newer gcc bug #639592
56 + epatch "${FILESDIR}"/${P}-gcc72.patch
57 +
58 cmake-utils_src_prepare
59 # drop deprecated desktop category (bug #475730)
60 sed -i -e "s:Categories=Application;:Categories=:g" src/qtel/qtel.desktop || die