[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-52-g13c0bc4

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit faab129e532d896ad0d95f59b431f0a0a33f00a2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Oct 31 14:57:49 2016 +0100

    Drop Fix-compilation-on-ARM-when-building-against-Qt-4.patch
---
 debian/changelog                                   |  2 ++
 ...ilation-on-ARM-when-building-against-Qt-4.patch | 28 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e452c4a..888cd88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gammaray (2.6.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop Fix-compilation-on-ARM-when-building-against-Qt-4.patch
+    - applied upstream.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 31 Oct 2016 14:53:18 +0100
 
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
deleted file mode 100644
index 8aec748..0000000
--- a/debian/patches/Fix-compilation-on-ARM-when-building-against-Qt-4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 037f94b..da34771 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ 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