[digikam] update patch to something that actually works
Rex Dieter
rdieter at fedoraproject.org
Fri Feb 4 16:09:22 UTC 2011
commit 9fa0930b8f377669186d17d3d6f0147cdb3b5a6a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Feb 4 10:08:41 2011 -0600
update patch to something that actually works
digikam-1.8.0-gcc46.patch | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/digikam-1.8.0-gcc46.patch b/digikam-1.8.0-gcc46.patch
index 9d82245..5de5746 100644
--- a/digikam-1.8.0-gcc46.patch
+++ b/digikam-1.8.0-gcc46.patch
@@ -1,14 +1,14 @@
diff -up digikam-1.8.0/libs/threads/dynamicthread.cpp.gcc46 digikam-1.8.0/libs/threads/dynamicthread.cpp
--- digikam-1.8.0/libs/threads/dynamicthread.cpp.gcc46 2011-01-23 13:27:56.000000000 -0600
-+++ digikam-1.8.0/libs/threads/dynamicthread.cpp 2011-02-04 09:10:10.461384295 -0600
++++ digikam-1.8.0/libs/threads/dynamicthread.cpp 2011-02-04 10:05:11.969447213 -0600
@@ -257,6 +257,12 @@ bool DynamicThread::DynamicThreadPriv::t
kDebug() << "Transition to Running: Invalid Inactive state" << q;
return false;
}
+ // fix gcc-4.6 failure -- error: control reaches end of non-void function [-Werror=return-type]
-+ case default:
++ default:
+ {
-+ kDebug() << "libs/threads/dynanamicthread.cpp : Should never reach here: assert?"
++ kDebug() << "libs/threads/dynanamicthread.cpp : Should never reach here: assert?" << q;
+ return false;
+ }
}
More information about the scm-commits
mailing list