summaryrefslogtreecommitdiffstats
path: root/kde/patch/kstars
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-07-31 16:13:18 +0200
committer Eric Hameleers <alien@slackware.com>2020-07-31 16:13:18 +0200
commit703149752c6265b36973d2c1f0f5a69721e3128a (patch)
tree7ded0d801771d5705f48ffbfb48f37dd4829439e /kde/patch/kstars
parentdd005500c624d127321ff3fe14a0c29bfa8d67f7 (diff)
parentcd7ff1719433fbb3b6a8304596be173bc1b91b00 (diff)
downloadktown-master.tar.gz
ktown-master.tar.xz
Merge branch 'elogind'HEADmaster
Diffstat (limited to 'kde/patch/kstars')
-rw-r--r--kde/patch/kstars/kstars_isnan.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/kde/patch/kstars/kstars_isnan.patch b/kde/patch/kstars/kstars_isnan.patch
deleted file mode 100644
index 1c4aef3..0000000
--- a/kde/patch/kstars/kstars_isnan.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Christian Dersch <lupinix@mailbox.org>
-Date: Wed, 03 Feb 2016 10:19:55 +0000
-Subject: Fix compilation with gcc 6.x (namespace std has to be used explicitly in some cases, e.g. when ambiguous)
-X-Git-Url: http://quickgit.kde.org/?p=kstars.git&a=commitdiff&h=7d34e52f4dd6e15b871596b3c64d4c7cdba599b4
----
-Fix compilation with gcc 6.x (namespace std has to be used explicitly in some cases, e.g. when ambiguous)
-REVIEW:126976
----
-
-
---- a/kstars/fitsviewer/fitsdata.cpp
-+++ b/kstars/fitsviewer/fitsdata.cpp
-@@ -548,7 +548,7 @@
- int diff_x=s1->x - s2->x;
- int diff_y=s1->y - s2->y;
-
-- dis = abs( sqrt( diff_x*diff_x + diff_y*diff_y));
-+ dis = std::abs( sqrt( diff_x*diff_x + diff_y*diff_y));
- dis -= s1->width/2;
- dis -= s2->width/2;
-
-
---- a/kstars/tools/horizonmanager.cpp
-+++ b/kstars/tools/horizonmanager.cpp
-@@ -192,7 +192,7 @@
- az = dms::fromString(regionItem->child(i, 1)->data(Qt::DisplayRole).toString(), true);
- alt = dms::fromString(regionItem->child(i, 2)->data(Qt::DisplayRole).toString(), true);
-
-- if (isnan(az.Degrees()) || isnan(alt.Degrees()))
-+ if (std::isnan(az.Degrees()) || std::isnan(alt.Degrees()))
- return false;
-
- p.setAz(az);
-@@ -534,9 +534,9 @@
- dms azAngle = dms::fromString(parent->child(item->row(),1)->data(Qt::DisplayRole).toString(), true);
- dms altAngle = dms::fromString(parent->child(item->row(),2)->data(Qt::DisplayRole).toString(), true);
-
-- if (isnan(azAngle.Degrees()))
-+ if (std::isnan(azAngle.Degrees()))
- azOK = false;
-- if (isnan(altAngle.Degrees()))
-+ if (std::isnan(altAngle.Degrees()))
- altOK = false;
-
- if ( (item->column() == 1 && azOK == false) || (item->column() == 2 && altOK == false) )
-