Add missing #includes for gcc47 (bug 427486). Thanks Diego. Also add slot deps to qt-*:4

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 37 insertions, 8 deletions

diff --git a/media-radio/qsstv/ChangeLog b/media-radio/qsstv/ChangeLog
index 1c979933f95e..509fe3c80e42 100644
--- a/media-radio/qsstv/ChangeLog
+++ b/media-radio/qsstv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-radio/qsstv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/ChangeLog,v 1.12 2012/06/19 07:36:20 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/ChangeLog,v 1.13 2012/08/01 06:49:00 tomjbe Exp $
+
+  01 Aug 2012; Thomas Beierlein <tomjbe@gentoo.org> qsstv-7.1.7.ebuild,
+  +files/qsstv-7.1.7-gcc-47.patch:
+  Add missing #includes for gcc47 (bug 427486). Thanks Diego. Also add slot
+  deps to qt-*:4
 
   19 Jun 2012; Jeff Horelick <jdhore@gentoo.org> qsstv-7.1.7.ebuild:
   marked x86 per bug 421711
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index 16ab34178c70..4f1ad76d61a0 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,4 +1,15 @@
-DIST qsstv_7.1.7.tgz 2116410 RMD160 6c0bf61b04b50272ab2be560ea6c9fab46e0b09a SHA1 3b3080cc6fd1ba1821868db2569f288872c29c09 SHA256 ae713985af1072ab267c280dcb81c830a9a026545cf402444e1f72a3e7f25f00
-EBUILD qsstv-7.1.7.ebuild 952 RMD160 dcf94f0028f32cf9d09d8252d56179da0c215807 SHA1 b4432a8ab111414ffa14a5cc314612b7c611cff3 SHA256 a1f30b3defb3b2a1141fdb042d9ea6e177b1a431a41d4c4c371b9469f4dba444
-MISC ChangeLog 1024 RMD160 44eb47267af026a5af5e4db8a04349c2cd56124e SHA1 ead668c6fd7171a77dc2a6e9418d643273f4eb64 SHA256 db87b2fa6a741ab87b5bf2bf240ec679fa40a572dc5da747adb8f561af5e6229
-MISC metadata.xml 299 RMD160 80d6fe067b3c22976b8d073f615628d75e5b8de9 SHA1 338e3799bfc76798d49bf5f1ab2d039718921791 SHA256 d4552cc67580dc5b287f559941b70575e524d199805e67cf46bb98b8e86d0382
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX qsstv-7.1.7-gcc-47.patch 350 SHA256 69d50bc04196f575a65f11c0cd1cde78136a22540f78e1811602705cc6581e57 SHA512 542212ce8f686292d5bcef75d430c363b12943d6cd11deaa4feb58f5e6667edde990312703bdcb3edbdfa4af741466acd431b03aca9ac1948aa00e3de4bab457 WHIRLPOOL 99613ecea8aea49febecbf6f8a0bff7c9737f2b5846f7a54f4787003da686d45cc74ecad3b333b044a7430430b3f5ac43cb7cc682f9210b13b9762ca7fe57355
+DIST qsstv_7.1.7.tgz 2116410 SHA256 ae713985af1072ab267c280dcb81c830a9a026545cf402444e1f72a3e7f25f00 SHA512 1b7c554d3d7e1638f8ca5477db3dec09e2ed89347bcd4272684e2da0667f69a9f3a3819a6dd3cae85d13c0fd5c33e69ddc42b74805f91a57197a948b237d630b WHIRLPOOL 1179b4b10a77bb292e75876a23761473d5e6b46e9ef03d0d90c4e9e7f936829149be898630deb3d046f7e792064db61a6f41107b8f8b13035f8b664544e10764
+EBUILD qsstv-7.1.7.ebuild 1053 SHA256 58ad4e9a8010b8d6fa16beb66decee611f5fddf0fdf6474306ffa8a0065bb6fa SHA512 4280dd922dd4a00a96938a726a92ff57d7fa316a34143a74e44daea285ff22337c72bc9b49585b4f71d115c73576eeaf393906625fc0d7944e716b30db677d3f WHIRLPOOL 7cb4b9d5cff7adc4a778904a3e21454f73f5c60d8bbbdb4a8800127efd5103e1f9c4a0e48ba08e9dc79628fd90f229ef14b2b22caea16042aecb318e885281d6
+MISC ChangeLog 1225 SHA256 55cb44bd0f711db2e8dc1a8ca2e839e5300ec2a9506ba7104408eb59fdac3cb7 SHA512 c81d13cdfdbfd4f921d66113cf7d5379c9fefadeb31f03d3c9ff24d95432d564b0668a412e5abdb9ee8692734a85b4b30b132d79b4672d9d7d4e56241caeb61b WHIRLPOOL c7375389ea9b2cba4c452477e49ea8ffaa507e3c4b799ca82ad222f5dc4044dc675b824f2d065dee4ed89fbc35d70e51afef0bb3e0555036e51437ea5a2f5aa5
+MISC metadata.xml 299 SHA256 d4552cc67580dc5b287f559941b70575e524d199805e67cf46bb98b8e86d0382 SHA512 0235af55cb52ad24cf96e17e52a2d54101781ef468d2fb8fb151bbcd7f156703d5b775fbeff6ca8831e063690fe0d3e71e673d250efcfb74a8b7e0419c8563f2 WHIRLPOOL 3de5e803e3dd9647bfe065895f4be749169c4b4b2ea815f041c13662fe61e08aa270715e54b13ff9ffda559a85cc75f1b330acf2c536ea7e318f36b501d836cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAY0WgACgkQQe4uqXYgU9X0LgCdHVz7f/CD/Hub6wfzw7242GFy
+u6oAnRcnXdrjCIs9WobWWWnpPcpSCROX
+=a9oQ
+-----END PGP SIGNATURE-----
diff --git a/media-radio/qsstv/files/qsstv-7.1.7-gcc-47.patch b/media-radio/qsstv/files/qsstv-7.1.7-gcc-47.patch
new file mode 100644
index 000000000000..fecde99d7a85
--- /dev/null
+++ b/media-radio/qsstv/files/qsstv-7.1.7-gcc-47.patch
@@ -0,0 +1,11 @@
+--- src/wavio.cpp.new	2012-08-01 06:34:43.000000000 +0000
++++ src/wavio.cpp	2012-08-01 06:36:05.000000000 +0000
+@@ -30,6 +30,8 @@
+  ***************************************************************************/
+ 
+ #include "wavio.h"
++#include <sys/types.h>
++#include <unistd.h>
+ #include "global.h"
+ #include <qfiledialog.h>
+ #include "configparams.h"
diff --git a/media-radio/qsstv/qsstv-7.1.7.ebuild b/media-radio/qsstv/qsstv-7.1.7.ebuild
index 22ef12855581..508014d2b7be 100644
--- a/media-radio/qsstv/qsstv-7.1.7.ebuild
+++ b/media-radio/qsstv/qsstv-7.1.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-7.1.7.ebuild,v 1.4 2012/06/19 07:36:20 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-7.1.7.ebuild,v 1.5 2012/08/01 06:49:00 tomjbe Exp $
 
 EAPI=4
 
-inherit multilib qt4-r2
+inherit eutils multilib qt4-r2
 
 MY_P=${P/-/_}
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="x11-libs/qt-core[qt3support]
+DEPEND="x11-libs/qt-core:4[qt3support]
 	media-libs/hamlib
 	media-libs/alsa-lib
 	sci-libs/fftw:3.0"
@@ -33,4 +33,6 @@ src_prepare() {
 		-e "s:target.extra:#target.extra:" \
 		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" src/src.pro
 	sed -i -e "s:doc/qsstv:doc/${PF}:" src/configdialog.cpp
+	# add missing #includes for gcc-4.7 (bug # 427486)
+	epatch "${FILESDIR}"/${P}-gcc-47.patch
 }