SHA256
1
0
forked from pool/krusader
krusader/fix-build-with-gcc48.patch
Luca Beltrame d536cf785d Accepting request 495111 from home:wolfi323:branches:KDE:Extra
- Update to 2.6.0
- Add fix-build-with-gcc48.patch to fix build on Leap 42
- Add org.kde.krusader.root-mode.desktop, it got removed in 2.6.0

OBS-URL: https://build.opensuse.org/request/show/495111
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krusader?expand=0&rev=23
2017-05-16 20:14:34 +00:00

41 lines
1.7 KiB
Diff

From 846658caafc012d9706d0c6517195fcdb95c2f9a Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sun, 7 May 2017 22:42:57 +0200
Subject: Fix build with gcc 4.8
When trying to build krusader 2.6.0 with gcc 4.8, I got this error
message:
/home/abuild/rpmbuild/BUILD/krusader-2.6.0/krusader/FileSystem/sizecalculator.cpp:
In member function 'void SizeCalculator::slotStatResult(KJob*)':
/home/abuild/rpmbuild/BUILD/krusader-2.6.0/krusader/FileSystem/sizecalculator.cpp:139:98:
error: no matching function for call to
'SizeCalculator::connect(QPointer<KIO::DirectorySizeJob>&, void
(KJob::*)(KJob*, KJob::QPrivateSignal), SizeCalculator* const, void
(SizeCalculator::*)(KJob*))'
connect(m_directorySizeJob, &KIO::Job::result, this,
&SizeCalculator::slotDirectorySizeResult);
^
This patch fixes the problem.
Differential Revision: https://phabricator.kde.org/D5714
---
krusader/FileSystem/sizecalculator.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/krusader/FileSystem/sizecalculator.cpp b/krusader/FileSystem/sizecalculator.cpp
index aabe63d..eeb050f 100644
--- a/krusader/FileSystem/sizecalculator.cpp
+++ b/krusader/FileSystem/sizecalculator.cpp
@@ -151,7 +151,7 @@ void SizeCalculator::slotStatResult(KJob *job)
m_totalDirs++;
m_directorySizeJob = KIO::directorySize(url);
- connect(m_directorySizeJob, &KIO::Job::result, this, &SizeCalculator::slotDirectorySizeResult);
+ connect(m_directorySizeJob.data(), &KIO::Job::result, this, &SizeCalculator::slotDirectorySizeResult);
}
void SizeCalculator::slotDirectorySizeResult(KJob *)
--
cgit v0.11.2