[SCM] kstars packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.12.3-0ubuntu2

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kstars.git;a=commitdiff;h=a0e4c24

The following commit has been merged in the kubuntu_xenial_archive branch:
commit a0e4c2428e7a0baccba1102fc693d25510bd97c0
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Fri Apr 15 08:04:20 2016 -0700

    upstream patch
---
 debian/changelog                              |  7 ++++
 debian/patches/series                         |  2 ++
 debian/patches/upstream_fix_isnan_libc6.patch | 49 +++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d7e0c4a..e439d77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kstars (4:15.12.3-0ubuntu2) xenial; urgency=medium
+
+  * Add upstream patch to fix isnan against new libc6. 
+  * Release to archive.
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 15 Apr 2016 08:02:41 -0700
+
 kstars (4:15.12.3-0ubuntu1) xenial; urgency=medium
 
   * New upstream bugfix release
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d256145
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+upstream_fix_isnan_libc6.patch
+
diff --git a/debian/patches/upstream_fix_isnan_libc6.patch b/debian/patches/upstream_fix_isnan_libc6.patch
new file mode 100644
index 0000000..d794589
--- /dev/null
+++ b/debian/patches/upstream_fix_isnan_libc6.patch
@@ -0,0 +1,49 @@
+From 7d34e52f4dd6e15b871596b3c64d4c7cdba599b4 Mon Sep 17 00:00:00 2001
+From: Christian Dersch <lupinix at mailbox.org>
+Date: Wed, 3 Feb 2016 13:19:55 +0300
+Subject: [PATCH] Fix compilation with gcc 6.x (namespace std has to be used
+ explicitly in some cases, e.g. when ambiguous) REVIEW:126976
+
+---
+ kstars/fitsviewer/fitsdata.cpp  | 2 +-
+ kstars/tools/horizonmanager.cpp | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/kstars/fitsviewer/fitsdata.cpp b/kstars/fitsviewer/fitsdata.cpp
+index e1cb0a2..ab5d1ab 100644
+--- a/kstars/fitsviewer/fitsdata.cpp
++++ b/kstars/fitsviewer/fitsdata.cpp
+@@ -548,7 +548,7 @@ bool FITSData::checkCollision(Edge* s1, Edge*s2)
+     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;
+ 
+diff --git a/kstars/tools/horizonmanager.cpp b/kstars/tools/horizonmanager.cpp
+index f441147..c7af4ad 100644
+--- a/kstars/tools/horizonmanager.cpp
++++ b/kstars/tools/horizonmanager.cpp
+@@ -192,7 +192,7 @@ bool HorizonManager::validatePolygon(int regionID)
+         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 @@ void HorizonManager::verifyItemValue(QStandardItem *item)
+         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) )

-- 
kstars packaging