diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-06-24 17:27:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-24 17:27:38 +0000 |
| commit | f888fba045483d6828a20d702113935086f2c152 (patch) | |
| tree | a409c46a80b69d687fd554de81d1fd7ad847091d | |
| parent | Version Bump and restricting gtk+ version #273237 (diff) | |
| download | gentoo-2-f888fba045483d6828a20d702113935086f2c152.tar.gz gentoo-2-f888fba045483d6828a20d702113935086f2c152.tar.bz2 gentoo-2-f888fba045483d6828a20d702113935086f2c152.zip | |
Fix building with GCC 4.5+ wrt #322525 by Markos Chandras.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
| -rw-r--r-- | kde-misc/rsibreak/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-misc/rsibreak/files/rsibreak-0.10-gcc45.patch | 24 | ||||
| -rw-r--r-- | kde-misc/rsibreak/rsibreak-0.10.ebuild | 7 |
3 files changed, 33 insertions, 6 deletions
diff --git a/kde-misc/rsibreak/ChangeLog b/kde-misc/rsibreak/ChangeLog index d61fddc96ce2..c0a1e02779fa 100644 --- a/kde-misc/rsibreak/ChangeLog +++ b/kde-misc/rsibreak/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-misc/rsibreak -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/rsibreak/ChangeLog,v 1.33 2009/10/28 12:56:45 ssuominen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-misc/rsibreak/ChangeLog,v 1.34 2010/06/24 17:27:38 ssuominen Exp $ + + 24 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> rsibreak-0.10.ebuild, + +files/rsibreak-0.10-gcc45.patch: + Fix building with GCC 4.5+ wrt #322525 by Markos Chandras. 28 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> rsibreak-0.10.ebuild: amd64 stable wrt #290873 diff --git a/kde-misc/rsibreak/files/rsibreak-0.10-gcc45.patch b/kde-misc/rsibreak/files/rsibreak-0.10-gcc45.patch new file mode 100644 index 000000000000..75903545abac --- /dev/null +++ b/kde-misc/rsibreak/files/rsibreak-0.10-gcc45.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/322525 + +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -49,7 +49,7 @@ breakcontrol.cpp + + QT4_ADD_DBUS_ADAPTOR( rsibreak_sources + org.rsibreak.rsiwidget.xml +-rsiwidget.h RSIObject::RSIObject ++rsiwidget.h RSIObject + ) + + # compilation +--- src/rsitimer.cpp ++++ src/rsitimer.cpp +@@ -490,7 +490,7 @@ void RSITimer::readConfig() + m_ignoreIdleForTinyBreaks = config.readEntry( "IgnoreIdleForTinyBreaks", false ); + + config = KGlobal::config()->group( "General" ); +- m_lastrunDt = config.readEntry( "LastRunTimeStamp", QDateTime::QDateTime() ); ++ m_lastrunDt = config.readEntry( "LastRunTimeStamp", QDateTime() ); + m_lastrunTiny = config.readEntry( "LastRunTinyLeft", 0 ); + m_lastrunBig = config.readEntry( "LastRunBigLeft", 0 ); + } diff --git a/kde-misc/rsibreak/rsibreak-0.10.ebuild b/kde-misc/rsibreak/rsibreak-0.10.ebuild index f6d8aca76a2c..d78a2d7a01d9 100644 --- a/kde-misc/rsibreak/rsibreak-0.10.ebuild +++ b/kde-misc/rsibreak/rsibreak-0.10.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/rsibreak/rsibreak-0.10.ebuild,v 1.3 2009/10/28 12:56:45 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/rsibreak/rsibreak-0.10.ebuild,v 1.4 2010/06/24 17:27:38 ssuominen Exp $ EAPI=2 -KDE_MINIMAL=4.2 KDE_LINGUAS="ar be ca cs da de el en_GB es et fr ga gl hi hne is it ja km ko lt ml nb nds nl nn oc pl pt pt_BR ro ru se sk sv tr uk zh_CN zh_TW" KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}" @@ -19,4 +18,4 @@ SLOT="4" KEYWORDS="amd64 ~ppc ~x86" IUSE="debug +handbook" -DEPEND="!${CATEGORY}/${PN}:0" +PATCHES=( "${FILESDIR}/${P}-gcc45.patch" ) |