Author: urkud
Date: Tue Dec 28 18:47:57 2010
New Revision: 25313
URL: https://svn.nixos.org/websvn/nix/?rev=25313&sc=1
Log:
Make filelight compile with gcc-4.5
Added:
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/filelight/gcc45.diff
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/filelight/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/filelight/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/filelight/default.nix
Tue Dec 28 18:47:41 2010 (r25312)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/filelight/default.nix
Tue Dec 28 18:47:57 2010 (r25313)
@@ -7,6 +7,7 @@
url =
http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz;
sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq";
};
+ patches = [ ./gcc45.diff ];
buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon
qimageblitz ];
meta = {
Added:
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/filelight/gcc45.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/applications/misc/filelight/gcc45.diff
Tue Dec 28 18:47:57 2010 (r25313)
@@ -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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
