diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2012-08-05 19:00:38 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2012-08-05 19:00:38 +0000 |
| commit | 95c4e1cc9a2b34f4be152d658a4c6931d31050fa (patch) | |
| tree | 135c9c43b8f4ceaa62852805d466073a71c785ea /media-video/xvideoservicethief | |
| parent | arm stable, bug #419087 (diff) | |
| download | gentoo-2-95c4e1cc9a2b34f4be152d658a4c6931d31050fa.tar.gz gentoo-2-95c4e1cc9a2b34f4be152d658a4c6931d31050fa.tar.bz2 gentoo-2-95c4e1cc9a2b34f4be152d658a4c6931d31050fa.zip | |
Update gcc47 patch. Bug #430006
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'media-video/xvideoservicethief')
| -rw-r--r-- | media-video/xvideoservicethief/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/media-video/xvideoservicethief/ChangeLog b/media-video/xvideoservicethief/ChangeLog index 7c501ce5c115..d9d20c85ad86 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.32 2012/07/18 18:28:19 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/xvideoservicethief/ChangeLog,v 1.33 2012/08/05 19:00:38 hwoarang Exp $ + + 05 Aug 2012; Markos Chandras <hwoarang@gentoo.org> + files/xvideoservicethief-2.4.1-gcc47.patch, + xvideoservicethief-2.4.1-r2.ebuild: + Update gcc47 patch. Bug #430006 18 Jul 2012; Markos Chandras <hwoarang@gentoo.org> +files/xvideoservicethief-2.4.1-gcc47.patch, diff --git a/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch b/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch index 535912d97ccf..90ea8a88ba82 100644 --- a/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch +++ b/media-video/xvideoservicethief/files/xvideoservicethief-2.4.1-gcc47.patch @@ -1,12 +1,16 @@ -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 +Index: work/src/qtsingleapplication/src/qtlocalpeer.cpp +=================================================================== +--- work.orig/src/qtsingleapplication/src/qtlocalpeer.cpp ++++ work/src/qtsingleapplication/src/qtlocalpeer.cpp +@@ -100,7 +100,11 @@ QtLocalPeer::QtLocalPeer(QObject* parent socketName += QLatin1Char('-') + QString::number(sessionId, 16);
}
#else
-- socketName += QLatin1Char('-') + QString::number(::getuid(), 16);
++#if __GNUC__ >= 4 && __GNUC_MINOR__ <=6
+ socketName += QLatin1Char('-') + QString::number(::getuid(), 16);
++#else
+ socketName += QLatin1Char('-') + QString::number(QtLP_Private::getuid(), 16);
++#endif
#endif
server = new QLocalServer(this);
|