From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86CDA139696 for ; Sun, 19 Mar 2017 23:12:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F00021C08F; Sun, 19 Mar 2017 23:12:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5CE3B21C08F for ; Sun, 19 Mar 2017 23:12:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC9F333FE7D for ; Sun, 19 Mar 2017 23:12:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4ED646E19 for ; Sun, 19 Mar 2017 23:12:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1489965116.7e7ffe5d302c447dfbdf02bcce2dda8debbc4542.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kcollectd/files/, kde-misc/kcollectd/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch kde-misc/kcollectd/kcollectd-0.9-r1.ebuild X-VCS-Directories: kde-misc/kcollectd/files/ kde-misc/kcollectd/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7e7ffe5d302c447dfbdf02bcce2dda8debbc4542 X-VCS-Branch: master Date: Sun, 19 Mar 2017 23:12:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f9ca4b09-d3d2-45bd-b6e9-76872551963f X-Archives-Hash: 1ee3ab0ca81e083e5a3bb948b867e0e7 commit: 7e7ffe5d302c447dfbdf02bcce2dda8debbc4542 Author: Peter Levine gmail com> AuthorDate: Sun Mar 19 21:26:59 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 19 23:11:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7ffe5d kde-misc/kcollectd: Fix building with gcc-6 (bug #613174) Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4247 kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch | 52 +++++++++++++++++++++++ kde-misc/kcollectd/kcollectd-0.9-r1.ebuild | 3 +- 2 files changed, 54 insertions(+), 1 deletion(-) 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 00000000000..bcf28d0a318 --- /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 +Acked-By: Mattia Rizzolo +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 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 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 index 5e6837e8a65..4e654e720a6 100644 --- a/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild +++ b/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild @@ -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" )