From nobody Sat Nov 4 19:43:17 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SN7M96rQTz50MQ7; Sat, 4 Nov 2023 19:43:17 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SN7M96QYNz4Jc0; Sat, 4 Nov 2023 19:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699126997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=peT10vMStv8LdRoN8s6yO3ovQl9x0+PZ7WncZYV8/8w=; b=uxZHbw7p/8X7YtpTTzvEwQXUbQUEI6urCLHxeK1hBWXPlgCuD0dl6R5v0C0nvUCt2KHI5e 38kCdGv1U01q6iYUwlnxPaHW89AMzPzQjJlrg2gpJtMSTEne6KvtZLRa0OI9BDzTlP+cyO aDd2UsUmKKUH63a+dcK+Xo5z7LopYSAzQjc7Wt/zIUSueK0AIWuDFa3HNIQhyXBylxdkBf PoppC5+NqhPqe5CxhAkVY0ryORJzAcmni7WYded4itfqKLvG/CsgmnugJ9HZP+nxHYZNh3 RLb4Ud3+KjpRAZKadZ4iEcDpwYLwDYBx+snWP2jLRyYZCZwpJkTKjXq7DFs0iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699126997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=peT10vMStv8LdRoN8s6yO3ovQl9x0+PZ7WncZYV8/8w=; b=bA6R9qZll0jaCbMB+buxMBsIdxS0d4FRE+lY6O6fcgt+2D6s0umZNNuY/Y++85zN9uvgVl KF4VtvGzwoo/nKSYSjGtK44TooYqo/hwNlga8RDR9Np1BAUdduyvud2GMgCsNFTDvQbSld YfbWFruzmmNh+fm5aGQbXOQZDVIQvVnA0zf94AHqGLlWX0VfCAk0VM6DhNmum7komMZDt4 E3s35d0Iie4PtUl0JFRX2YpOK/3ZphCzSbuZuP7prM0yycb4xFULWylOOhYD2Nc9NuUosW 7vyD2CuuebPGMAnn8ha58rCVucsJw0g8wd7KgyCWcxTi75P0gXFyEHkIFcmPFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699126997; a=rsa-sha256; cv=none; b=t3/wlYtAZNwajCmH2tkSUPxqzoVVjRl64Pb3nfLHBmHyGdyqEMKxFoPJfjggrPLbAcp95h 8AG7ChDQkUf1yyeHGZqP9VH73DlpAXN99i8I8dbPOr/kwQcE9nKK+P0M/mdRyvsvrgTo20 d/xa2SZmkNMvCSVKS6BSopshJ2iiTaJTrkLnu/SgJuCQyO70gDDG84iRPbpaaZZFKlBMdl T12EL/5gGQrx2YgUDgPcyoy+/sCEnvrHNEiKcMSoCK8VqnW1fqSnwPWtLBXNWu8UP1JzBO OQixkapSPSwy2Rb9+HxN//KwwObfAN3jjABKUvSq4Ubl5/JPjMLafe8/izT9zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SN7M95VxJz18sK; Sat, 4 Nov 2023 19:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A4JhHQD054035; Sat, 4 Nov 2023 19:43:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A4JhHOp054032; Sat, 4 Nov 2023 19:43:17 GMT (envelope-from git) Date: Sat, 4 Nov 2023 19:43:17 GMT Message-Id: <202311041943.3A4JhHOp054032@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 557980aaf022 - main - science/scidavis: fix build with liborigin 3.0.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 557980aaf022deb0ade0e56383a76bdc452d04be Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=557980aaf022deb0ade0e56383a76bdc452d04be commit 557980aaf022deb0ade0e56383a76bdc452d04be Author: Max Brazhnikov AuthorDate: 2023-11-04 19:41:19 +0000 Commit: Max Brazhnikov CommitDate: 2023-11-04 19:41:50 +0000 science/scidavis: fix build with liborigin 3.0.2 Add patches from upstream. --- science/scidavis/Makefile | 2 +- science/scidavis/files/patch-git_94695c59fb | 17 ++++++ science/scidavis/files/patch-git_afca5696c4 | 81 +++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) diff --git a/science/scidavis/Makefile b/science/scidavis/Makefile index 22436a17478d..3f63c8977c3a 100644 --- a/science/scidavis/Makefile +++ b/science/scidavis/Makefile @@ -1,6 +1,6 @@ PORTNAME= scidavis PORTVERSION= 2.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MAINTAINER= makc@FreeBSD.org diff --git a/science/scidavis/files/patch-git_94695c59fb b/science/scidavis/files/patch-git_94695c59fb new file mode 100644 index 000000000000..acfd0d7b0673 --- /dev/null +++ b/science/scidavis/files/patch-git_94695c59fb @@ -0,0 +1,17 @@ +From 94695c59fb6e14a3d19edd9382436fe9999a763d Mon Sep 17 00:00:00 2001 +From: Miquel Garriga +Date: Sat, 14 May 2022 10:53:43 +0200 +Subject: [PATCH] Fix bug #427: Color Change in Plot Details + +--- libscidavis/src/PlotDialog.cpp ++++ libscidavis/src/PlotDialog.cpp +@@ -1549,7 +1549,9 @@ void PlotDialog::setActiveCurve(CurveTreeItem *item) + style = 6; + boxConnect->setCurrentIndex(style); + ++ penWidget->blockSignals(true); + penWidget->setPen(c->pen()); ++ penWidget->blockSignals(false); + fillGroupBox->blockSignals(true); + fillGroupBox->setChecked(c->brush().style() != Qt::NoBrush); + fillGroupBox->blockSignals(false); diff --git a/science/scidavis/files/patch-git_afca5696c4 b/science/scidavis/files/patch-git_afca5696c4 new file mode 100644 index 000000000000..401d2e52b07c --- /dev/null +++ b/science/scidavis/files/patch-git_afca5696c4 @@ -0,0 +1,81 @@ +From afca5696c4f477dcae4a0484dad2d7314884f020 Mon Sep 17 00:00:00 2001 +From: alxpl +Date: Tue, 1 Aug 2023 13:43:09 +0200 +Subject: [PATCH] specify namespace to which functions belong + +This should take care of issue [#30](https://github.com/SciDAVis/scidavis/issues/30). + +--- libscidavis/src/importOPJ.cpp ++++ libscidavis/src/importOPJ.cpp +@@ -323,7 +323,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe + } + case Origin::Text: + table->column(j)->setColumnMode(SciDAVis::ColumnMode::Text); +- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) { ++ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) { + scidavis_column->setTextAt(i, column.data[i].as_string()); + } + break; +@@ -379,7 +379,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe + default: + format = "dd.MM.yyyy"; + } +- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) ++ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) + scidavis_column->setValueAt(i, column.data[i].as_double()); + table->column(j)->setColumnMode(SciDAVis::ColumnMode::DateTime); + DateTime2StringFilter *filter = +@@ -423,7 +423,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe + format = "hh:mm:ss.zzz"; + break; + } +- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) ++ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) + scidavis_column->setValueAt(i, column.data[i].as_double()); + table->column(j)->setColumnMode(SciDAVis::ColumnMode::DateTime); + DateTime2StringFilter *filter = +@@ -443,7 +443,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe + format = "M"; + break; + } +- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) ++ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) + scidavis_column->setValueAt(i, column.data[i].as_double()); + table->column(j)->setColumnMode(SciDAVis::ColumnMode::Month); + DateTime2StringFilter *filter = +@@ -463,7 +463,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe + format = "d"; + break; + } +- for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) ++ for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) + scidavis_column->setValueAt(i, column.data[i].as_double()); + table->column(j)->setColumnMode(SciDAVis::ColumnMode::Day); + DateTime2StringFilter *filter = +@@ -554,7 +554,7 @@ bool ImportOPJ::importTables(const OriginFile &opj) + #endif + QVector values; + values.resize(rowCount * columnCount); +- for (int i = 0; i < min((int)values.size(), (int)layer.data.size()); i++) { ++ for (int i = 0; i < std::min((int)values.size(), (int)layer.data.size()); i++) { + values[i] = layer.data[i]; + } + Matrix->setCells(values); +@@ -1006,7 +1006,7 @@ bool ImportOPJ::importGraphs(const OriginFile &opj) + grid->enableZeroLineX(0); + grid->enableZeroLineY(0); + +- vector formats; ++ std::vector formats; + formats.push_back(layer.yAxis.formatAxis[0]); // left + formats.push_back(layer.yAxis.formatAxis[1]); // right + formats.push_back(layer.xAxis.formatAxis[0]); // bottom +@@ -1014,7 +1014,7 @@ bool ImportOPJ::importGraphs(const OriginFile &opj) + graph->setXAxisTitle(parseOriginText(decodeMbcs(formats[2].label.text.c_str()))); + graph->setYAxisTitle(parseOriginText(decodeMbcs(formats[0].label.text.c_str()))); + +- vector ticks; ++ std::vector ticks; + ticks.push_back(layer.yAxis.tickAxis[0]); // left + ticks.push_back(layer.yAxis.tickAxis[1]); // right + ticks.push_back(layer.xAxis.tickAxis[0]); // bottom