diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-06-05 13:57:03 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-05 13:57:03 +0000 |
| commit | f248905fd46e4cf7d7948ae837572fb01d071c97 (patch) | |
| tree | 0e31844a15e53c86cc58892d0bb74cedc49917eb /kde-misc/filelight | |
| parent | Version bump with minor bug fixes (diff) | |
| download | gentoo-2-f248905fd46e4cf7d7948ae837572fb01d071c97.tar.gz gentoo-2-f248905fd46e4cf7d7948ae837572fb01d071c97.tar.bz2 gentoo-2-f248905fd46e4cf7d7948ae837572fb01d071c97.zip | |
Fix building with GCC 4.5+ wrt #321357 by Gef Lebster.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc/filelight')
| -rw-r--r-- | kde-misc/filelight/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-misc/filelight/filelight-1.9_rc3.ebuild | 5 | ||||
| -rw-r--r-- | kde-misc/filelight/files/filelight-1.9_rc3-gcc45.patch | 24 |
3 files changed, 32 insertions, 3 deletions
diff --git a/kde-misc/filelight/ChangeLog b/kde-misc/filelight/ChangeLog index cceee08f08f4..50882d2400b6 100644 --- a/kde-misc/filelight/ChangeLog +++ b/kde-misc/filelight/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-misc/filelight # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/ChangeLog,v 1.41 2010/03/06 09:17:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/ChangeLog,v 1.42 2010/06/05 13:57:03 ssuominen Exp $ + + 05 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> + filelight-1.9_rc3.ebuild, +files/filelight-1.9_rc3-gcc45.patch: + Fix building with GCC 4.5+ wrt #321357 by Gef Lebster. 06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> filelight-1.9_rc3.ebuild: diff --git a/kde-misc/filelight/filelight-1.9_rc3.ebuild b/kde-misc/filelight/filelight-1.9_rc3.ebuild index 2d071cbeb89a..a671d10f6c0d 100644 --- a/kde-misc/filelight/filelight-1.9_rc3.ebuild +++ b/kde-misc/filelight/filelight-1.9_rc3.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/filelight-1.9_rc3.ebuild,v 1.6 2010/03/06 09:17:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/filelight-1.9_rc3.ebuild,v 1.7 2010/06/05 13:57:03 ssuominen Exp $ EAPI=2 KMNAME="playground/utils" -KDE_MINIMAL=4.2 inherit kde4-base @@ -23,6 +22,8 @@ RDEPEND="x11-apps/xdpyinfo" S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}/${P}-gcc45.patch" ) + src_prepare() { sed -i \ -e '/qimageblitz/d' \ diff --git a/kde-misc/filelight/files/filelight-1.9_rc3-gcc45.patch b/kde-misc/filelight/files/filelight-1.9_rc3-gcc45.patch new file mode 100644 index 000000000000..3471cb350cf6 --- /dev/null +++ b/kde-misc/filelight/files/filelight-1.9_rc3-gcc45.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/321357 + +--- src/app/mainWindow.cpp ++++ src/app/mainWindow.cpp +@@ -222,7 +222,7 @@ + + inline bool MainWindow::slotScanPath(const QString &path) + { +- return slotScanUrl(KUrl::KUrl(path)); ++ return slotScanUrl(KUrl(path)); + } + + bool MainWindow::slotScanUrl(const KUrl &url) +--- src/part/radialMap/widget.cpp ++++ src/part/radialMap/widget.cpp +@@ -64,7 +64,7 @@ + KUrl + RadialMap::Widget::url(File const * const file) const + { +- return KUrl::KUrl(file ? file->fullPath() : m_tree->fullPath()); ++ return KUrl(file ? file->fullPath() : m_tree->fullPath()); + } + + void |