summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klausmann <klausman@gentoo.org>2016-09-19 19:48:51 +0200
committerTobias Klausmann <klausman@gentoo.org>2016-09-19 19:48:51 +0200
commit1ebced79f91ceeffd3f879c94cececc713ce00f1 (patch)
treef86777bc4b73dbf67f01401570228edd369029b9 /x11-themes/qtcurve
parentnet-analyzer/munin: revbump for bug 594294 (diff)
downloadgentoo-1ebced79f91ceeffd3f879c94cececc713ce00f1.tar.gz
gentoo-1ebced79f91ceeffd3f879c94cececc713ce00f1.tar.bz2
gentoo-1ebced79f91ceeffd3f879c94cececc713ce00f1.zip
x11-themes/qtcurve: Fix broken isnan patch
Gentoo-Bug: 593472
Diffstat (limited to 'x11-themes/qtcurve')
-rw-r--r--x11-themes/qtcurve/files/qtcurve-1.8.18-std_isnan.patch25
1 files 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 ae78995d46fb..bd7f7223a4bd 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()};