gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 18:47:16 -08:00
Code Issues Projects Releases Wiki Activity

kde-misc/kcollectd: Fix building with gcc-6 (bug #613174)

Browse Source 
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4247
This commit is contained in:
Peter Levine
2017-03-20 00:11:56 +01:00
committed by Andreas Sturmlechner
parent 5b2854f81c
commit 7e7ffe5d30
2 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch
+52
View File
@@ -0,0 +1,52 @@
Description: fix FTBFS with gcc-6
Author: Logan Rosen <logan@ubuntu.com>
Acked-By: Mattia Rizzolo <mattia@debian.org>
Bug-Debian: https://bugs.debian.org/831129
Last-Update: 2016-10-10
--- a/kcollectd/graph.cc
+++ b/kcollectd/graph.cc
@@ -564,9 +564,9 @@
paint.setPen(Qt::NoPen);
paint.setBrush(QBrush(color_minmax[color_nr++ % 8]));
for(int i=0; i<size; ++i) {
- while (i<size && (isnan(min_data[i]) || isnan(max_data[i]))) ++i;
+ while (i<size && (std::isnan(min_data[i]) || std::isnan(max_data[i]))) ++i;
int l = i;
- while (i<size && !isnan(min_data[i]) && !isnan(max_data[i])) ++i;
+ while (i<size && !std::isnan(min_data[i]) && !std::isnan(max_data[i])) ++i;
const int asize = i-l;
points.resize(asize*2);
int k;
@@ -597,9 +597,9 @@
if (!avg_data.empty()) {
paint.setPen(color_line[color_nr++ % 8]);
for(int i=0; i<size; ++i) {
- while (i<size && isnan(avg_data[i])) ++i;
+ while (i<size && std::isnan(avg_data[i])) ++i;
int l = i;
- while (i<size && !isnan(avg_data[i])) ++i;
+ while (i<size && !std::isnan(avg_data[i])) ++i;
const int asize = i-l;
points.resize(asize);
for(int k=0; k<asize; ++k, ++l) {
--- a/kcollectd/misc.cc
+++ b/kcollectd/misc.cc
@@ -119,7 +119,7 @@
// process avg_data
if (!avg_data.empty()) {
for(std::size_t i=0; i<size; ++i) {
- if (isnan(avg_data[i])) continue;
+ if (std::isnan(avg_data[i])) continue;
valid = true;
if (min > avg_data[i]) min = avg_data[i];
if (max < avg_data[i]) max = avg_data[i];
@@ -129,7 +129,7 @@
// process min/max-data
if (!min_data.empty() && !max_data.empty()) {
for(std::size_t i=0; i<size; ++i) {
- if (isnan(min_data[i]) || isnan(max_data[i])) continue;
+ if (std::isnan(min_data[i]) || std::isnan(max_data[i])) continue;
valid = true;
if (min > min_data[i]) min = min_data[i];
if (max < min_data[i]) max = min_data[i];
kde-misc/kcollectd/kcollectd-0.9-r1.ebuild
+2 -1
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -23,4 +23,5 @@ PATCHES=(
"${FILESDIR}/${P}-boost.patch"
"${FILESDIR}/${P}-cflags.patch"
"${FILESDIR}/${P}-desktop.patch"
"${FILESDIR}/${P}-gcc6.patch"
)