summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2012-08-01 06:49:00 +0000
committerThomas Beierlein <tomjbe@gentoo.org>2012-08-01 06:49:00 +0000
commit97165226e6ab55126248f86a375f7727ce9bc551 (patch)
tree2bab3c5ea743844a67ae745cebca3f91b29ca8bd /media-radio/qsstv
parentVersion bump. (diff)
downloadgentoo-2-97165226e6ab55126248f86a375f7727ce9bc551.tar.gz
gentoo-2-97165226e6ab55126248f86a375f7727ce9bc551.tar.bz2
gentoo-2-97165226e6ab55126248f86a375f7727ce9bc551.zip
Add missing #includes for gcc47 (bug 427486). Thanks Diego. Also add slot deps to qt-*:4
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'media-radio/qsstv')
-rw-r--r--media-radio/qsstv/ChangeLog7
-rw-r--r--media-radio/qsstv/files/qsstv-7.1.7-gcc-47.patch11
-rw-r--r--media-radio/qsstv/qsstv-7.1.7.ebuild8
3 files changed, 22 insertions, 4 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/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
}