diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2012-07-12 18:59:41 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2012-07-12 18:59:41 +0000 |
| commit | 37ef1b50da47f088bf37ce6267047cdceff78708 (patch) | |
| tree | 89cd57d4d407aace4faefeeba38a68d867454e59 /media-sound/musique | |
| parent | Add gcc-4.7 patch. Bug #426342 (diff) | |
| download | gentoo-2-37ef1b50da47f088bf37ce6267047cdceff78708.tar.gz gentoo-2-37ef1b50da47f088bf37ce6267047cdceff78708.tar.bz2 gentoo-2-37ef1b50da47f088bf37ce6267047cdceff78708.zip | |
Add patch for gcc-4.7. Bug #422665
(Portage version: 2.1.11.5/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/musique')
| -rw-r--r-- | media-sound/musique/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/musique/files/musique-1.1-gcc47.patch | 13 | ||||
| -rw-r--r-- | media-sound/musique/musique-1.1.ebuild | 10 |
3 files changed, 26 insertions, 4 deletions
diff --git a/media-sound/musique/ChangeLog b/media-sound/musique/ChangeLog index 6a86391bb1eb..bb76d25e08e8 100644 --- a/media-sound/musique/ChangeLog +++ b/media-sound/musique/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/musique # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/ChangeLog,v 1.4 2012/02/09 23:19:34 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/ChangeLog,v 1.5 2012/07/12 18:59:41 hwoarang Exp $ + + 12 Jul 2012; Markos Chandras <hwoarang@gentoo.org> + +files/musique-1.1-gcc47.patch, musique-1.1.ebuild: + Add patch for gcc-4.7. Bug #422665 09 Feb 2012; Markos Chandras <hwoarang@gentoo.org> musique-1.1.ebuild: add missing icon @@ -20,4 +24,3 @@ 21 Jan 2012; Markos Chandras <hwoarang@gentoo.org> +musique-1.0.ebuild, +musique-9999.ebuild, +metadata.xml: Initial commit. This is just a package rename for media-sound/minitunes - diff --git a/media-sound/musique/files/musique-1.1-gcc47.patch b/media-sound/musique/files/musique-1.1-gcc47.patch new file mode 100644 index 000000000000..6350578103bb --- /dev/null +++ b/media-sound/musique/files/musique-1.1-gcc47.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/show_bug.cgi?id=422665 +Index: musique/src/qtsingleapplication/qtlocalpeer.cpp +=================================================================== +--- musique.orig/src/qtsingleapplication/qtlocalpeer.cpp ++++ musique/src/qtsingleapplication/qtlocalpeer.cpp +@@ -57,6 +57,7 @@ typedef BOOL(WINAPI*PProcessIdToSessionI + static PProcessIdToSessionId pProcessIdToSessionId = 0; + #endif + #if defined(Q_OS_UNIX) ++#include <unistd.h> + #include <time.h> + #endif + diff --git a/media-sound/musique/musique-1.1.ebuild b/media-sound/musique/musique-1.1.ebuild index 2f226b72047c..12887d3b4fc3 100644 --- a/media-sound/musique/musique-1.1.ebuild +++ b/media-sound/musique/musique-1.1.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-sound/musique/musique-1.1.ebuild,v 1.2 2012/02/09 23:19:34 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musique/musique-1.1.ebuild,v 1.3 2012/07/12 18:59:41 hwoarang Exp $ EAPI="4" -inherit qt4-r2 +inherit eutils qt4-r2 DESCRIPTION="Qt4 music player." HOMEPAGE="http://flavio.tordini.org/musique" @@ -28,6 +28,12 @@ S="${WORKDIR}/${PN}" DOCS="CHANGES TODO" +src_prepare () { + # bug 422665 + epatch "${FILESDIR}"/${P}-gcc47.patch + qt4-r2_src_prepare +} + src_configure() { eqmake4 ${PN}.pro PREFIX="/usr" } |