forked from mirrors/nixpkgs
Make filelight compile with gcc-4.5
svn path=/nixpkgs/branches/stdenv-updates/; revision=25313
This commit is contained in:
parent
35fe5dadb1
commit
302d783310
pkgs/applications/misc/filelight
|
@ -7,6 +7,7 @@ stdenv.mkDerivation {
|
||||||
url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz;
|
url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz;
|
||||||
sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq";
|
sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq";
|
||||||
};
|
};
|
||||||
|
patches = [ ./gcc45.diff ];
|
||||||
buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon
|
buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon
|
||||||
qimageblitz ];
|
qimageblitz ];
|
||||||
meta = {
|
meta = {
|
||||||
|
|
26
pkgs/applications/misc/filelight/gcc45.diff
Normal file
26
pkgs/applications/misc/filelight/gcc45.diff
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
|
||||||
|
index 68ec189..feb0e53 100644
|
||||||
|
--- a/src/app/mainWindow.cpp
|
||||||
|
+++ b/src/app/mainWindow.cpp
|
||||||
|
@@ -222,7 +222,7 @@ inline void MainWindow::slotComboScan()
|
||||||
|
|
||||||
|
inline bool MainWindow::slotScanPath(const QString &path)
|
||||||
|
{
|
||||||
|
- return slotScanUrl(KUrl::KUrl(path));
|
||||||
|
+ return slotScanUrl(KUrl(path));
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MainWindow::slotScanUrl(const KUrl &url)
|
||||||
|
diff --git a/src/part/radialMap/widget.cpp b/src/part/radialMap/widget.cpp
|
||||||
|
index d48a673..762f74e 100644
|
||||||
|
--- a/src/part/radialMap/widget.cpp
|
||||||
|
+++ b/src/part/radialMap/widget.cpp
|
||||||
|
@@ -64,7 +64,7 @@ RadialMap::Widget::path() const
|
||||||
|
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
|
Loading…
Reference in a new issue