commit: 0c5e80dbe1b377c960f5ebaa89ff853001b63f07
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 22:33:55 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 22:33:55 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=0c5e80db
kde-misc/kcollectd: Import 0.9-r1 from before last-rites
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/kcollectd/files/kcollectd-0.9-boost.patch | 42 +++++++++++++++++
.../kcollectd/files/kcollectd-0.9-cflags.patch | 10 +++++
.../kcollectd/files/kcollectd-0.9-desktop.patch | 11 +++++
kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch | 52 ++++++++++++++++++++++
kde-misc/kcollectd/kcollectd-0.9-r1.ebuild | 31 +++++++++++++
kde-misc/kcollectd/metadata.xml | 8 ++++
6 files changed, 154 insertions(+)
diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-boost.patch
b/kde-misc/kcollectd/files/kcollectd-0.9-boost.patch
new file mode 100644
index 00000000..7823ab7d
--- /dev/null
+++ b/kde-misc/kcollectd/files/kcollectd-0.9-boost.patch
@@ -0,0 +1,42 @@
+--- kcollectd-0.9.orig/kcollectd/kcollectd.cc
++++ kcollectd-0.9/kcollectd/kcollectd.cc
+@@ -73,7 +73,7 @@
+ gui->show();
+ }
+ }
+- catch(basic_filesystem_error<path> &e) {
++ catch(const std::exception &e) {
+ KMessageBox::error(0, i18n("Failed to read collectd-structure at \'%1\'\n"
+ "Terminating.", QString(RRD_BASEDIR)));
+ exit(1);
+
+--- kcollectd-0.9.orig/kcollectd/gui.cc
++++ kcollectd-0.9/kcollectd/gui.cc
+@@ -127,21 +127,21 @@
+ const directory_iterator end_itr;
+ for (directory_iterator host(rrdpath); host != end_itr; ++host ) {
+ if (is_directory(*host)) {
+- QTreeWidgetItem *hostitem = mkItem(listview, host->leaf());
++ QTreeWidgetItem *hostitem = mkItem(listview,
host->path().filename().string());
+ hostitem->setFlags(hostitem->flags() & ~Qt::ItemIsSelectable);
+ for (directory_iterator sensor(*host); sensor != end_itr; ++sensor ) {
+ if (is_directory(*sensor)) {
+- QTreeWidgetItem *sensoritem = mkItem(hostitem, sensor->leaf());
++ QTreeWidgetItem *sensoritem = mkItem(hostitem,
sensor->path().filename().string());
+ sensoritem->setFlags(sensoritem->flags() & ~Qt::ItemIsSelectable);
+ for (directory_iterator rrd(*sensor); rrd != end_itr; ++rrd ) {
+ if (is_regular(*rrd) && extension(*rrd) == ".rrd") {
+ QTreeWidgetItem *rrditem = mkItem(sensoritem, basename(*rrd));
+ rrditem->setFlags(rrditem->flags() & ~Qt::ItemIsSelectable);
+ std::ostringstream info;
+- info << host->leaf() << delimiter
+- << sensor->leaf() << delimiter
++ info << host->path().filename().string() << delimiter
++ << sensor->path().filename().string() << delimiter
+ << basename(*rrd);
+- get_datasources(rrd->string(), info.str(), rrditem);
++ get_datasources(rrd->path().string(), info.str(), rrditem);
+ }
+ }
+ }
+
diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch
b/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch
new file mode 100644
index 00000000..702c588d
--- /dev/null
+++ b/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch
@@ -0,0 +1,10 @@
+diff -ruN kcollectd-0.9.orig/kcollectd/CMakeLists.txt
kcollectd-0.9/kcollectd/CMakeLists.txt
+--- kcollectd-0.9.orig/kcollectd/CMakeLists.txt 2009-11-30
22:01:54.000000000 +0100
++++ kcollectd-0.9/kcollectd/CMakeLists.txt 2011-04-24 15:35:21.596229942
+0200
+@@ -1,5 +1,5 @@
+
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAG} ${KDE4_ENABLE_EXCEPTIONS}")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
+ find_package(Boost COMPONENTS filesystem system)
+
diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-desktop.patch
b/kde-misc/kcollectd/files/kcollectd-0.9-desktop.patch
new file mode 100644
index 00000000..d50fdfba
--- /dev/null
+++ b/kde-misc/kcollectd/files/kcollectd-0.9-desktop.patch
@@ -0,0 +1,11 @@
+--- a/kcollectd/kcollectd.desktop
++++ b/kcollectd/kcollectd.desktop
+@@ -5,7 +5,7 @@
+ Terminal=false
+ StartupNotify=true
+ Categories=Qt;KDE;Utility;
+-MimeType=application/x-kcollectd
++MimeType=application/x-kcollectd;
+ Name=KDE collectd database-viewer
+ Name[de]=KDE collectd Datenbankbetrachter
+ GenericName=Collectd viewer
diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch
b/kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch
new file mode 100644
index 00000000..bcf28d0a
--- /dev/null
+++ b/kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch
@@ -0,0 +1,52 @@
+Description: fix FTBFS with gcc-6
+Author: Logan Rosen <lo...@ubuntu.com>
+Acked-By: Mattia Rizzolo <mat...@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];
diff --git a/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild
b/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild
new file mode 100644
index 00000000..d6d385ef
--- /dev/null
+++ b/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde4-base
+
+DESCRIPTION="Simple kdelibs4-based live data viewer for collectd"
+HOMEPAGE="https://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd.html";
+SRC_URI="https://www.forwiss.uni-passau.de/~berberic/Linux/${PN}/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+ dev-libs/boost:=
+ net-analyzer/rrdtool"
+RDEPEND="${DEPEND}
+ || (
+ app-metrics/collectd[collectd_plugins_rrdtool]
+ app-metrics/collectd[collectd_plugins_rrdcached]
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-boost.patch"
+ "${FILESDIR}/${P}-cflags.patch"
+ "${FILESDIR}/${P}-desktop.patch"
+ "${FILESDIR}/${P}-gcc6.patch"
+)
diff --git a/kde-misc/kcollectd/metadata.xml b/kde-misc/kcollectd/metadata.xml
new file mode 100644
index 00000000..2fdbf33d
--- /dev/null
+++ b/kde-misc/kcollectd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <maintainer type="project">
+ <email>k...@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+</pkgmetadata>
