[gentoo-commits] dev/xmw:master commit in: media-radio/linpsk/files/, media-radio/linpsk/

[Michael Weber]

commit:     933a500988a0831173b305d49cb90cbf219701b9
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Sat Dec 29 12:51:25 2012 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 12:51:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=933a5009

media-radio/linpsk: gcc-4.6 compiler fix

Package-Manager: portage-2.2.0_alpha149
Manifest-Sign-Key: 62EEF090

---
 media-radio/linpsk/ChangeLog                      |    4 ++++
 media-radio/linpsk/Manifest                       |   13 +++++--------
 media-radio/linpsk/files/linpsk-1.1-gcc-4.6.patch |   20 ++++++++++++++++++++
 media-radio/linpsk/linpsk-1.1.ebuild              |    4 +++-
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/media-radio/linpsk/ChangeLog b/media-radio/linpsk/ChangeLog
index de5754a..48f4e50 100644
--- a/media-radio/linpsk/ChangeLog
+++ b/media-radio/linpsk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Dec 2012; Michael Weber <xmw@g.o> linpsk-1.1.ebuild,
+  +files/linpsk-1.1-gcc-4.6.patch:
+  gcc-4.6 compiler fix
+
 *linpsk-1.1 (03 Mar 2012)
 
   03 Mar 2012; Michael Weber <xmw@g.o> +linpsk-1.1.ebuild,

diff --git a/media-radio/linpsk/Manifest b/media-radio/linpsk/Manifest
index 0aef6cf..fc81e36 100644
--- a/media-radio/linpsk/Manifest
+++ b/media-radio/linpsk/Manifest
@@ -1,14 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST linpsk-1.1.tgz 116179 RMD160 d2231e14b1b007e71902ec30f5d1a00d1830eecd SHA1 523a3b6f944845b5ebdcb71db84a8142c9a8dbaa SHA256 92a0020585613b9d22e74d4d1c70f8477011e897ccfb699bf15c970ffec389ea
-EBUILD linpsk-1.1.ebuild 1032 RMD160 b59ca5e95c3970969af075b62b3a6ce815f8fec4 SHA1 d18d4ea3f6d418e011d44168ff173c7543c0c992 SHA256 b820be934872fa79bf60596f13e9136a3f8dd400f2e3255e835364c641fd9cae
-MISC ChangeLog 248 RMD160 735b19a41226d0afdec2e5629988ef51c0796dea SHA1 66b8247686728a6b3c47611f62dd54d8738caa0c SHA256 51ecc7d107b3222b7f2b583b25447a4db1a4fd8f1be741f9ed089f8563fe4f86
-MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
+DIST linpsk-1.1.tgz 116179 SHA256 92a0020585613b9d22e74d4d1c70f8477011e897ccfb699bf15c970ffec389ea SHA512 ee3fd8fc416d8d7d39ac8ee2f2d5c087f8f3c94987132618c5cb9f5c5fc6fefd1f5c18e6521db308128201fcf2ccc5459bcc791d9210164f2fff818959faceb2 WHIRLPOOL 3483302f5394a7a42c4192b19e0d5b54f2beec7e2236bd1dbab47a0289e092b88d266081f2b75143356b3b468013a42f56d14d01f7e499207b1e6b9f69889698
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9R83AACgkQknrdDGLu8JBnLAEAj3JfOFLOIdcxnvWxepzDcpw7
-mP7AUrftH/snZ9ZHxsAA/jQOOpXF0kJonf6kfp5cqXui/eUIdj687jFyxd7q7LaP
-=X1A2
+iF4EAREIAAYFAlDe500ACgkQknrdDGLu8JCz4QEAke97FOc9rixaSEuXKxS+M0pP
+uXCXP9/NB7046vJ3L1EA/19mechHR76p30OS4k8Gq9vFHcaZN1AlNqKvAjSoQCf6
+=SNbV
 -----END PGP SIGNATURE-----

diff --git a/media-radio/linpsk/files/linpsk-1.1-gcc-4.6.patch b/media-radio/linpsk/files/linpsk-1.1-gcc-4.6.patch
new file mode 100644
index 0000000..f072a03
--- /dev/null
+++ b/media-radio/linpsk/files/linpsk-1.1-gcc-4.6.patch
@@ -0,0 +1,20 @@
+From http://launchpadlibrarian.net/80358432/linpsk_1.1-1_1.1-1ubuntu1.diff.gz
+
+--- linpsk-1.1.orig/src/linpsk.cpp
++++ linpsk-1.1/src/linpsk.cpp
+@@ -685,12 +685,14 @@ void LinPSK::setRxMode()
+     Menu.setParameter ( *Param );
+   if ( Menu.exec() != 0 )
+   {
++    ExtraParameter mParam;
+     Mode rxmode = ( Mode ) Menu.selectedMode();
+     settings.ActChannel->setMode ( rxmode );
+     RxDisplay->RxFreq->setAfcDisplayMode ( settings.ActChannel->AfcProperties() );
+     RxDisplay->RxFreq->setAfcMode ( settings.ActChannel->getAfcMode() );
+     Control->Display->setPhasePointer ( settings.ActChannel->getPhasePointer() );
+-    settings.ActChannel->setParameter ( Extra, &Menu.getParameter() );
++    mParam = Menu.getParameter();
++    settings.ActChannel->setParameter ( Extra, &mParam );
+   }
+   if ( settings.ActChannel != 0 )
+     switch ( settings.ActChannel->getModulationType() )

diff --git a/media-radio/linpsk/linpsk-1.1.ebuild b/media-radio/linpsk/linpsk-1.1.ebuild
index ab7bc43..75174dd 100644
--- a/media-radio/linpsk/linpsk-1.1.ebuild
+++ b/media-radio/linpsk/linpsk-1.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit qt4-r2
+inherit eutils qt4-r2
 
 DESCRIPTION="PSK31 encoder/decoder using alsa and qt4"
 HOMEPAGE="http://linpsk.sourceforge.net/"
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${PN}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.6.patch
+
 	sed -e '/^target.path/s:local/::' \
 		-i src/src.pro || die
 }