diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-23 09:44:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-23 09:44:00 +0000 |
commit | 8d15cb8238a384acdb70250a0cd213f2ab5f0ab6 (patch) | |
tree | 547dd4d959be6b14e702d37e94063dc2104319a5 /sci-astronomy/stellarium | |
parent | 71fb24e4cc15fe73651423df81c5e6a79fa8c142 (diff) |
gentoo auto-resync : 23:02:2023 - 09:44:00
Diffstat (limited to 'sci-astronomy/stellarium')
6 files changed, 0 insertions, 628 deletions
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest index 00ebbd048367..be4931abda33 100644 --- a/sci-astronomy/stellarium/Manifest +++ b/sci-astronomy/stellarium/Manifest @@ -1,26 +1,15 @@ -AUX stellarium-0.20.3-unbundle-indi.patch 3217 BLAKE2B 9de42cc423655ef8280fc5d40c917211ae9904310defc9f16d2a2cc3448b209c6aba67c34a48c884cd7f09a6b6a9e964c9fd8b9faa7ca6a3cd2101290bb2bb5d SHA512 f6da77375632ff5c2b99d30f5d361fa1cd4bc2dca89afb1b4c5a9b47d9396687c473cb4acc3d87f4242207de2dee9dce44899cc7de3baebb2dba9d550d25e294 AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d AUX stellarium-0.22.2-ccache.patch 340 BLAKE2B 0365157d357d55d321b297a61911dd52e7230faa9a4460c1373543e0e6021a2651ddff15457e35c966ee207db56fe4ba0cdc2dc4f9cba2255a8be9c75b2cc02b SHA512 62aa2767f02602b787560c48fa72de3c9d7ed09529abfa60bd7f11651913ea5ecabfa2ed1087a0aae16ec5b6a7f8706956d641a11fd7e29133f69041492a51b8 -AUX stellarium-0.22.2-unbundle-qtcompress.patch 7561 BLAKE2B c9bc4b051fcd26949ecd805c5e235015bbd58e23d7afb92e0576e4eee41ce567ce8f31fa4512f03824493083a56c851b19ec81f806b437916b05853ccdf43f28 SHA512 7c00dac2184ec97177a65fd4d5b10af9b915da86dd72c187633060609e5080186079563b555ecbdb742f6880c37b3d489b6c1f2cde5167fc446353746c474758 -AUX stellarium-1.1-qxlsx.patch 538 BLAKE2B 0d604477ad04c23daf5b112690da0be0853e283ee670ac874d2b6d1e288e2370bcade10b30ef5efcfb18829b109d0e9297a2f39d3294b54e2379d635da799f85 SHA512 ea309f4221a8fb32680af30c4c26acbf302753ae891bbdddab83e91c1fd574ae09ff5958935798532d76ba2147eb0c2c36b6e2a7c09f81ca66c0120ef6e2fb2e 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.22.2.tar.gz 409151525 BLAKE2B c49abfb17a8bf7b120d8a0dffbe58b83e18f86b7ef2764cddc946e0cbaad9bf01adaf8d008557108f6354ed11d79e56d94c92c2a07befbd955aed8d201b68292 SHA512 ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda -DIST stellarium-1.1.1.tar.gz 413806998 BLAKE2B bd5679aa32edfa44807e941d0febcb1c1749eada6c2834cb16de4cc9850735c3033122fd1e4afc8b8550441b8a8f70865f6a7b3eb178bf906c8b64d7829ea3f6 SHA512 4564b8df21afb5d266c21e4d59a5df52a0695f102dc68d59d37ea29e520495132c7fb01235ceac5d68b0812fc05d35b5f8c7a5c337c55007ce562f770e3a3612 DIST stellarium-1.2.tar.xz 344579192 BLAKE2B 56aa497cfd57a3e43ed0f153fbfe0cf348fd1b4e14bc54fbade20063d61211972d2f717c46c872f858b23798521a00390135044ab58625322f88ba9d87513c48 SHA512 d27a038ce51a2a7c5145c40d6ff54938820e98e432adb56f7e986d7cd0c23d87f76c0616641173c1c047652f570069dcb3a5959806262188642e5ac29ffeb003 DIST stellarium-1.2.tar.xz.asc 313 BLAKE2B 147a58a70f98c45bf3446a0fc92ade5ce464a160279192533af00bb0361beeb03e3bc89f3ea59c385010bd211ad33cb203f4e67d354bce3be47ef2e62b8b3cc2 SHA512 b62381bfc49ea8f209224c4afb6515adbc3a8a9e30b0313f63e4db3aa8409a8912795ffbc3fd3de576ef720784674912cafcb88f5f247497e42910f20c067fdd -DIST stellarium-dso-catalog-3.16.dat 28678822 BLAKE2B 130513b5dcb0d06dd605ed62d6bdf12bfd636a5e5f5c33f02c7adb77a6712245a98ce3d56332fce6fea0f18c9b7915af4bb3d9812b1fd09bfc036d4135cef4f5 SHA512 9320d2a3c9af93d19cc4414f371991993793b78315448cafcd83b82de6dc16715b0cab2ddeafca667af31a9086420cbe758708333e5b95215de8a46305324c41 -DIST stellarium-dso-catalog-3.17.dat 28678790 BLAKE2B 8ec14dd34c749a5bea19cc5567b2d703a7e5d4192eda6636fcec9fb2ef0301fd654aefdf4b33db70210da73eb9e385ace2265a57199f5660ec7034887fdcc80f SHA512 c0c679bd9de9e7ac000be5902d3a1e863853e8f9c382186253dd2d77a658fe93a9e2e206ecd1396f64b7b6cd4e738ecc2e11ea43bc6f71a098a44eb77875978a DIST stellarium-dso-catalog-3.18.dat 28678602 BLAKE2B 163eecf1bc26728f88f9f322c950fd26570bf52f63f462756e94ce0c6788d58c8d8fd39f34201c8536745e70afe426aec5f1bc079830fdca9723d9a8797a053e SHA512 ff86d47b7b777ae6de76c4bb41870f18de9a309d2b188d01e5c854bd79ae5d022ad1d46a3e80001bed49166df424096e53482398d810eabc792ca1f4829deacd DIST stellarium-dso-catalog-3.18.dat.asc 313 BLAKE2B 98ef5f9181d5a597328cee2b87963adc81033f2e6539b8db1d155fd2c1ef13fc2d3967e5ad52a892ddfee34d4482dbd174d2d39af9390efdea39b773e0bf7b44 SHA512 71967a83d0720b560895e9369f862b977b5600bad66e095c9b5987dd25a67e49c86bf2abeb0119efb6f1c945b5346153cf5a4c4f279c34e07f3be1c7d044e7f9 -DIST stellarium_user_guide-0.22.2-1.pdf 35082446 BLAKE2B c9bb7f344a9377fe86b714904aa713c7e6cda59d31f8e547b571da0a057d141fa1b998b4adb3dbdcee0bb7a152b6f6e18b58a4a08c345dc0e77efca6ffb5a801 SHA512 45adfe53fa9c7432952152d95ab96a446a6459348fa6724fff83aababb0c967d9467cc0ca3bd24b834fd189fb69c782e521d94528a60a704062aa445e749a4a5 -DIST stellarium_user_guide-1.1-1.pdf 36567672 BLAKE2B d1b7f9c8d8974aeabe92e3127c84a79b92dd9c3a0057b7831a1851c7fc88c13ec456375847e90576448a5dbe655846142637c91067cc10df20ae2b9373190e8e SHA512 2dbcf4100c1f24770fa23b2995103b94f0736eacca76031cecac582364948a4cb0e32aabdb554a30a7a64ed53eaa3538d59d7af2434eb74a04d562f1453bc89d DIST stellarium_user_guide-1.2-1.pdf 36821463 BLAKE2B f7ddf7bee8f06c323ee3a493a04cfcad0bd78244ba67f1e9fa159e66533a9e5156358d9466e91bebcf3642f252b07535d93a480be0cfdc9991be0a8abb327a6e SHA512 7d1a62bb4dca645789469c2f84daf929494a342168b011cdcc6cc2b0cace0f133eade110e75dcc26d29479550f6a60bbc791b3cf2e9f2a44f4c19ec3333406c0 DIST stellarium_user_guide-1.2-1.pdf.asc 313 BLAKE2B 95a3a5c88a3d4ea37c6fa99ac808caf87fd8e2f24ff57119a16b1d849e1da5280cddb42a5fd300d684bb018a8e6f0f5e80e2de9600e6231a1cddda7cdb40e29a SHA512 8c9e087f38a7e006440a91545d911872adc37dcd865ee75287b493c8ecbaffb6d2d1ca628c332d00910903eb35ac04050d360e6f3b16c7151a3bb84d90b1ec72 -EBUILD stellarium-0.22.2.ebuild 4063 BLAKE2B 0f0e2419f3648ca635712181051fea692862e4a8cca9d44c13d5b7e318cef2009b13ffb15b8648d879666b3284a09487a226b2cf4d287730e65e59ca6b6530c6 SHA512 7a9e3a023bd27808c80781dd8374ef9aad29550fb08a2d20181b79a37cf674781378ac04d30f1df7d389065d494ca770762bd5f3727b6d64632a5880bd9602f4 -EBUILD stellarium-1.1.ebuild 4754 BLAKE2B 0770a2dbcfd18f1622cce006d54a5605eddf7ff5df1c9312caa1cdf2825d1ed7118d0658e1e90db0c182b4624df01023d31840899bf8f16c89a0d761ac95f881 SHA512 b50ab9a079175ff95726e1127850cb91f0ee1d9df956a6e1d387042988e19d07e99d340ff47813e57f0188c8b58fb5a5a14f016c37348b1b15f630692d9830a0 EBUILD stellarium-1.2.ebuild 5736 BLAKE2B ee7f87b4f508bf43a90e499aec4a626ddc1d476876077cacdc274134f5a5d9203c8d3ca7e34ef31a63af12b0421cd0c0cab7a1d52cdb3a745b1892845c326119 SHA512 ee3b912c1c366d959d5a0c3d50992c8777c3578c9e91534531006dbbe74e2c4119c1ffe0a5f4fa8ea82396bf63f1748870441ac7400014a1b3e3f68fc68162f7 MISC metadata.xml 1667 BLAKE2B dd7848212ed755809c49cdba0ed63138b5f6f188240f71601e113894fded940ed3ea3850028915700961789f150ea7f5d91a4ff6c4570b753dbe6ff397b81b46 SHA512 bea670b08be632304aab3b9d456bce249f2109195e6e309bd703778e5a93561e552212c900897b72e293a3d81d188afabd5e1d8c213334f6d01b1dc035badca6 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 deleted file mode 100644 index 33d355f842f4..000000000000 --- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch +++ /dev/null @@ -1,82 +0,0 @@ -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 <limits> - #include <cmath> - --#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 <QObject> --#include "indibase/baseclient.h" -+#include "libindi/baseclient.h" - - #include <mutex> - #include <QStringList> -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 <cmath> - - #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.22.2-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch deleted file mode 100644 index 47643b797992..000000000000 --- a/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch +++ /dev/null @@ -1,208 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -614,6 +614,8 @@ ELSE(ENABLE_GPS) - MESSAGE(STATUS "GPS: disabled.") - ENDIF(ENABLE_GPS) - -+find_package(Qt5Compress REQUIRED) -+ - IF(USE_QTOPENGL) - # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore, - # but the QtMultimediaWidgets module requires it internally, so we still have to package it. ---- 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) ---- 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> -@@ -1639,12 +1639,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; ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -479,7 +479,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 qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) -+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) - IF(ENABLE_LIBGPS) - SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY}) - ENDIF() ---- a/src/core/modules/LandscapeMgr.cpp -+++ b/src/core/modules/LandscapeMgr.cpp -@@ -1331,8 +1331,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(); -@@ -1341,7 +1341,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const - - //Detect top directory - QString topDir, iniPath; -- const QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList(); -+ const QList<QZipReader::FileInfo> infoList = reader.fileInfoList(); - for (const auto& info : infoList) - { - QFileInfo fileInfo(info.filePath); ---- 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()
-
- # QCustomPlot should not be unbundled, because upstream uses GPL 3, and
- # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this.
-@@ -180,7 +182,7 @@ SET(qxlsx_SRCS - 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 ################################
---- a/src/external/qxlsx/xlsxzipreader.cpp -+++ b/src/external/qxlsx/xlsxzipreader.cpp -@@ -5,13 +5,13 @@ - QT_BEGIN_NAMESPACE_XLSX - - 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(); - } -@@ -23,8 +23,8 @@ ZipReader::~ZipReader() - - void ZipReader::init() - { -- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList(); -- for (const Stel::QZipReader::FileInfo &fi : allFiles) { -+ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList(); -+ for (const QZipReader::FileInfo &fi : allFiles) { - if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink)) - m_filePaths.append(fi.filePath); - } ---- a/src/external/qxlsx/xlsxzipreader_p.h -+++ b/src/external/qxlsx/xlsxzipreader_p.h -@@ -8,7 +8,7 @@ - #include <QIODevice> - - #include "xlsxglobal.h" --#include "external/qtcompress/qzipreader.h" -+#include "qzipreader.h" - - #if QT_VERSION >= 0x050600 - #include <QVector> -@@ -31,7 +31,7 @@ public: - private: - Q_DISABLE_COPY(ZipReader) - void init(); -- QScopedPointer<Stel::QZipReader> m_reader; -+ QScopedPointer<QZipReader> m_reader; - QStringList m_filePaths; - }; - ---- a/src/external/qxlsx/xlsxzipwriter.cpp -+++ b/src/external/qxlsx/xlsxzipwriter.cpp -@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX - - 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() -@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter() - - 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) ---- a/src/external/qxlsx/xlsxzipwriter_p.h -+++ b/src/external/qxlsx/xlsxzipwriter_p.h -@@ -8,7 +8,7 @@ - #include <QIODevice> - - #include "xlsxglobal.h" --#include "external/qtcompress/qzipwriter.h" -+#include "qzipwriter.h" - - class QZipWriter; - -@@ -27,7 +27,7 @@ public: - void close(); - - private: -- Stel::QZipWriter *m_writer; -+ QZipWriter *m_writer; - }; - - QT_END_NAMESPACE_XLSX diff --git a/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch b/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch deleted file mode 100644 index f3e4c9c38ab7..000000000000 --- a/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -815,7 +815,7 @@ IF(ENABLE_XLSX) - # TODO: switch to something like vcpkg or conan, and plain find_package, - # without the fallback of cmake downloading the dep itself. - # But some libraries are not available there yet. -- CPMFindPackage(NAME QXlsx -+ CPMFindPackage(NAME QXlsxQt${QT_VERSION_MAJOR} - URL https://github.com/QtExcel/QXlsx/archive/refs/tags/v1.4.4.zip - URL_HASH SHA256=3efbd6f63a1ffd521c535dce7b5a5a7e9ebd23db51e6ae8e3e2eb89796e57675 - DOWNLOAD_ONLY yes diff --git a/sci-astronomy/stellarium/stellarium-0.22.2.ebuild b/sci-astronomy/stellarium/stellarium-0.22.2.ebuild deleted file mode 100644 index ec1e66781138..000000000000 --- a/sci-astronomy/stellarium/stellarium-0.22.2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..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.16" -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-${MY_DSO_VERSION}.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 ~riscv x86" -IUSE="debug deep-sky doc gps media nls stars telescope test webengine" - -# Python interpreter is used while building RemoteControl plugin -BDEPEND=" - ${PYTHON_DEPS} - dev-lang/perl - doc? ( app-doc/doxygen[dot] ) - nls? ( dev-qt/linguist-tools:5 ) -" -RDEPEND=" - dev-libs/qtcompress:= - dev-qt/qtcharts:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qtwidgets:5 - media-fonts/dejavu - sys-libs/zlib - gps? ( - dev-qt/qtpositioning:5 - dev-qt/qtserialport:5 - sci-geosciences/gpsd:=[cxx] - ) - media? ( - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtopengl:5 - virtual/opengl - ) - telescope? ( - dev-qt/qtserialport:5 - sci-libs/indilib:= - ) - webengine? ( dev-qt/qtwebengine:5[widgets] ) -" -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-zlib.patch" - "${FILESDIR}/stellarium-0.22.2-unbundle-qtcompress.patch" - "${FILESDIR}/stellarium-0.22.2-ccache.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 - - # 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/185 - - local remaining="$(cd src/external/ && echo */)" - if [[ "${remaining}" != "glues_stel/ 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_use_find_package webengine Qt5WebEngine) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) - ) - 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 -} diff --git a/sci-astronomy/stellarium/stellarium-1.1.ebuild b/sci-astronomy/stellarium/stellarium-1.1.ebuild deleted file mode 100644 index 8f98ea2eb1d2..000000000000 --- a/sci-astronomy/stellarium/stellarium-1.1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..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.17" -SRC_URI=" - https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.1.tar.gz - deep-sky? ( - https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.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 ~riscv" -IUSE="debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx" -# Qt6 QAudioOutput crashes on startup; qt 6.4.0 -# https://bugreports.qt.io/browse/QTBUG-108221 -REQUIRED_USE="|| ( !media !qt6 )" - -# Python interpreter is used while building RemoteControl plugin -BDEPEND=" - ${PYTHON_DEPS} - dev-lang/perl - doc? ( app-doc/doxygen[dot] ) - nls? ( - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) - ) -" -RDEPEND=" - media-fonts/dejavu - sys-libs/zlib - gps? ( sci-geosciences/gpsd:=[cxx] ) - media? ( virtual/opengl ) - !qt6? ( - dev-qt/qtcharts:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5= - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - sci-astronomy/calcmysky:=[qt5] - gps? ( - dev-qt/qtpositioning:5 - dev-qt/qtserialport:5 - ) - media? ( - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtopengl:5 - ) - scripting? ( dev-qt/qtscript:5 ) - telescope? ( dev-qt/qtserialport:5 ) - webengine? ( dev-qt/qtwebengine:5[widgets] ) - xlsx? ( dev-libs/qxlsx:=[qt5] ) - ) - qt6? ( - dev-qt/qtbase:6=[gui,network,widgets] - dev-qt/qtcharts:6 - sci-astronomy/calcmysky:=[qt6] - gps? ( - dev-qt/qtpositioning:6 - dev-qt/qtserialport:6 - ) - media? ( - dev-qt/qtmultimedia:6[gstreamer] - ) - scripting? ( dev-qt/qtdeclarative:6 ) - telescope? ( dev-qt/qtserialport:6 ) - webengine? ( dev-qt/qtwebengine:6[widgets] ) - xlsx? ( dev-libs/qxlsx:=[qt6] ) - ) - telescope? ( sci-libs/indilib:= ) -" -DEPEND="${RDEPEND} - !qt6? ( - dev-qt/qtconcurrent:5 - test? ( dev-qt/qttest:5 ) - ) - qt6? ( dev-qt/qtbase:6=[concurrent] ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch" - "${FILESDIR}/stellarium-0.22.2-ccache.patch" - "${FILESDIR}/stellarium-1.1-qxlsx.patch" -) - -src_prepare() { - cmake_src_prepare - use debug || append-cppflags -DQT_NO_DEBUG #415769 - - rm -r src/external/zlib/ || die - - # for glues_stel aka libtess I couldn't find an upstream with the same API - - local remaining="$(cd src/external/ && echo */)" - if [[ "${remaining}" != "glues_stel/" ]]; then - eqawarn "Need to unbundle more deps: ${remaining}" - fi -} - -src_configure() { - filter-lto # https://bugs.gentoo.org/862249 - - local mycmakeargs=( - -DCPM_LOCAL_PACKAGES_ONLY=yes - -DENABLE_GPS="$(usex gps)" - -DENABLE_MEDIA="$(usex media)" - -DENABLE_NLS="$(usex nls)" - -DENABLE_QT6="$(usex qt6)" - -DENABLE_QTWEBENGINE="$(usex webengine)" - -DENABLE_SHOWMYSKY=$(usex show-my-sky) - -DENABLE_SCRIPTING=$(usex scripting) - -DENABLE_TESTING="$(usex test)" - -DENABLE_XLSX="$(usex xlsx)" - -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 -} |