From 30ff39d3ba66178e6538767980ba691ba552fb6c Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Sat, 24 Apr 2021 17:56:28 +0200 Subject: [PATCH] Added --- net-voip/calls/calls-0.3.2.ebuild | 63 +++++ sci-astronomy/stellarium/Manifest | 8 + .../stellarium-0.20.2-disable-x86-test.patch | 24 ++ .../stellarium-0.20.3-unbundle-indi.patch | 82 +++++++ ...tellarium-0.20.3-unbundle-qtcompress.patch | 222 ++++++++++++++++++ .../stellarium-0.20.3-unbundle-zlib.patch | 23 ++ .../stellarium/stellarium-0.21.0.ebuild | 135 +++++++++++ 7 files changed, 557 insertions(+) create mode 100644 net-voip/calls/calls-0.3.2.ebuild create mode 100644 sci-astronomy/stellarium/Manifest create mode 100644 sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch create mode 100644 sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch create mode 100644 sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch create mode 100644 sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch create mode 100644 sci-astronomy/stellarium/stellarium-0.21.0.ebuild diff --git a/net-voip/calls/calls-0.3.2.ebuild b/net-voip/calls/calls-0.3.2.ebuild new file mode 100644 index 0000000..a67bda6 --- /dev/null +++ b/net-voip/calls/calls-0.3.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit vala meson gnome2-utils git-r3 xdg + +DESCRIPTION="Phone dialer and call handler" +HOMEPAGE="https://source.puri.sm/Librem5/calls" +#SRC_URI="https://source.puri.sm/Librem5/calls/-/archive/v${PV}/${PN}-v${PV}.tar.gz" +EGIT_REPO_URI="https://source.puri.sm/Librem5/${PN}.git" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +if [[ ${PV} != 9999 ]]; then + #EGIT_COMMIT="tags/v${PV}" + EGIT_COMMIT="436be15f5a28fe042f73d7b7f150886b2e400abd" +else + KEYWORDS="" +fi + +IUSE="+introspection +vala" +REQUIRED_USE="vala? ( introspection )" + +DEPEND=" + dev-libs/feedbackd + >=gui-libs/libhandy-1.0.0 + dev-libs/folks + dev-libs/gom + dev-libs/libpeas + >=net-misc/modemmanager-1.12.0 + >=media-sound/callaudiod-0.0.5 + gnome-extra/evolution-data-server + net-libs/sofia-sip + " +RDEPEND="${DEPEND}" +BDEPEND=" + vala? ( $(vala_depend) ) + dev-util/meson + dev-libs/gobject-introspection + dev-util/wayland-scanner +" + +#S="${WORKDIR}/${PN}-v${PV}" + +src_prepare() { + default + eapply_user + use vala && vala_src_prepare +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest new file mode 100644 index 0000000..ac7a4e1 --- /dev/null +++ b/sci-astronomy/stellarium/Manifest @@ -0,0 +1,8 @@ +DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb +DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0 +DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977 +DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3 +DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4 +DIST stellarium-0.21.0.tar.gz 353736120 BLAKE2B e031cce8dbbaf622d451da9219bfae3b36135a8d2f9b8047e2f2c4256804fcc1953c53131bcde7260294e909a949b9010b383da6ebe36611f79342e1c162f7c7 SHA512 79844758f96a013759673b3f88bc13cd16613a57998ee69ae5627827f1a2de26c3c63e3bc1a55b572f6443a7e706951d96f32ab6ba0b37afe2a8274ae980083c +DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e167f7f2dece00d82890c6605b6e5305e6c5be02bcce463c4a34ba3f9ee52f42c35b0a416a93b91361fdd9ce3c24f9bcb4be038f9 SHA512 0de88e559cc26c484edb0eb9d3dd33b4faf9a0e3579dc5ebfbcba70cc39a4e052248c159ace29c9a69027c8c121a832d510459d523b2e05bb0620556d2a49935 +DIST stellarium_user_guide-0.21.0-1.pdf 31132367 BLAKE2B d353b9160d7261c410aaa90b3f79955f03ca8453f44249fcec772cb435d4f909fbedeac940afc2f2728008a8c75b366232d943b4dc72698aec95f3ce3b0af38e SHA512 254fe13219b7be5604db28553bbfabb4aaf8c4b82a58a9854806352e25ba7cd419ac8ebbafec92553ccdb499aa6700fb6d7a8537484c12c8314084287a70290d diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch b/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch new file mode 100644 index 0000000..27674eb --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch @@ -0,0 +1,24 @@ +Disable broken tests on x86 + +https://github.com/Stellarium/stellarium/issues/1153 + +--- a/src/tests/testConversions.cpp 2020-08-09 23:29:34.794246024 +0100 ++++ b/src/tests/testConversions.cpp 2020-08-09 23:30:30.441851564 +0100 +@@ -942,6 +942,7 @@ void TestConversions::testVec3fToHtmlCol + } + void TestConversions::testVec3dToHtmlColor() + { ++ return; + QVariantList data; + + data << "#FFFFFF" << 1. << 1. << 1.; +--- a/src/tests/testStelSphereGeometry.cpp 2020-08-09 23:32:43.940770728 +0100 ++++ b/src/tests/testStelSphereGeometry.cpp 2020-08-09 23:33:06.671154228 +0100 +@@ -309,6 +309,7 @@ void TestStelSphericalGeometry::testEnla + + void TestStelSphericalGeometry::testSphericalPolygon() + { ++ return; + SphericalRegionP holySquare2 = bigSquare.getSubtraction(smallSquare); + + QCOMPARE(holySquare2->getArea(), holySquare.getArea()); diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch new file mode 100644 index 0000000..33d355f --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch @@ -0,0 +1,82 @@ +diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt +index a250e1bb0f..f14007c392 100644 +--- a/plugins/TelescopeControl/src/INDI/CMakeLists.txt ++++ b/plugins/TelescopeControl/src/INDI/CMakeLists.txt +@@ -25,7 +25,7 @@ add_library(TelescopeControl_INDI STATIC + target_link_libraries(TelescopeControl_INDI + Qt5::Core + Qt5::Network +- indiclient ++ -lindiclient + TelescopeControl_common + ${CMAKE_THREAD_LIBS_INIT} + ) +diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp +index f401dc7049..d890d3aa14 100644 +--- a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp ++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp +@@ -25,9 +25,9 @@ + #include + #include + +-#include "indibase/baseclient.h" +-#include "indibase/basedevice.h" +-#include "indibase/inditelescope.h" ++#include "libindi/baseclient.h" ++#include "libindi/basedevice.h" ++#include "libindi/inditelescope.h" + + const int INDIConnection::SLEW_STOP = INDI::Telescope::SLEW_GUIDE - 1; + +diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp +index 111ad2cdba..80ead01137 100644 +--- a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp ++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp +@@ -20,7 +20,7 @@ + #define INDICONNECTION_HPP + + #include +-#include "indibase/baseclient.h" ++#include "libindi/baseclient.h" + + #include + #include +diff --git a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp +index 6bd7754ff5..633d4ae7b2 100644 +--- a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp ++++ b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp +@@ -24,7 +24,7 @@ + + #include "StelCore.hpp" + #include "StelUtils.hpp" +-#include "indibase/inditelescope.h" ++#include "libindi/inditelescope.h" + #include "INDIControlWidget.hpp" + + TelescopeClientINDI::TelescopeClientINDI(const QString &name, const QString ¶ms): +diff --git a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp +index 6c1a281ec5..ca7b7e0c40 100644 +--- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp ++++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp +@@ -22,7 +22,7 @@ + #include + + #include "INDIConnection.hpp" +-#include "indibase/basedevice.h" ++#include "libindi/basedevice.h" + + void TestINDIConnection::deafultCoordinates() + { +diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt +index 6fcf7678da..a59d8c121c 100644 +--- a/src/external/CMakeLists.txt ++++ b/src/external/CMakeLists.txt +@@ -176,7 +176,7 @@ target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel) + set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external") + + ################################# INDI ################################ +-IF(USE_PLUGIN_TELESCOPECONTROL) ++IF(USE_PLUGIN_TELESCOPECONTROL AND 0) + set(INDI_SOVERSION "1") + set(CMAKE_INDI_VERSION_MAJOR 1) + set(CMAKE_INDI_VERSION_MINOR 6) diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch new file mode 100644 index 0000000..64b19a5 --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch @@ -0,0 +1,222 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1b72c2c8f6..9436bc66da 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -629,5 +629,6 @@ ELSE() + ENDIF() + ++find_package(Qt5Compress REQUIRED) + + ########### Set some global variables ########### + IF(UNIX AND NOT WIN32) +diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt +index 8e3138adf2..b59049767d 100644 +--- a/plugins/Satellites/src/CMakeLists.txt ++++ b/plugins/Satellites/src/CMakeLists.txt +@@ -55,7 +55,7 @@ IF(ENABLE_TESTING) + ENDIF(ENABLE_TESTING) + + ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H}) +-TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets) ++TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress) + # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it. + SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites") + IF(MSVC) +diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp +index 7432f4316d..f4f4453661 100644 +--- a/plugins/Satellites/src/Satellites.cpp ++++ b/plugins/Satellites/src/Satellites.cpp +@@ -43,7 +43,7 @@ + #include "StelUtils.hpp" + #include "StelActionMgr.hpp" + +-#include "external/qtcompress/qzipreader.h" ++#include "qzipreader.h" + + #include + #include +@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply) + QString archive = zip.fileName(); + QByteArray data; + +- Stel::QZipReader reader(archive); +- if (reader.status() != Stel::QZipReader::NoError) ++ QZipReader reader(archive); ++ if (reader.status() != QZipReader::NoError) + qWarning() << "[Satellites] Unable to open as a ZIP archive"; + else + { +- QList infoList = reader.fileInfoList(); ++ QList infoList = reader.fileInfoList(); + for (const auto& info : infoList) + { + // qWarning() << "[Satellites] Processing:" << info.filePath; +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index bdd214729f..81631ce8ec 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL) + CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) + ENDIF() + +-SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) ++SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) + IF(ENABLE_LIBGPS) + SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY}) + ENDIF() +diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp +index 8da2070b26..9949252cee 100644 +--- a/src/core/modules/LandscapeMgr.cpp ++++ b/src/core/modules/LandscapeMgr.cpp +@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const + } + QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes")); + +- Stel::QZipReader reader(sourceFilePath); +- if (reader.status() != Stel::QZipReader::NoError) ++ QZipReader reader(sourceFilePath); ++ if (reader.status() != QZipReader::NoError) + { + qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath); + emit errorNotArchive(); +@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const + + //Detect top directory + QString topDir, iniPath; +- QList infoList = reader.fileInfoList(); ++ QList infoList = reader.fileInfoList(); + for (const auto& info : infoList) + { + QFileInfo fileInfo(info.filePath); +diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt +index 1e0e7e2b32..834aff89cb 100644 +--- a/src/external/CMakeLists.txt ++++ b/src/external/CMakeLists.txt +@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib) + set_target_properties(zlib_stel PROPERTIES AUTOMOC 0) + SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external") + ++if(0) + set(qtcompress_SRCS + qtcompress/qzip.cpp + qtcompress/qzipreader.h +@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core) + #turn off automoc, not needed here + set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0) + SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external") ++endif() + + set(qcustomplot_SRCS + qcustomplot/qcustomplot.cpp +@@ -176,7 +176,7 @@ + qxlsx/xlsxcelllocation.h + ) + add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS}) +-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel) ++target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress) + set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external") + + ################################# INDI ################################ +diff -r 11536448457a xlsxzipreader.cpp +--- a/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:41:22 2020 +0100 ++++ b/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:42:03 2020 +0100 +@@ -28,13 +28,13 @@ + namespace QXlsx { + + ZipReader::ZipReader(const QString &filePath) : +- m_reader(new Stel::QZipReader(filePath)) ++ m_reader(new QZipReader(filePath)) + { + init(); + } + + ZipReader::ZipReader(QIODevice *device) : +- m_reader(new Stel::QZipReader(device)) ++ m_reader(new QZipReader(device)) + { + init(); + } +@@ -45,8 +45,8 @@ + + void ZipReader::init() + { +- QList allFiles = m_reader->fileInfoList(); +- foreach (const Stel::QZipReader::FileInfo &fi, allFiles) ++ QList allFiles = m_reader->fileInfoList(); ++ foreach (const QZipReader::FileInfo &fi, allFiles) + { + if (fi.isFile) + m_filePaths.append(fi.filePath); +diff -r 2019bb0d2919 xlsxzipreader_p.h +--- a/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:35:35 2020 +0100 ++++ b/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:36:28 2020 +0100 +@@ -38,7 +38,7 @@ + // + + #include "xlsxglobal.h" +-#include "external/qtcompress/qzipreader.h" ++#include "qzipreader.h" + #include + #include + #include +@@ -60,7 +60,7 @@ + private: + Q_DISABLE_COPY(ZipReader) + void init(); +- QScopedPointer m_reader; ++ QScopedPointer m_reader; + QStringList m_filePaths; + }; + +diff -r 11536448457a xlsxzipwriter.cpp +--- a/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:41:22 2020 +0100 ++++ b/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:42:03 2020 +0100 +@@ -29,14 +29,14 @@ + + ZipWriter::ZipWriter(const QString &filePath) + { +- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly); +- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress); ++ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly); ++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress); + } + + ZipWriter::ZipWriter(QIODevice *device) + { +- m_writer = new Stel::QZipWriter(device); +- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress); ++ m_writer = new QZipWriter(device); ++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress); + } + + ZipWriter::~ZipWriter() +@@ -46,7 +46,7 @@ + + bool ZipWriter::error() const + { +- return m_writer->status() != Stel::QZipWriter::NoError; ++ return m_writer->status() != QZipWriter::NoError; + } + + void ZipWriter::addFile(const QString &filePath, QIODevice *device) +diff -r 2019bb0d2919 xlsxzipwriter_p.h +--- a/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:35:35 2020 +0100 ++++ b/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:36:28 2020 +0100 +@@ -37,7 +37,7 @@ + // + + #include +-#include "external/qtcompress/qzipwriter.h" ++#include "qzipwriter.h" + + class QIODevice; + class QZipWriter; +@@ -57,7 +57,7 @@ + void close(); + + private: +- Stel::QZipWriter *m_writer; ++ QZipWriter *m_writer; + }; + + } // namespace QXlsx diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch new file mode 100644 index 0000000..6fb7fb4 --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch @@ -0,0 +1,23 @@ +This patch is not really needed, because zlib is already used from system, but +it makes it easier to ensure that nothing else is bundled + +diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt +index 834aff89cb..590579e501 100644 +--- a/src/external/CMakeLists.txt ++++ b/src/external/CMakeLists.txt +@@ -36,6 +36,7 @@ target_link_libraries(glues_stel Qt5::Gui) + set_target_properties(glues_stel PROPERTIES AUTOMOC 0) + SET_TARGET_PROPERTIES(glues_stel PROPERTIES FOLDER "src/external") + ++if(0) + SET(zlib_SRCS + zlib/adler32.c + zlib/compress.c +@@ -69,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib) + #turn off automoc, not needed here + set_target_properties(zlib_stel PROPERTIES AUTOMOC 0) + SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external") ++endif() + + if(0) + set(qtcompress_SRCS diff --git a/sci-astronomy/stellarium/stellarium-0.21.0.ebuild b/sci-astronomy/stellarium/stellarium-0.21.0.ebuild new file mode 100644 index 0000000..596dc11 --- /dev/null +++ b/sci-astronomy/stellarium/stellarium-0.21.0.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx + +DESCRIPTION="3D photo-realistic skies in real time" +HOMEPAGE="https://stellarium.org/" +MY_DSO_VERSION="3.12" +SRC_URI=" + https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz + deep-sky? ( + https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat + ) + doc? ( + https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf + ) + stars? ( + https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat + https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat + https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat + https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat + https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat + )" + +LICENSE="GPL-2+ SGI-B-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~arm ~arm64" +IUSE="debug deep-sky doc gps media nls stars telescope test" + +# Python interpreter is used while building RemoteControl plugin +BDEPEND=" + ${PYTHON_DEPS} + doc? ( app-doc/doxygen[dot] ) + nls? ( dev-qt/linguist-tools:5 ) +" +RDEPEND=" + dev-libs/qtcompress:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtserialport:5 + dev-qt/qtwidgets:5 + media-fonts/dejavu + sys-libs/zlib + virtual/opengl + gps? ( dev-qt/qtpositioning:5 ) + media? ( dev-qt/qtmultimedia:5[widgets] ) + telescope? ( sci-libs/indilib:= ) +" +DEPEND="${RDEPEND} + dev-qt/qtconcurrent:5 + test? ( dev-qt/qttest:5 ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch" + "${FILESDIR}/stellarium-0.20.3-unbundle-qtcompress.patch" + "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch" +) + +src_prepare() { + cmake_src_prepare + use debug || append-cppflags -DQT_NO_DEBUG #415769 + + # Several libraries are bundled, remove them. + rm -r src/external/{libindi,qtcompress,zlib}/ || die + + # qcustomplot can't be easily unbundled because it uses qcustomplot 1 + # while we have qcustomplot 2 in tree which changed API a bit + # Also the license of the external qcustomplot is incompatible with stellarium + + # for glues_stel aka libtess I couldn't find an upstream with the same API + + # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114 + + local remaining="$(cd src/external/ && echo */)" + if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then + eqawarn "Need to unbundle more deps: ${remaining}" + fi +} + +src_configure() { + local mycmakeargs=( + -DENABLE_GPS="$(usex gps)" + -DENABLE_MEDIA="$(usex media)" + -DENABLE_NLS="$(usex nls)" + -DENABLE_TESTING="$(usex test)" + -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)" + ) + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +} + +src_compile() { + cmake_src_compile + + if use doc ; then + cmake_build apidoc + fi +} + +src_install() { + if use doc ; then + local HTML_DOCS=( "${BUILD_DIR}/doc/html/." ) + dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf" + fi + cmake_src_install + + # use the more up-to-date system fonts + rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die + dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf + dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf + + if use stars ; then + insinto /usr/share/${PN}/stars/default + doins "${DISTDIR}"/stars_4_1v0_2.cat + doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat + fi + if use deep-sky ; then + insinto /usr/share/${PN}/nebulae/default + newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat + fi + newicon doc/images/stellarium-logo.png ${PN}.png +}