From: Samuli Suominen Date: Thu, 24 Jun 2010 17:27:38 +0000 (+0000) Subject: Fix building with GCC 4.5+ wrt #322525 by Markos Chandras. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=75387622fc7f97a04b7e68df45cdcea86d39ffb0;p=gentoo.git Fix building with GCC 4.5+ wrt #322525 by Markos Chandras. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- 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 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 rsibreak-0.10.ebuild: amd64 stable wrt #290873 diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest index 7785f7100b34..fd6167107f22 100644 --- a/kde-misc/rsibreak/Manifest +++ b/kde-misc/rsibreak/Manifest @@ -1,4 +1,5 @@ +AUX rsibreak-0.10-gcc45.patch 773 RMD160 5f1d28ac1ab57b809e654af1a848306dbdfe3535 SHA1 cbade67a89c7dd41297b2c357c5ec2d1c48eb085 SHA256 67dac305076895d3cdc4b695beea600f45189977d4be5ee61281b6589c0dd15e DIST rsibreak-0.10.tar.bz2 397732 RMD160 97cb329520145a842f0106408377a3e9b4d189f5 SHA1 39ccbfb4f325f11104910950d7c6d5428127b1e4 SHA256 604632d09b7fc61d24a79a5160c63bdd0fd39f67c33a5b7f7632b10d7fe57b0b -EBUILD rsibreak-0.10.ebuild 735 RMD160 5af6b5e60e6626d62c3a57b79f93fd971913e583 SHA1 c052d02f570d96db5e8e933468a0b77145b8b724 SHA256 d3a985c88c0125153235d7b1f84b3d3a8a23f45b627f923c37ab2b440f3705d9 -MISC ChangeLog 4710 RMD160 262158d262a0ff28000298d99519097b8f87b6bf SHA1 95ee6335def35bf5ae73b78564cb72ab07220dec SHA256 f1ba7a399755ce633aadb93844070e111c25f08bb241d84df11e9c7807574418 +EBUILD rsibreak-0.10.ebuild 732 RMD160 248989879d57886a68468b1758fd884ee442a38e SHA1 c845d3e27e45cbaf4f0486375313d4d0a62c6271 SHA256 4b697c5387d285bef0dd02b37d69976fbf744d2b9839c8c19eb94a123e5dce66 +MISC ChangeLog 4884 RMD160 d00dcb4e6bfc883a1bbf9afa38586acbaaa73ed1 SHA1 89f493fcf0cb65efb073fccd009428db0904fa32 SHA256 b81820998a53222703ecdc8bac812161e4b1ccb3be2be9b9ca5381b214f32cb9 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a 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" )