From owner-svn-ports-all@freebsd.org Thu Dec 20 08:47:20 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32706133C810; Thu, 20 Dec 2018 08:47:20 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CD4486DC67; Thu, 20 Dec 2018 08:47:19 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BFB19232FF; Thu, 20 Dec 2018 08:47:19 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBK8lJ7X071434; Thu, 20 Dec 2018 08:47:19 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBK8lJ6x071432; Thu, 20 Dec 2018 08:47:19 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201812200847.wBK8lJ6x071432@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Thu, 20 Dec 2018 08:47:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487863 - head/math/qtiplot/files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: head/math/qtiplot/files X-SVN-Commit-Revision: 487863 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CD4486DC67 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Dec 2018 08:47:20 -0000 Author: makc Date: Thu Dec 20 08:47:18 2018 New Revision: 487863 URL: https://svnweb.freebsd.org/changeset/ports/487863 Log: math/qtiplot: - Add patched to fix build with Clang 7 Added: head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp (contents, props changed) head/math/qtiplot/files/patch-qtiplot_src_plot3D_Graph3D.cpp (contents, props changed) Modified: head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp Added: head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/qtiplot/files/patch-qtiplot_src_core_ApplicationWindow.cpp Thu Dec 20 08:47:18 2018 (r487863) @@ -0,0 +1,25 @@ +--- qtiplot/src/core/ApplicationWindow.cpp.orig 2018-12-20 07:24:36 UTC ++++ qtiplot/src/core/ApplicationWindow.cpp +@@ -10933,11 +10933,11 @@ QStringList ApplicationWindow::depending + foreach(Graph *g, layers){ + QStringList onPlot = g->curveNamesList(); + onPlot = onPlot.grep (name,TRUE); +- if (int(onPlot.count()) && plots.contains(w->objectName())<=0) ++ if (onPlot.count() && !plots.contains(w->objectName())) + plots << w->objectName(); + } + }else if (w->isA("Graph3D")){ +- if ((((Graph3D*)w)->formula()).contains(name,TRUE) && plots.contains(w->objectName())<=0) ++ if ((((Graph3D*)w)->formula()).contains(name,TRUE) && !plots.contains(w->objectName())) + plots << w->objectName(); + } + } +@@ -10954,7 +10954,7 @@ QStringList ApplicationWindow::multilaye + for (int j=0; jaddRibbon(t, l[0], l[1], fList[2].toDouble(), fList[3].toDouble(), + fList[4].toDouble(), fList[5].toDouble(), fList[6].toDouble(), fList[7].toDouble()); +- } else if (formula.contains("(Z)",true) > 0){ ++ } else if (formula.contains("(Z)",true)){ + formula.remove("(X)").remove("(Y)").remove("(Z)"); + QStringList l = formula.split(","); + if (l.size() < 3) Modified: head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp ============================================================================== --- head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp Thu Dec 20 08:43:24 2018 (r487862) +++ head/math/qtiplot/files/patch-qtiplot_src_table_Table.cpp Thu Dec 20 08:47:18 2018 (r487863) @@ -16,3 +16,12 @@ Index: qtiplot/qtiplot/src/table/Table.cpp mup->defineVariable("j", (double)col); mup->defineVariable("sr", startRow + 1.0); mup->defineVariable("er", endRow + 1.0); +@@ -1080,7 +1080,7 @@ void Table::setColName(int col, const QS + if (enumerateRight) + newLabel += QString::number(n); + +- if (col_label.contains(newLabel) > 0){ ++ if (col_label.contains(newLabel)){ + if (warn){ + QMessageBox::critical(0, tr("QtiPlot - Error"), + tr("There is already a column called : "+newLabel+" in table "+caption+"!

Please choose another name!"));