rev 20146 - in kde-extras/kwave/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2015-12-13 08:18:56 +0000 (Sun, 13 Dec 2015)
New Revision: 20146

Added:
   kde-extras/kwave/trunk/debian/patches/upstream_compile-fix-for-armv7l.patch
Modified:
   kde-extras/kwave/trunk/debian/changelog
   kde-extras/kwave/trunk/debian/patches/series
Log:
fix a double vs float mismatch in sonagram plugin

backport part of upstream commit 90f6e432e06e9ec1480a24b37f5ffe5dec4f75fc
to fix build on arm* architectures


Modified: kde-extras/kwave/trunk/debian/changelog
===================================================================
--- kde-extras/kwave/trunk/debian/changelog	2015-12-13 08:15:00 UTC (rev 20145)
+++ kde-extras/kwave/trunk/debian/changelog	2015-12-13 08:18:56 UTC (rev 20146)
@@ -1,5 +1,9 @@
 kwave (0.9.0-1-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport part of upstream commit 90f6e432e06e9ec1480a24b37f5ffe5dec4f75fc
+    to fix a double vs float mismatch in sonagram plugin (fixing build on arm*
+    architectures); patch upstream_compile-fix-for-armv7l.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 13 Dec 2015 09:14:31 +0100
 

Modified: kde-extras/kwave/trunk/debian/patches/series
===================================================================
--- kde-extras/kwave/trunk/debian/patches/series	2015-12-13 08:15:00 UTC (rev 20145)
+++ kde-extras/kwave/trunk/debian/patches/series	2015-12-13 08:18:56 UTC (rev 20146)
@@ -1,3 +1,4 @@
 07-no-rpath
 upstream_fix-for-cmake-issues-with-l10n-fix-for-policy-CMP005.patch
 cmake-verbose.diff
+upstream_compile-fix-for-armv7l.patch

Added: kde-extras/kwave/trunk/debian/patches/upstream_compile-fix-for-armv7l.patch
===================================================================
--- kde-extras/kwave/trunk/debian/patches/upstream_compile-fix-for-armv7l.patch	                        (rev 0)
+++ kde-extras/kwave/trunk/debian/patches/upstream_compile-fix-for-armv7l.patch	2015-12-13 08:18:56 UTC (rev 20146)
@@ -0,0 +1,27 @@
+From 90f6e432e06e9ec1480a24b37f5ffe5dec4f75fc Mon Sep 17 00:00:00 2001
+From: Thomas Eschenbacher <Thomas.Eschenbacher at gmx.de>
+Date: Sun, 5 Jul 2015 09:19:26 +0200
+Subject: [PATCH] compile fix for armv7l
+
+---
+ CHANGES                             | 3 +++
+ plugins/sonagram/SonagramPlugin.cpp | 5 +----
+ plugins/sonagram/SonagramPlugin.h   | 3 +++
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/sonagram/SonagramPlugin.cpp b/plugins/sonagram/SonagramPlugin.cpp
+index 63d76f7..b7dd520 100644
+--- a/plugins/sonagram/SonagramPlugin.cpp
++++ b/plugins/sonagram/SonagramPlugin.cpp
+@@ -429,7 +429,7 @@ void Kwave::SonagramPlugin::calculateSlice(Kwave::SonagramPlugin::Slice *slice)
+ 	double ima = slice->m_output[j][1];
+ 	double a = ((rea * rea) + (ima * ima)) / scale;
+ 
+-	slice->m_result[j] = static_cast<unsigned char>(qMin(a, qreal(254.0)));
++	slice->m_result[j] = static_cast<unsigned char>(qMin(a, double(254.0)));
+     }
+ 
+     // free the allocated FFT resources
+-- 
+2.6.2
+