From d0a5eb02d2822879e62e59c272f545bb601daa5a Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 21 Apr 2022 19:21:59 +0200 Subject: sci-visualization/scidavis: add 2.8 Signed-off-by: Andrew Ammerlaan --- sci-visualization/scidavis/Manifest | 1 + .../files/scidavis-2.8-fix-buildfailure.patch | 68 ++++++++++++++ sci-visualization/scidavis/scidavis-2.8.ebuild | 104 +++++++++++++++++++++ 3 files changed, 173 insertions(+) create mode 100644 sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch create mode 100644 sci-visualization/scidavis/scidavis-2.8.ebuild (limited to 'sci-visualization/scidavis') diff --git a/sci-visualization/scidavis/Manifest b/sci-visualization/scidavis/Manifest index f2ebad33c866..aa0153baaf57 100644 --- a/sci-visualization/scidavis/Manifest +++ b/sci-visualization/scidavis/Manifest @@ -1 +1,2 @@ DIST scidavis-2.7.tar.gz 11765155 BLAKE2B 10e218472893cd19fe3fb6ebef0116c37167b10b1535e6d39b3eb0f6e2f9a537a75c8da5648dae41b77add089d57cafea640d0c7f4dca459c5a9ef2cc24bff18 SHA512 8063d9f5fb29f824e0183d8902dfe9a8310b6041664ac2189765953088968136f3d72fd04f667d8dfce0ede16e17593e3351f5593d70e73705f1b737bf90b4de +DIST scidavis-2.8.tar.gz 12796976 BLAKE2B a1774f89235c9a6f49c20a45bec64e914b71c80afb54ca3e8b71151fa660a6da75c6dd914e42932bbe1b2a9abffaee045b3542ecc30ddb2824f5c4c5ccdf5da4 SHA512 3250846cd4cd320aa765d564ef07de10ccba0621b89e033b5b6092850c5eae4ca30b47eca392b67540e7757cbd497909a8cabd09bf44791543a809087f199c21 diff --git a/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch b/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch new file mode 100644 index 000000000000..779fb803cebb --- /dev/null +++ b/sci-visualization/scidavis/files/scidavis-2.8-fix-buildfailure.patch @@ -0,0 +1,68 @@ +diff --git a/scidavis/CMakeLists.txt b/scidavis/CMakeLists.txt +index 9484a87..d177a55 100644 +--- a/scidavis/CMakeLists.txt ++++ b/scidavis/CMakeLists.txt +@@ -8,35 +8,35 @@ if( WIN32 ) + endif() + + # Translation Files +-#file( COPY translations DESTINATION . ) +-#set( TS_FILES +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_de.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_es.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_fr.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ru.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ja.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_sv.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pt-br.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs-alt.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pl.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-cn.ts" +-# "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-tw.ts" +-# ) ++file( COPY translations DESTINATION . ) + set( TS_FILES +- "translations/scidavis_de.ts" +- "translations/scidavis_es.ts" +- "translations/scidavis_fr.ts" +- "translations/scidavis_ru.ts" +- "translations/scidavis_ja.ts" +- "translations/scidavis_sv.ts" +- "translations/scidavis_pt-br.ts" +- "translations/scidavis_cs.ts" +- "translations/scidavis_cs-alt.ts" +- "translations/scidavis_pl.ts" +- "translations/scidavis_zh-cn.ts" +- "translations/scidavis_zh-tw.ts" +- ) ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_de.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_es.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_fr.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ru.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_ja.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_sv.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pt-br.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_cs-alt.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_pl.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-cn.ts" ++ "${CMAKE_CURRENT_BINARY_DIR}/translations/scidavis_zh-tw.ts" ++ ) ++#set( TS_FILES ++ #"translations/scidavis_de.ts" ++ #"translations/scidavis_es.ts" ++ #"translations/scidavis_fr.ts" ++ #"translations/scidavis_ru.ts" ++ #"translations/scidavis_ja.ts" ++ #"translations/scidavis_sv.ts" ++ #"translations/scidavis_pt-br.ts" ++ #"translations/scidavis_cs.ts" ++ #"translations/scidavis_cs-alt.ts" ++ #"translations/scidavis_pl.ts" ++ #"translations/scidavis_zh-cn.ts" ++ #"translations/scidavis_zh-tw.ts" ++ #) + + qt5_create_translation( QM_FILES "${CMAKE_SOURCE_DIR}/libscidavis" ${TS_FILES} ) + diff --git a/sci-visualization/scidavis/scidavis-2.8.ebuild b/sci-visualization/scidavis/scidavis-2.8.ebuild new file mode 100644 index 000000000000..2a99b10ff17f --- /dev/null +++ b/sci-visualization/scidavis/scidavis-2.8.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="media-gfx/graphviz" + +PYTHON_COMPAT=( python3_{8..10} ) + +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" + +LICENSE="GPL-2+ ZLIB" +KEYWORDS="~amd64" +SLOT="0" + +IUSE="doc origin python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# requires network +RESTRICT="test" +PROPERTIES="test_network" + +RDEPEND=" + dev-cpp/muParser + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sci-libs/gsl:= + sys-libs/zlib[minizip] + x11-libs/qwt:5 + x11-libs/qwtplot3d + origin? ( sci-libs/liborigin ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/PyQt5-5.15.6[${PYTHON_USEDEP}] + dev-python/PyQt5-sip[${PYTHON_USEDEP}] + >=dev-python/sip-6:5[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/linguist-tools:5 + test? ( + dev-libs/unittest++ + dev-cpp/gtest + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.7-install-locations.patch" + "${FILESDIR}/${PN}-2.7-find-qwtplot3d.patch" + "${FILESDIR}/${PN}-2.7-fix-build-if-sip4-installed.patch" + "${FILESDIR}/${P}-fix-buildfailure.patch" +) + +src_prepare() { + cmake_src_prepare + + # Remove things which are packaged elsewhere + rm -r 3rdparty/qwt5-qt5 3rdparty/qwtplot3d 3rdparty/liborigin || die + + # OF has been renamed in Gentoo https://bugs.gentoo.org/383179 + # Note this is *not* packaged in sys-libs/zlib[minizip] because + # this file resides in the test directory in upstream zlib + sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die +} + +src_configure() { + local mycmakeargs=( + # 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 +} + +src_compile() { + cmake_src_compile + docs_compile +} + +src_test() { + virtx cmake_src_test +} -- cgit v1.2.3-65-gdbad