diff options
Diffstat (limited to 'sci-visualization/scidavis')
-rw-r--r-- | sci-visualization/scidavis/Manifest | 8 | ||||
-rw-r--r-- | sci-visualization/scidavis/files/scidavis-muparser.patch | 61 | ||||
-rw-r--r-- | sci-visualization/scidavis/files/scidavis-qwtplot3d.patch | 15 | ||||
-rw-r--r-- | sci-visualization/scidavis/metadata.xml | 1 | ||||
-rw-r--r-- | sci-visualization/scidavis/scidavis-2.9.0.ebuild (renamed from sci-visualization/scidavis/scidavis-2.7.ebuild) | 24 |
5 files changed, 16 insertions, 93 deletions
diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest index ab5b4711e6af..352a9ca28ba9 100644 --- a/sci-visualization/scidavis/Manifest +++ b/sci-visualization/scidavis/Manifest @@ -1,5 +1,3 @@ -AUX scidavis-muparser.patch 2299 BLAKE2B 9ba9e99c838c4fe8c767b8cbfdb9ce93202a8d539039993552a6da2590a28b7acd27f891b6e251ee9bb063a0010d52fa419807ab2a515e633ebd32ea8179877d SHA512 44841cac0f111687ffe38e322c8fb25139f5529321eb4609a8a7821e0ee3bba832f61fe9f6b0e42f28f4571898468de83274d36bbdfc57c97ed227426244c103 -AUX scidavis-qwtplot3d.patch 453 BLAKE2B 774cae5c148944cb4c0a85965431031296b9f846b1154620e39cca0c6ec4ba8645e84bfccbcca051334f11ba301f3aa1bb6a4d6110cec57dc9cb881fd4fa0d85 SHA512 95a778670c8540a150e52317a95f8ff8211bc0cdaf10280f84bf2c5365f7b803cd56b46760a56db75ba29289ebf53abf9d803d0bb78cf55c0426059bb994b584 -DIST scidavis-2.7.tar.gz 11765155 BLAKE2B 10e218472893cd19fe3fb6ebef0116c37167b10b1535e6d39b3eb0f6e2f9a537a75c8da5648dae41b77add089d57cafea640d0c7f4dca459c5a9ef2cc24bff18 SHA512 8063d9f5fb29f824e0183d8902dfe9a8310b6041664ac2189765953088968136f3d72fd04f667d8dfce0ede16e17593e3351f5593d70e73705f1b737bf90b4de -EBUILD scidavis-2.7.ebuild 2104 BLAKE2B c342b5e17575d5e2cb3f583c67d35c814b47dc5ef87d7648fc8078436205ec8b1ecd2db06de26cd20cfe3ae6b31abeb3fc044daddec3b746181d2a5c3da7b751 SHA512 d98a5bf780411ca6601162c6652a6af5058b265a70ba0261120df7420e6b7605d5d47c86b005ef528fcfcf0684ce02ee2593e907b04e6e5b19f3c32c46f59b0f -MISC metadata.xml 1085 BLAKE2B e02c4b1a7fa0eecbdb26db3cd577a06591b557678e91598c5e84a4dfec87c215e5758ca67a438331bef33265b6a0f1441141b6711b05c7e496f7e5feebca9954 SHA512 e33807092bd789cdc11819a0d56d9d39fcb7065d870d47ef1f20254e75f6f85a299ca4fe9c3dae50c53a90d9fe730cb9062c8b0cf8e09c4a46e449bff655181a +DIST scidavis-2.9.0.tar.gz 9348738 BLAKE2B 70af736e0cbe62ffc4b8cc828fffe819b91245f01fa1dc089d1a225ba943495b947562aac84829b8b92664ffbe6e31ecc8f6d9b685adb144c4b21e619739c00e SHA512 3058b11e7864a646c31e5576ac4ebb3e30bcc08f382ee1798183935482236890bbd1090c8e2272c28b54e2498a42dfed801f17fc4c0aca83264ab76f4a7fb7ba +EBUILD scidavis-2.9.0.ebuild 2194 BLAKE2B 26f47f34bada5d5eb7bb4e88b2d4f75d74fa676b47e5db06aebe8992bb2d8fba2e2d63cb762c280a7155ea2f0ffa7b2155cfb13ebac921f5a4e048036f213718 SHA512 61233cd82c78fe8c1bbc0eff85c6b938208ada616f47f053c34f89a9fa2fee807fcf13c03310d1400ae79ab83d8251b220136eae2680939c176416538cc9fe4d +MISC metadata.xml 1016 BLAKE2B 77c5f9c2df96f624091439ef5390a25142cd88b940a4376d8b9051e80dbc44b7d196421f2b73d6021615f3e5579106e36da6e94613c631d4e41bf4decb67eb28 SHA512 8238b9c89915f7a8a4644db5ae63b9221401794e53ad6357f5d35ab303e3d0ddf84cf5b616bfa736f78f1b94974af3a9b55bc5eaece6302f82b7e68f608ec00a diff --git a/sci-visualization/scidavis/files/scidavis-muparser.patch b/sci-visualization/scidavis/files/scidavis-muparser.patch deleted file mode 100644 index 1b8c994bc74e..000000000000 --- a/sci-visualization/scidavis/files/scidavis-muparser.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1b75dcc..f6c730a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,5 @@ - cmake_minimum_required( VERSION 3.16 ) -+include(GNUInstallDirs) - - # Target platform is Windows 10 - if( CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017" OR -@@ -115,6 +116,7 @@ find_package( ZLIB "1.2.11" REQUIRED ) - find_package( OpenGL COMPONENTS OpenGL REQUIRED ) - - # muParser -+if( SCRIPTING_MUPARSER ) - find_library( MUPARSER_LIB - NAMES muparser - REQUIRED -@@ -124,6 +126,7 @@ find_path( MUPARSER_INCLUDE_DIR - REQUIRED - ) - message( STATUS "Found muParser : ${MUPARSER_LIB} include: ${MUPARSER_INCLUDE_DIR}" ) -+endif() - - add_subdirectory( 3rdparty ) - -@@ -149,7 +152,7 @@ set( DOC_FILES - if( WIN32 ) - install( FILES ${DOC_FILES} DESTINATION . ) - else() -- install( FILES ${DOC_FILES} DESTINATION share/doc/scidavis ) -+ install( FILES ${DOC_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR} ) - endif() - - if( MSVC ) -diff --git a/scidavis/CMakeLists.txt b/scidavis/CMakeLists.txt -index cc68d4d..fb6da42 100644 ---- a/scidavis/CMakeLists.txt -+++ b/scidavis/CMakeLists.txt -@@ -127,15 +127,18 @@ if (NOT CMAKE_CROSS_COMPILING) - install( FILES scidavis.desktop DESTINATION share/applications ) - install( FILES scidavis.xml DESTINATION share/mime/packages ) - install( FILES scidavis.1 DESTINATION share/man/man1 ) -- install( FILES scidavis.appdata.xml DESTINATION share/appdata ) -+ install( FILES scidavis.appdata.xml DESTINATION share/metainfo ) - install( FILES x-sciprj.desktop DESTINATION share/mimelnk/application ) - endif() - - if( SCRIPTING_PYTHON ) -+ if(NOT PYTHON_SCRIPTDIR) -+ set(PYTHON_SCRIPTDIR etc) -+ endif() - if( MULTI_CONFIG ) -- install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/scidavisrc.pyc DESTINATION etc ) -+ install( FILES scidavisrc.py ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/scidavisrc.pyc DESTINATION ${PYTHON_SCRIPTDIR} ) - else() -- 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} ) - endif() - install( FILES scidavisUtil.py DESTINATION share/scidavis ) - endif() diff --git a/sci-visualization/scidavis/files/scidavis-qwtplot3d.patch b/sci-visualization/scidavis/files/scidavis-qwtplot3d.patch deleted file mode 100644 index 857cca79bd98..000000000000 --- a/sci-visualization/scidavis/files/scidavis-qwtplot3d.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt -index 1b43375..a2bd52c 100644 ---- a/3rdparty/CMakeLists.txt -+++ b/3rdparty/CMakeLists.txt -@@ -46,8 +46,8 @@ endif() - option( BUILD_QWTPLOT3D "Build QwtPlot3D using own code" OFF ) - - if( NOT BUILD_QWTPLOT3D ) -- find_library ( QWTPLOT3D_LIBRARY -- NAMES qwtplot3d-qt5 -+find_library ( QWTPLOT3D_LIBRARY -+ NAMES qwtplot3d - HINTS ${QT_LIBRARY_DIR} - ) - if( NOT QWTPLOT3D_LIBRARY ) diff --git a/sci-visualization/scidavis/metadata.xml b/sci-visualization/scidavis/metadata.xml index 93c583ed2a8f..1c44688f2711 100644 --- a/sci-visualization/scidavis/metadata.xml +++ b/sci-visualization/scidavis/metadata.xml @@ -16,7 +16,6 @@ <use> <flag name="origin">Add support for reading OriginLab OPJ project files through <pkg>sci-libs/liborigin</pkg>.</flag> <flag name="python">Build support for python scripting.</flag> - <flag name="muparser">Build support for muparser scripting.</flag> </use> <upstream> <remote-id type="sourceforge">scidavis</remote-id> diff --git a/sci-visualization/scidavis/scidavis-2.7.ebuild b/sci-visualization/scidavis/scidavis-2.9.0.ebuild index d6d6452d9a35..0487299231ed 100644 --- a/sci-visualization/scidavis/scidavis-2.7.ebuild +++ b/sci-visualization/scidavis/scidavis-2.9.0.ebuild @@ -12,13 +12,13 @@ inherit python-single-r1 cmake docs virtualx xdg DESCRIPTION="Application for Scientific Data Analysis and Visualization" HOMEPAGE="http://scidavis.sourceforge.net/ https://github.com/SciDAVis/scidavis/" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/SciDAVis/scidavis/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+ ZLIB" KEYWORDS="~amd64" SLOT="0" -IUSE="doc +muparser origin python test" +IUSE="doc origin python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # requires network @@ -26,7 +26,7 @@ RESTRICT="test" PROPERTIES="test_network" RDEPEND=" - muparser? ( dev-cpp/muParser ) + dev-cpp/muParser dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -57,11 +57,6 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/${PN}-muparser.patch" - "${FILESDIR}/${PN}-qwtplot3d.patch" -) - src_prepare() { cmake_src_prepare @@ -76,12 +71,19 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DSCRIPTING_MUPARSER=$(usex muparser) - -DSCRIPTING_PYTHON=$(usex python) - -DPYTHON_SCRIPTDIR="$(python_get_scriptdir)" + # Even if we disable muparser scripting, we still need MuParser.h + # for Graph3D.cpp. So just enable it unconditionally. Bug 834074 + -DSCRIPTING_MUPARSER=ON -DORIGIN_IMPORT=$(usex origin) + -DSCRIPTING_PYTHON=$(usex python) -DBUILD_TESTS=$(usex test) ) + + if use python; then + mycmakeargs+=( + -DPYTHON_SCRIPTDIR="$(python_get_scriptdir)" + ) + fi cmake_src_configure } |