[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-42-g5743462

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=5743462

The following commit has been merged in the master branch:
commit 5743462c0fca58c31705aba84170df7105dbfbca
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jul 28 07:52:20 2016 +0200

    Fix FTBFS on armel and armhf
---
 debian/changelog                                   |  1 +
 ...ilation-on-ARM-when-building-against-Qt-4.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d046ccb..a7bdca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gammaray (2.5.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Fix FTBFS on armel and armhf.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 28 Jul 2016 07:29:38 +0200
 
diff --git a/debian/patches/Fix-compilation-on-ARM-when-building-against-Qt-4.patch b/debian/patches/Fix-compilation-on-ARM-when-building-against-Qt-4.patch
new file mode 100644
index 0000000..8aec748
--- /dev/null
+++ b/debian/patches/Fix-compilation-on-ARM-when-building-against-Qt-4.patch
@@ -0,0 +1,28 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 28 Jul 2016 07:38:07 +0200
+Subject: Fix compilation on ARM when building against Qt 4
+
+  error: no matching function for call to 'qBound(qreal, double, qreal)'
+  note: deduced conflicting types for parameter 'const T' ('float' and 'double')
+
+It was happening because qreal 'is a typedef for float for performance reasons'
+on ARM in Qt 4.
+---
+ ui/tools/metaobjectbrowser/metaobjecttreeclientproxymodel.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ui/tools/metaobjectbrowser/metaobjecttreeclientproxymodel.cpp b/ui/tools/metaobjectbrowser/metaobjecttreeclientproxymodel.cpp
+index f3d6317..4999228 100644
+--- a/ui/tools/metaobjectbrowser/metaobjecttreeclientproxymodel.cpp
++++ b/ui/tools/metaobjectbrowser/metaobjecttreeclientproxymodel.cpp
+@@ -57,8 +57,8 @@ static const int GRADIENT_SCALE_FACTOR = 4;
+ 
+ static QColor colorForRatio(double ratio)
+ {
+-    const auto red = qBound(qreal(0.0), ratio * GRADIENT_SCALE_FACTOR, qreal(0.5));
+-    const auto green = qBound(qreal(0.0), 1 - ratio * GRADIENT_SCALE_FACTOR, qreal(0.5));
++    const auto red = qBound<qreal>(0.0, ratio * GRADIENT_SCALE_FACTOR, 0.5);
++    const auto green = qBound<qreal>(0.0, 1 - ratio * GRADIENT_SCALE_FACTOR, 0.5);
+     auto color = QColor(255 * red, 255 * green, 0);
+     if (QApplication::palette().color(QPalette::Base).lightness() > 128)
+         return color.lighter(300);
diff --git a/debian/patches/series b/debian/patches/series
index da34771..037f94b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ debian-archs-fix-build.patch
 fix-objectvisualizer-build.patch
 disable-qt4-objectvisualizer.patch
 disable-qt4-webinspector.patch
+Fix-compilation-on-ARM-when-building-against-Qt-4.patch

-- 
gammaray packaging