From nobody Sun Apr 24 12:23:43 2022 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 83CDC1997360; Sun, 24 Apr 2022 12:23:43 +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 4KmS3z3HQ6z4kCT; Sun, 24 Apr 2022 12:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650803023; 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=45aWV+bS/UihfM9N1ENSRT7YLZw7d7humDX8Vlr/wIg=; b=lc4DzL+oq4un9MFO8CNwAs2xVBMcl9gg5/SLl+CxDE37bR0acfQzMT46QdpCRPktTXRxBI iqLIXUQUX0CJUKiIes7BlX8Hp2WgWBEQezPDwdchFW91/aiBxznFW67GGGooAaz5glyOwR /vgoWJ/Fu/CXPkHNMXlIcAb2bPhUCvkpzOgrLpb+9QiYm07J3vlAWah8Nm9T7yj0WES13d CsbCG0MiilT/EA2wO1beX9tqBtzikCsKFbwOkJ108ZrGG8pLiobWlFl8ICOgQASkr2NT6o zpyWMrIxXWRyDC2IHrGoqVllAUB6s5vnqVCF807cGtOJ0uyDamRIm+PYUgOtpQ== 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 46385261A6; Sun, 24 Apr 2022 12:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23OCNhgr029276; Sun, 24 Apr 2022 12:23:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23OCNhjs029275; Sun, 24 Apr 2022 12:23:43 GMT (envelope-from git) Date: Sun, 24 Apr 2022 12:23:43 GMT Message-Id: <202204241223.23OCNhjs029275@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: 94253f444259 - main - science/scidavis: Update to 2.9.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: 94253f4442598128eb0d27ae175b05312d2a7f42 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650803023; 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=45aWV+bS/UihfM9N1ENSRT7YLZw7d7humDX8Vlr/wIg=; b=qiguLXh9Cz+BGG8E+RPlk8D99/5y+KFTqDIhXibBzxjAjYvVriwTkM6JRJ6TyMS8fySSqW 8WY/kdOmly7hTTfysoKV7gzoo1MCcWmo46sdeTPCFPZbsYX4Xz3pZIylknEEusM7BZViRQ P5TFNWTJG4J7Pw3NcmcHcIt4ZoxXJFScLwfr7rO5AprL4V+nkWH3cINXrUj8sT0PBpZ6ip 5yu6IuRww43JRoMS9QBKbKL5iL67ad7pZs3atM1dNt5UxJwo9UMPHk1dFlxZeZfYfHPxiC xqPSISw5d3pam5C74n8Ix7w6z0fmrzurcGZiUr7ox7u1amFzCpu/yg0wfXiNvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650803023; a=rsa-sha256; cv=none; b=FTHBGzGsUZh83Rcj10wD23YgQ8j04cw6HsdgL9ZEIIqClNE73TjYSD+Nnlj6a2UgoUzwWg FngrKthXf4FYCpLw11+WzdU07eQx5dDg4nIxTkbPPwNoirZdTJXAM9tggUuOsfqy5L/FjN peNsTmVebsrFZsoHjp7yBGpCCXppqCWooPVKQT+uzVAynhJvghqUi6jr4/pqxhEpO7UWD6 MjNuMa91JYTmDtqPCCi/lzJoOcHNopPPUVBKpGDPN+bU/theVw7e7UJh8diLsMoaYKCuWa sOMqIzmOyc1gECYagDpUaV5ke/247TnjXgRVXeRiGf4A1pRLfFHx8AhX5NUaFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=94253f4442598128eb0d27ae175b05312d2a7f42 commit 94253f4442598128eb0d27ae175b05312d2a7f42 Author: Max Brazhnikov AuthorDate: 2022-04-24 12:23:10 +0000 Commit: Max Brazhnikov CommitDate: 2022-04-24 12:23:10 +0000 science/scidavis: Update to 2.9.2 --- science/scidavis/Makefile | 3 +-- science/scidavis/distinfo | 6 +++--- science/scidavis/files/patch-3rdparty_CMakeLists.txt | 11 +++++++++++ science/scidavis/files/patch-CMakeLists.txt | 16 ++++++++++++++++ .../files/patch-libscidavis_src_ApplicationWindow.cpp | 8 ++++---- science/scidavis/files/patch-scidavis_CMakeLists.txt | 18 +++++++++++++----- science/scidavis/pkg-plist | 3 +-- 7 files changed, 49 insertions(+), 16 deletions(-) diff --git a/science/scidavis/Makefile b/science/scidavis/Makefile index e35eae6cb63e..3f42d78e468c 100644 --- a/science/scidavis/Makefile +++ b/science/scidavis/Makefile @@ -1,6 +1,5 @@ PORTNAME= scidavis -PORTVERSION= 2.7 -PORTREVISION= 1 +PORTVERSION= 2.9.2 CATEGORIES= science MAINTAINER= makc@FreeBSD.org diff --git a/science/scidavis/distinfo b/science/scidavis/distinfo index 1d604ea404ad..6a7549054d8a 100644 --- a/science/scidavis/distinfo +++ b/science/scidavis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644054781 -SHA256 (highperformancecoder-scidavis-2.7_GH0.tar.gz) = 9ecf8f2a68b2f230e39446576a37b12f86055ce09efcfa77df9d7e4039c66800 -SIZE (highperformancecoder-scidavis-2.7_GH0.tar.gz) = 9123402 +TIMESTAMP = 1650794322 +SHA256 (highperformancecoder-scidavis-2.9.2_GH0.tar.gz) = 2b4eb49a442e2f8cb676d7d01ec485008310f0a1ca24f5352f0c1fc78480c8f4 +SIZE (highperformancecoder-scidavis-2.9.2_GH0.tar.gz) = 9348640 diff --git a/science/scidavis/files/patch-3rdparty_CMakeLists.txt b/science/scidavis/files/patch-3rdparty_CMakeLists.txt new file mode 100644 index 000000000000..6bdc5f6ba16d --- /dev/null +++ b/science/scidavis/files/patch-3rdparty_CMakeLists.txt @@ -0,0 +1,11 @@ +--- 3rdparty/CMakeLists.txt.orig 2022-04-16 07:39:19 UTC ++++ 3rdparty/CMakeLists.txt +@@ -47,7 +47,7 @@ option( BUILD_QWTPLOT3D "Build QwtPlot3D using own cod + + if( NOT BUILD_QWTPLOT3D ) + find_library ( QWTPLOT3D_LIBRARY +- NAMES qwtplot3d ++ NAMES qwtplot3d qwtplot3d-qt5 + HINTS ${QT_LIBRARY_DIR} + ) + if( NOT QWTPLOT3D_LIBRARY ) diff --git a/science/scidavis/files/patch-CMakeLists.txt b/science/scidavis/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..8f1c1c3d7326 --- /dev/null +++ b/science/scidavis/files/patch-CMakeLists.txt @@ -0,0 +1,16 @@ +--- CMakeLists.txt.orig 2022-04-16 07:39:19 UTC ++++ CMakeLists.txt +@@ -1,5 +1,4 @@ + cmake_minimum_required( VERSION 3.16 ) +-include(GNUInstallDirs) + + # Target platform is Windows 10 + if( CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017" OR +@@ -14,6 +13,7 @@ project( scidavis + DESCRIPTION "SciDAVis is a free application for Scientific Data Analysis and Visualization." + HOMEPAGE_URL "https://scidavis.sourceforge.net" + LANGUAGES CXX C) ++include(GNUInstallDirs) + + set( CMAKE_CXX_STANDARD 17) + set( CMAKE_CXX_STANDARD_REQUIRED TRUE ) diff --git a/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp b/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp index 1f5e4682f973..b98124edb0f3 100644 --- a/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp +++ b/science/scidavis/files/patch-libscidavis_src_ApplicationWindow.cpp @@ -1,6 +1,6 @@ ---- libscidavis/src/ApplicationWindow.cpp.orig 2021-05-05 01:51:49 UTC +--- libscidavis/src/ApplicationWindow.cpp.orig 2022-04-16 07:39:19 UTC +++ libscidavis/src/ApplicationWindow.cpp -@@ -4200,7 +4200,7 @@ void ApplicationWindow::readSettings() +@@ -4201,7 +4201,7 @@ void ApplicationWindow::readSettings() settings.endGroup(); // Colors settings.beginGroup("/Paths"); @@ -9,7 +9,7 @@ helpFilePath = settings.value("/HelpFile", "").toString(); #ifdef PLUGIN_PATH QString defaultFitPluginsPath = PLUGIN_PATH; -@@ -8062,6 +8062,10 @@ void ApplicationWindow::showWindowTitleBarMenu() +@@ -8063,6 +8063,10 @@ void ApplicationWindow::showWindowTitleBarMenu() void ApplicationWindow::chooseHelpFolder() { // TODO: move all paths & location handling to anothor class @@ -20,7 +20,7 @@ #if defined(Q_OS_WIN) const QString locateDefaultHelp = qApp->applicationDirPath() + QDir::toNativeSeparators("/manual/index.html"); -@@ -8069,6 +8073,8 @@ void ApplicationWindow::chooseHelpFolder() +@@ -8070,6 +8074,8 @@ void ApplicationWindow::chooseHelpFolder() const QString locateDefaultHelp = QDir::toNativeSeparators("/usr/share/doc/scidavis/manual/index.html"); #endif diff --git a/science/scidavis/files/patch-scidavis_CMakeLists.txt b/science/scidavis/files/patch-scidavis_CMakeLists.txt index b3dc6db30676..56e9e3a5e3fd 100644 --- a/science/scidavis/files/patch-scidavis_CMakeLists.txt +++ b/science/scidavis/files/patch-scidavis_CMakeLists.txt @@ -1,11 +1,19 @@ ---- scidavis/CMakeLists.txt.orig 2021-05-05 01:51:49 UTC +--- scidavis/CMakeLists.txt.orig 2022-04-16 07:39:19 UTC +++ scidavis/CMakeLists.txt -@@ -135,7 +135,7 @@ if (NOT CMAKE_CROSS_COMPILING) +@@ -36,7 +36,6 @@ add_executable( scidavis + message(${QM_FILES}) + + # SciDAVis expects qm files to be in the translations directory. qt5_create_translation puts them somewhere else +-add_custom_command(TARGET scidavis COMMAND cp ${QM_FILES} translations) + + target_link_libraries( scidavis libscidavis ) + +@@ -146,7 +145,7 @@ endif() if( MULTI_CONFIG ) - install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$/scidavisrc.pyc DESTINATION etc ) + install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$/scidavisrc.pyc DESTINATION ${PYTHON_SCRIPTDIR} ) else() -- install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/scidavisrc.pyc DESTINATION etc ) -+ install( FILES scidavisrc.py DESTINATION etc ) +- install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/scidavisrc.pyc DESTINATION ${PYTHON_SCRIPTDIR} ) ++ install( FILES scidavisrc.py DESTINATION ${PYTHON_SCRIPTDIR} ) endif() install( FILES scidavisUtil.py DESTINATION share/scidavis ) endif() diff --git a/science/scidavis/pkg-plist b/science/scidavis/pkg-plist index 9f1aa93ac47a..fc3eae4fb4a5 100644 --- a/science/scidavis/pkg-plist +++ b/science/scidavis/pkg-plist @@ -5,7 +5,6 @@ lib/scidavis/plugins/libexplin.so lib/scidavis/plugins/libfitRational0.so lib/scidavis/plugins/libfitRational1.so lib/scidavis/plugins/libplanck_wavelength.so -share/appdata/scidavis.appdata.xml share/applications/scidavis.desktop %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md %%PORTDOCS%%%%DOCSDIR%%/README.md @@ -22,6 +21,7 @@ share/icons/locolor/16x16/apps/scidavis.png share/icons/locolor/22x22/apps/scidavis.png share/icons/locolor/32x32/apps/scidavis.png share/man/man1/scidavis.1.gz +share/metainfo/scidavis.appdata.xml share/mime/packages/scidavis.xml share/mimelnk/application/x-sciprj.desktop %%PYTHON%%%%DATADIR%%/scidavisUtil.py @@ -34,6 +34,5 @@ share/mimelnk/application/x-sciprj.desktop %%NLS%%%%DATADIR%%/translations/scidavis_pl.qm %%NLS%%%%DATADIR%%/translations/scidavis_pt-br.qm %%NLS%%%%DATADIR%%/translations/scidavis_ru.qm -%%NLS%%%%DATADIR%%/translations/scidavis_sv.qm %%NLS%%%%DATADIR%%/translations/scidavis_zh-cn.qm %%NLS%%%%DATADIR%%/translations/scidavis_zh-tw.qm