diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sci-astronomy | |
parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) |
gentoo resync : 15.06.2021
Diffstat (limited to 'sci-astronomy')
-rw-r--r-- | sci-astronomy/Manifest.gz | bin | 6530 -> 6530 bytes | |||
-rw-r--r-- | sci-astronomy/stellarium/Manifest | 14 | ||||
-rw-r--r-- | sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch | 24 | ||||
-rw-r--r-- | sci-astronomy/stellarium/files/stellarium-0.21.0-unbundle-qtcompress.patch | 222 | ||||
-rw-r--r-- | sci-astronomy/stellarium/stellarium-0.20.2.ebuild | 96 | ||||
-rw-r--r-- | sci-astronomy/stellarium/stellarium-0.20.4.ebuild | 2 | ||||
-rw-r--r-- | sci-astronomy/stellarium/stellarium-0.21.0.ebuild (renamed from sci-astronomy/stellarium/stellarium-0.20.3.ebuild) | 24 |
7 files changed, 243 insertions, 139 deletions
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz Binary files differindex 3776eb267926..9a50865db3d5 100644 --- a/sci-astronomy/Manifest.gz +++ b/sci-astronomy/Manifest.gz diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest index 122d3f7c532b..45a6f436c700 100644 --- a/sci-astronomy/stellarium/Manifest +++ b/sci-astronomy/stellarium/Manifest @@ -1,21 +1,17 @@ -AUX stellarium-0.20.2-disable-x86-test.patch 834 BLAKE2B 3b66784a9535be602aabf0b88bf83182bf7e63e67cf746bb0270cb04759b42ad92ed2427bbe024aa09716fbb03ad5621afe4e708f2f3d1e783057f1fadf23691 SHA512 a6e826d81882534b5826ed5847d90cc036ce5b388efa63adc9ba08a61daa91af86066c514b60edeb20cf4d4b2c60cd9c74f641fc02f0954506ba4063ff95e645 AUX stellarium-0.20.3-unbundle-indi.patch 3217 BLAKE2B 9de42cc423655ef8280fc5d40c917211ae9904310defc9f16d2a2cc3448b209c6aba67c34a48c884cd7f09a6b6a9e964c9fd8b9faa7ca6a3cd2101290bb2bb5d SHA512 f6da77375632ff5c2b99d30f5d361fa1cd4bc2dca89afb1b4c5a9b47d9396687c473cb4acc3d87f4242207de2dee9dce44899cc7de3baebb2dba9d550d25e294 AUX stellarium-0.20.3-unbundle-qtcompress.patch 8123 BLAKE2B 314a2f4c191b7d6c0083679878c38bf6f632a1be6d19d68d82a0eda520c9a96e3f4f87d7437b6cf53c0812fc917ec82865796a8088da7afc2d6424d442a20a94 SHA512 fd6121345a5609b8a70a06753b6495b258eae7a1f978d8eeac8e7aa6b73777d9a982bc016d891bbcad48ead1b5c624bb0b07dbac8b40bd1a16baaf347b72b97d AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d +AUX stellarium-0.21.0-unbundle-qtcompress.patch 8133 BLAKE2B 83b66dfb3938c775092b48c4bcb65feab6b6c76ef98016dd84e680bb6ce99abaade3af2e8be7e179fa9c53235cc767b5f1a075d75133232aaacfe2c8aad51de3 SHA512 262c5efd0e2ab5545ba1d99850d1edeafb2b0cbe7a15125b648991d49e2a0d4dfb7bac488a7e2709e6ecaab285c2c74f36a50cca65fbcda7c9f8905e4f3902da 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.20.2.tar.gz 344319520 BLAKE2B 0a64cfc6d5a43bf811609caa9104458768e234bad8fabd2aa88a38d860c22573d076f677f7523c95e1fc1770e73dc1e73b2e94d544cb099c7cd9a21ac79f6bdb SHA512 34f1ad5891dde84b53324046bdf1514df858335ba8f0954bb72350b057ff6dc4091a2d7bf89083489e0d8d1c750c5fb8ba8e1e241f9287a740121b377f0e510c -DIST stellarium-0.20.3.tar.gz 349073272 BLAKE2B 4380e2f589f8ca7af7a62d7e72e18355328ba37d5d8c4e31f8da011fa46296a3c79b74aca04b9f4014f2b2ebc5a1124d62239d6a9bf947cea687d0a2f6e09c13 SHA512 7f4769955fa55751828b211023f3e88e78c42bd367dade9b29cbe86afcdbfc7078d87dc8f856b0f96a4c75bb3d07462a195095f7afb84bfca0988135a1518a1d DIST stellarium-0.20.4.tar.gz 347033776 BLAKE2B 91b7f63f74d36a1e1af7d758cb8bea7f51397bc9a8b8ebda2cbc0ea919c9f4bef2312ce979b50dc6ec0706783f35f60f4562290173fec673dc3d9f4097b9f46e SHA512 29e14d56a93db672b5163e6f21dda462fe6c5598d9791bf9a98f414f662c26e0826b3892e3a888688371d805bbddbf5fb47f193c4e16d754fe83fbfb9559e5ae -DIST stellarium-dso-catalog-3.10.dat 28297970 BLAKE2B 69d8f9756986c872cde0190ae3e5f225de30d8fabd5ba3e007176c8ffc4234e964ccc3beb58f75fc4579c75cee620661728a7c6c1d6960d5cb1be027828ba127 SHA512 22068d9ebca592db214f9831765701c52d07e71616705faaf6f5827d51a65af805947bd1f84553e5768f3e82f9e1a0e81eb36943713afb924d604a4676711b1f -DIST stellarium-dso-catalog-3.11.dat 28297989 BLAKE2B de56efe1930e9ee0e584de9f8167c7b588b886623bbea547ac35b7d3fe32e99e402f8811a2878b82f059e9b946b19ce2456d8a8a4f2127b8dc85c34c6ba1b13b SHA512 21efc43f7ac10b3b14e63731938cbfeaa7b5097ef2a7328e741e00cfd391b80ba4f7e6a367677be2f01879d9c46b8b1bcd5fce8963776ef670455a442c663fc3 +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.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2d24feaff2f7705a0eaffc8ccc1e6cdc037f374dedff01185466dac1635242bcf3ec8309806db03340b251fb39cea1f285a3cf5f26 SHA512 b820c2f76f40df9ef3c2f732cbb5c3622f37bff0cfdab8b56c78c0f4417ba036f6c623f00e7186e4b3c045ed2a4598baabd334fb6cb1037de12af0837a2fe86d DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13 -EBUILD stellarium-0.20.2.ebuild 2707 BLAKE2B 8ee26adab18fbcd8a7d5008811240fc8ce52b6d0213b2eb240e424a3d0f388c062438e3271945627e56568deb5383ad2731d1cefc3884880555b276a567d3979 SHA512 164e30343263375578d4c3692d3d144790a5dc1caa4d234605c7512d7af467e13f776a9c32f2b43435bc9cec25184ec650ad4481705b329b6541b811cec51763 -EBUILD stellarium-0.20.3.ebuild 3941 BLAKE2B 9341847ecff93659da7f03b15c1ca35f2f4c12b52863d5e66fdce9d19c23c9f7502d958ad78d6aeb327dfb628315cde23ef1e644b1047ac72cf699409affcb95 SHA512 6b7ba8a5e7330135722399438fb8c5f6100fc9d8d3630c247b9f03db456d3a4bd03c7240fe040a5d020c84c15e1d482b015867d02dc4a8decbb21b3253bda50f -EBUILD stellarium-0.20.4.ebuild 3984 BLAKE2B ed4cb472ad2cadc3fb2e0827d80637f4b62f7bd5b43e58cb3a1ce32cee253f7678fea4abb5c35a229071fc04682bc86f0418e154b6c9a0447552b3ed9e31f619 SHA512 4a70bb2d0653bd9f57a3db840ce8128d6382994acd79f6050707f5ca991c4f11fb516887b9199ffe5b1ea25c51940ec7316d7ea0e37a5ad77d556156f1a9fe3b +DIST stellarium_user_guide-0.21.0-1.pdf 31132367 BLAKE2B d353b9160d7261c410aaa90b3f79955f03ca8453f44249fcec772cb435d4f909fbedeac940afc2f2728008a8c75b366232d943b4dc72698aec95f3ce3b0af38e SHA512 254fe13219b7be5604db28553bbfabb4aaf8c4b82a58a9854806352e25ba7cd419ac8ebbafec92553ccdb499aa6700fb6d7a8537484c12c8314084287a70290d +EBUILD stellarium-0.20.4.ebuild 3980 BLAKE2B 0e1c9517aaf37c258e8343adee97b5932c06b0d5210eca3151c8f8431002c9c4dad1e62885d51fb7d0828a7099c7a6fa20ba516c90b7e452bc679eec03ee7393 SHA512 a1b0ada116ed34164ee771c68d7b84a5f1fbb16294dd31963d84ab927cf112ba92fd48aeea070ec2ec73922acc236cbd44e72f6f709eb0aabaa8033291dbd6bf +EBUILD stellarium-0.21.0.ebuild 4045 BLAKE2B e0940012d4da752e2ccbec0ad5f08f6ca609a25cc5ad085f9668e799838f3af7b7780d70bfc48b78601d1e6f5f6fb060fe85f7fb6319ef84c86a93fc97f1a897 SHA512 703127041fd91ebba34f53b9f6b5aa78cd28ff55551b2f1a868d66b9d6f4b4b2d19a48837b12e99bb76e151571f98854ec947013f0f592c79bd3c34d0126e242 MISC metadata.xml 1196 BLAKE2B 85a24121661eb11ff4ce9d7aee0113d18f92b968ee91cb6b4fdca237ef9f05d6616c879de3c341dc23ebac42c473aafa1eadfce0b184e5b569f1caf497d62429 SHA512 df106274882a1db20200940254725c74da0632a9232de9b432849aad0aa6d5d0a533556f45f8cc767d3d4a8d26ae6d838ac0628b6c625a5cfab38f19432a1b36 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 deleted file mode 100644 index 27674eb7a1e7..000000000000 --- a/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch +++ /dev/null @@ -1,24 +0,0 @@ -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.21.0-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.21.0-unbundle-qtcompress.patch new file mode 100644 index 000000000000..179afb56fc62 --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.21.0-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 <QNetworkAccessManager> + #include <QNetworkReply> +@@ -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<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList(); ++ QList<QZipReader::FileInfo> infoList = reader.fileInfoList(); + for (const auto& info : qAsConst(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<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList(); ++ QList<QZipReader::FileInfo> 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<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList(); +- foreach (const Stel::QZipReader::FileInfo &fi, allFiles) ++ QList<QZipReader::FileInfo> 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 <QScopedPointer> + #include <QStringList> + #include <QVector> +@@ -60,7 +60,7 @@ + private: + Q_DISABLE_COPY(ZipReader) + void init(); +- QScopedPointer<Stel::QZipReader> m_reader; ++ QScopedPointer<QZipReader> 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 <QString> +-#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/stellarium-0.20.2.ebuild b/sci-astronomy/stellarium/stellarium-0.20.2.ebuild deleted file mode 100644 index 72d532122ffd..000000000000 --- a/sci-astronomy/stellarium/stellarium-0.20.2.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop flag-o-matic xdg virtualx - -DESCRIPTION="3D photo-realistic skies in real time" -HOMEPAGE="https://stellarium.org/" -MY_DSO_VERSION="3.10" -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 - ) - 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+" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="debug deep-sky gps media nls stars test" - -BDEPEND=" - nls? ( dev-qt/linguist-tools:5 ) -" -RDEPEND=" - 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] ) -" -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 - test? ( dev-qt/qttest:5 ) -" - -RESTRICT="!test? ( test )" - -src_prepare() { - cmake_src_prepare - use debug || append-cppflags -DQT_NO_DEBUG #415769 - - if use x86; then - # https://github.com/Stellarium/stellarium/issues/1153 - eapply "${FILESDIR}/stellarium-0.20.2-disable-x86-test.patch" - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_GPS="$(usex gps)" - -DENABLE_MEDIA="$(usex media)" - -DENABLE_NLS="$(usex nls)" - -DENABLE_TESTING="$(usex test)" - ) - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - 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 -} diff --git a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild index 92d2cb4a3543..25de0105315a 100644 --- a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild +++ b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild @@ -27,7 +27,7 @@ SRC_URI=" LICENSE="GPL-2+ SGI-B-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="debug deep-sky doc gps media nls stars telescope test" # Python interpreter is used while building RemoteControl plugin diff --git a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild b/sci-astronomy/stellarium/stellarium-0.21.0.ebuild index f2c44c806188..9f6e471d3edb 100644 --- a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild +++ b/sci-astronomy/stellarium/stellarium-0.21.0.ebuild @@ -3,12 +3,12 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) 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.11" +MY_DSO_VERSION="3.12" SRC_URI=" https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz deep-sky? ( @@ -27,7 +27,7 @@ SRC_URI=" LICENSE="GPL-2+ SGI-B-2.0" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="debug deep-sky doc gps media nls stars telescope test" # Python interpreter is used while building RemoteControl plugin @@ -44,14 +44,20 @@ RDEPEND=" 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 ) + gps? ( + dev-qt/qtpositioning:5 + dev-qt/qtserialport:5 + sci-geosciences/gpsd:=[cxx] + ) media? ( dev-qt/qtmultimedia:5[widgets] ) - telescope? ( sci-libs/indilib:= ) + telescope? ( + dev-qt/qtserialport:5 + sci-libs/indilib:= + ) " DEPEND="${RDEPEND} dev-qt/qtconcurrent:5 @@ -61,9 +67,9 @@ DEPEND="${RDEPEND} RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}/${P}-unbundle-indi.patch" - "${FILESDIR}/${P}-unbundle-qtcompress.patch" - "${FILESDIR}/${P}-unbundle-zlib.patch" + "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch" + "${FILESDIR}/stellarium-0.21.0-unbundle-qtcompress.patch" + "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch" ) src_prepare() { |