[gentoo-commits] repo/gentoo:master commit in: x11-themes/qtcurve/files/

[Tobias Klausmann]

commit:     1ebced79f91ceeffd3f879c94cececc713ce00f1
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 17:48:51 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 17:48:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ebced79

x11-themes/qtcurve: Fix broken isnan patch

Gentoo-Bug: 593472

 .../qtcurve/files/qtcurve-1.8.18-std_isnan.patch   | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch 
b/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch
index ae78995..bd7f722 100644
--- a/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch
+++ b/x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch
@@ -1,22 +1,31 @@
-Index: qtcurve-1.8.18/lib/utils/color.h
-===================================================================
---- qtcurve-1.8.18.orig/lib/utils/color.h
-+++ qtcurve-1.8.18/lib/utils/color.h
-@@ -250,7 +250,7 @@ qtcColorTint(const QColor *base, const Q
+diff --git a/lib/utils/color.h.orig b/lib/utils/color.h
+index 2c7081f..37d83b5 100644
+--- a/lib/utils/color.h.orig
++++ b/lib/utils/color.h
+@@ -23,6 +23,8 @@
+ #ifndef QTC_UTILS_COLOR_H
+ #define QTC_UTILS_COLOR_H
+ 
++#include <math.h>
++
+ #include "utils.h"
+ #include "options.h"
+ 
+@@ -250,7 +252,7 @@ qtcColorTint(const QColor *base, const QColor *col, double 
amount)
          return *base;
      } else if (amount >= 1.0) {
          return *col;
 -    } else if (isnan(amount)) {
-+    } else if (std::isnan(amount)) {
++    } else if (isnan(amount)) {
          return *base;
      }
      const QtcColor qtc_base = {base->redF(), base->greenF(), base->blueF()};
-@@ -267,7 +267,7 @@ qtcColorMix(const QColor *c1, const QCol
+@@ -267,7 +269,7 @@ qtcColorMix(const QColor *c1, const QColor *c2, double 
bias)
          return *c1;
      } else if (bias >= 1.0) {
          return *c2;
 -    } else if (isnan(bias)) {
-+    } else if (std::isnan(bias)) {
++    } else if (isnan(bias)) {
          return *c1;
      }
      const QtcColor qtc_c1 = {c1->redF(), c1->greenF(), c1->blueF()};