sci-visualization/scidavis: drop 2.7-r1, 2.8

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
This commit is contained in:
Andrew Ammerlaan
2022-05-09 17:49:38 +02:00
parent 73c6860908
commit 5c433da894
7 changed files with 0 additions and 366 deletions

View File

@@ -1,3 +1 @@
DIST scidavis-2.7.tar.gz 11765155 BLAKE2B 10e218472893cd19fe3fb6ebef0116c37167b10b1535e6d39b3eb0f6e2f9a537a75c8da5648dae41b77add089d57cafea640d0c7f4dca459c5a9ef2cc24bff18 SHA512 8063d9f5fb29f824e0183d8902dfe9a8310b6041664ac2189765953088968136f3d72fd04f667d8dfce0ede16e17593e3351f5593d70e73705f1b737bf90b4de
DIST scidavis-2.8.tar.gz 12796976 BLAKE2B a1774f89235c9a6f49c20a45bec64e914b71c80afb54ca3e8b71151fa660a6da75c6dd914e42932bbe1b2a9abffaee045b3542ecc30ddb2824f5c4c5ccdf5da4 SHA512 3250846cd4cd320aa765d564ef07de10ccba0621b89e033b5b6092850c5eae4ca30b47eca392b67540e7757cbd497909a8cabd09bf44791543a809087f199c21
DIST scidavis-2.9.0.tar.gz 9348738 BLAKE2B 70af736e0cbe62ffc4b8cc828fffe819b91245f01fa1dc089d1a225ba943495b947562aac84829b8b92664ffbe6e31ecc8f6d9b685adb144c4b21e619739c00e SHA512 3058b11e7864a646c31e5576ac4ebb3e30bcc08f382ee1798183935482236890bbd1090c8e2272c28b54e2498a42dfed801f17fc4c0aca83264ab76f4a7fb7ba

View File

@@ -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 )

View File

@@ -1,13 +0,0 @@
diff --git a/libscidavis/CMakeLists.txt b/libscidavis/CMakeLists.txt
index 8fc6c4e3..27464ec2 100644
--- a/libscidavis/CMakeLists.txt
+++ b/libscidavis/CMakeLists.txt
@@ -483,7 +483,7 @@ if( SCRIPTING_PYTHON )
set(scidavis_PyQt_HDR ${scidavis_SIP_OUTPUT_DIR}/sipAPIscidavis.h)
if( SIP_VERSION VERSION_GREATER_EQUAL 5 )
set( scidavis_SIP_HDR ${CMAKE_CURRENT_BINARY_DIR}/python/sip.h )
- target_include_directories( libscidavis PUBLIC
+ target_include_directories( libscidavis BEFORE PUBLIC
"${CMAKE_CURRENT_BINARY_DIR}/python"
"${scidavis_SIP_OUTPUT_DIR}"
)

View File

@@ -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()

View File

@@ -1,68 +0,0 @@
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} )

View File

@@ -1,103 +0,0 @@
# 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}/${P}-install-locations.patch"
"${FILESDIR}/${P}-find-qwtplot3d.patch"
"${FILESDIR}/${P}-fix-build-if-sip4-installed.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
}

View File

@@ -1,104 +0,0 @@
# 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
}