diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2012-07-18 18:28:19 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2012-07-18 18:28:19 +0000 |
commit | e178beed02d50e53e2aeb5d71a16368d444bce7a (patch) | |
tree | d804fb648d9b52bb91d9b7b8567f59da0ac276f5 | |
parent | Version bump to latest (diff) | |
download | gentoo-2-e178beed02d50e53e2aeb5d71a16368d444bce7a.tar.gz gentoo-2-e178beed02d50e53e2aeb5d71a16368d444bce7a.tar.bz2 gentoo-2-e178beed02d50e53e2aeb5d71a16368d444bce7a.zip |
Fix building with gcc-4.7. Bug #427066 thanks to Duncan <1i5t5.duncan@cox.net>
(Portage version: 2.1.11.7/cvs/Linux x86_64)
3 files changed, 21 insertions, 2 deletions
diff --git a/media-video/xvideoservicethief/ChangeLog b/media-video/xvideoservicethief/ChangeLog index 916b56f03df4..7c501ce5c115 100644 --- a/media-video/xvideoservicethief/ChangeLog +++ b/media-video/xvideoservicethief/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/xvideoservicethief # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/ChangeLog,v 1.31 2012/07/12 15:17:23 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/ChangeLog,v 1.32 2012/07/18 18:28:19 hwoarang Exp $ + + 18 Jul 2012; Markos Chandras <hwoarang@gentoo.org> + +files/xvideoservicethief-2.4.1-gcc47.patch, + xvideoservicethief-2.4.1-r2.ebuild: + Fix building with gcc-4.7. Bug #427066 thanks to Duncan <1i5t5.duncan@cox.net> 12 Jul 2012; Johannes Huber <johu@gentoo.org> -xvideoservicethief-2.4.1-r1.ebuild: diff --git a/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch b/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch new file mode 100644 index 000000000000..535912d97ccf --- /dev/null +++ b/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/show_bug.cgi?id=427066 +--- src/qtsingleapplication/src/qtlocalpeer.cpp.bak 2009-10-11 20:43:46.000000000 -0700 ++++ src/qtsingleapplication/src/qtlocalpeer.cpp 2012-07-18 01:43:28.210656553 -0700 +@@ -100,7 +100,7 @@ QtLocalPeer::QtLocalPeer(QObject* parent + socketName += QLatin1Char('-') + QString::number(sessionId, 16);
+ }
+ #else
+- socketName += QLatin1Char('-') + QString::number(::getuid(), 16);
++ socketName += QLatin1Char('-') + QString::number(QtLP_Private::getuid(), 16);
+ #endif
+
+ server = new QLocalServer(this);
diff --git a/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild b/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild index d6dda2eaefce..7ea44d2d05d4 100644 --- a/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild +++ b/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild,v 1.3 2012/07/12 15:11:30 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild,v 1.4 2012/07/18 18:28:19 hwoarang Exp $ EAPI=2 @@ -46,6 +46,8 @@ src_prepare() { sed -i -e "s/getApplicationPath()\ +\ \"/\"\/usr\/share\/${PN}/g" \ "${S}"/src/options.cpp || die "failed to fix paths" epatch "${FILESDIR}"/${P}-youtube-api.patch + # bug 427066 + epatch "${FILESDIR}"/${P}-gcc47.patch } src_compile() { |