diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-10-18 04:04:23 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-18 04:04:23 +0100 |
commit | 483d7c056fba15727fe24545f93627a1d1e1e2eb (patch) | |
tree | 80d144b60f8e1dc0d14c15cb3e5950da12c80074 /sci-astronomy | |
parent | 8796aaedb3257bbe4d80b0033408b2210b2259d6 (diff) |
gentoo auto-resync : 18:10:2024 - 04:04:23
Diffstat (limited to 'sci-astronomy')
-rw-r--r-- | sci-astronomy/Manifest.gz | bin | 6202 -> 6199 bytes | |||
-rw-r--r-- | sci-astronomy/gasgano/Manifest | 2 | ||||
-rw-r--r-- | sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild | 4 | ||||
-rw-r--r-- | sci-astronomy/stellarium/Manifest | 14 | ||||
-rw-r--r-- | sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch | 23 | ||||
-rw-r--r-- | sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch | 35 | ||||
-rw-r--r-- | sci-astronomy/stellarium/metadata.xml | 1 | ||||
-rw-r--r-- | sci-astronomy/stellarium/stellarium-24.3.ebuild (renamed from sci-astronomy/stellarium/stellarium-24.1.ebuild) | 27 |
8 files changed, 90 insertions, 16 deletions
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz Binary files differindex d9957369fab3..68e128002aea 100644 --- a/sci-astronomy/Manifest.gz +++ b/sci-astronomy/Manifest.gz diff --git a/sci-astronomy/gasgano/Manifest b/sci-astronomy/gasgano/Manifest index 5c27a5c08650..a1e15b92e813 100644 --- a/sci-astronomy/gasgano/Manifest +++ b/sci-astronomy/gasgano/Manifest @@ -1,4 +1,4 @@ DIST VLT-PRO-ESO-19000-1932-V4.pdf 818369 BLAKE2B f58191ca9f1bd72f78e73eceecbfc32331fb88abcaed0eb27f7beb444e47788a95d43f3e8421b235e7637d452d22a773f7363934690644e2cc02acfdfd5cbb11 SHA512 272da18caee1bb1b5228df76a7f09411120be39a4b421b79d48e0bfc09972f250322a718bf380d7a83c3a528151260139efdcd8d2482c6a36ad45d727d93cce1 DIST gasgano-2.4.8.tar.gz 9211627 BLAKE2B df0a7856ec8b06cb590ff180798841a18f919c55eef4553fb9712e2b8a17d8a39fdeb642c941f8169b866baa2a1fd9ca0795f7c331adfb6ed56c69098abdb9bd SHA512 94fbc9721077b15d2ec06e296d1503a0e33cb845c831a4102740b84d600bc900324ec5293b9a977df0956bd02cd5adf9cc62989be860417e8014e97ead41967c -EBUILD gasgano-2.4.8-r1.ebuild 976 BLAKE2B a1b5969cb9c8c896cafb4ecf874d55515b923f65338dc584dc633972176b92e800b90aee8650f2a6a1bfd7329b721921f6a8088620d55f67b936fa6958a55b7b SHA512 3579a73e728c43d0bc6081c9a6acae85e0478f7f781db9fd77100722c6c3bf04a33969ef3cdfdfb2956822275d36e859dfd045fe8625dd936d48c52c2f5f2281 +EBUILD gasgano-2.4.8-r1.ebuild 971 BLAKE2B 08b2d60f7c4a76c2f503389b6ad79072c9220b32b7f2b56729e6569393d60c8f35ef463cc9797a65175c2a15d242e77abd321d8f80535696522d3474808f3a99 SHA512 5919437f2e33ad4058cbd15a4907c90546f5bd770663c75c10c5de7e847c30c38174a6b9ee25dfa59070512a8d2c25e145d85de917a64be934b2fcfceeb622a8 MISC metadata.xml 737 BLAKE2B 0e0ee3a471a3b6e9e37daf2109d72e64f8bcb0c5823b590051ec3de1113d957c79379caa43d2cae18b85a6e4d0c8cb9d969b6f1c59f948273820e26a516adc3d SHA512 a30d8a4d7c0323a1933fc510e586afc85a6910a2b2ace1fa6d699d10eb502cb6d664ba512787cfbc169b4f9b8e93a3949ffcb3ce36c293f0da47206bbe5a2f13 diff --git a/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild b/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild index 2aeaa63b02a0..5bdc9d58f289 100644 --- a/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild +++ b/sci-astronomy/gasgano/gasgano-2.4.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.eso.org/pub/dfs/${PN}/${P}.tar.gz LICENSE="Apache-1.1" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~amd64-linux ~x86-linux" IUSE="doc" DEPEND=">=virtual/jdk-1.8:*" diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest index 86d18018f63f..b570821fdf64 100644 --- a/sci-astronomy/stellarium/Manifest +++ b/sci-astronomy/stellarium/Manifest @@ -1,20 +1,22 @@ AUX stellarium-0.23.4-unbundle-zlib.patch 920 BLAKE2B 8dbf677312956b9c75d698cb51ce49de119e2258b9ddf05f8d77ac6f0590c5f707fc18de10e98322c8fe09fb573305780704f33eb71227c144e3ad4ccc2b6a14 SHA512 57b12bb6581e8ad6d5ec2ca6af13648b50feea88f0a1f5ede0031b561817821882192e90800627b349215841a5a0a37102e7b513d6d5c7ccbeb9db936db79ebf +AUX stellarium-0.24.3-fast_float.patch 873 BLAKE2B 8ecd8bd2a63fd88f844481b2dd04bc166c241f0a948f48894e46c71866d0c7ffedeb0de3fe822bd076f65097d451522a7b3483fd59d0ef0dd356e00007799b4f SHA512 b3610ba7e9fb345fc962248e9d79ea953557862be58163792eb6215ab2848c7b915c06c31ffa2fe9f45e5855d4c98e3961a03a1375de4a6f00486b028c596d0a +AUX stellarium-0.24.3-tbb-emit.patch 1264 BLAKE2B adbd6bf228fddc565c865a9fe1014c9f2a4627e04f1f39bb01bfe3ca5656323027020a65219e1eca34141fe373bd0cbe3534635d7a0a2a8c6f2a8ecbd97249fb SHA512 3a3bfb67beaa879deccfb96798fc8a86677ac06c862d8beff6cd5faf87069f928ee4a9e8b5ad7ed9faedeafa0ae079d043722b8b8a01af5ed45849c402bb3956 DIST indilib-1.8.5.tar.gz 2122866 BLAKE2B 203b6c78664aaf3f87b7f697b76544e6ed0fa6db8ac0fe43e6ebcf00de404e96a49b8cd7f8b0be2e4ff5c7f902b3e34177a244a4a49069887f11d28aea073620 SHA512 4c583f7ff0d96d787c7d035e23074f42db3f836ec74a0a7a1595574ae2d32d56234b16abddabacaf9bd5a10cb88c6c37994aafcef86d65a665b2bceae87446f9 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-24.1.tar.xz 326391584 BLAKE2B 2950c877d8cd24ab1ab377c22630fd4c71b512a353dad5bc903b07d7b5518285c350ef2ac599255e44ff3831fb88e7d83b3e4cb395fec5162e525195e94a04bf SHA512 60e0e2afb214f4e2d9ba6640f4b699d18c97b05b9f33e9990787a87484c6bd1d7bc87685558956e6dc8a80e93abd8d7f677daeb55d38d8f4f8448e7936999246 -DIST stellarium-24.1.tar.xz.asc 309 BLAKE2B b829b2173f5bffad81117c39f15018256eea9dbd890ef649e9b6137d9f935a03bccc89377e98ab3e224a60076fabb8275c47253fd8229a37e15a6f01e477f609 SHA512 c2217a5cd1391f925b1ff1f092f062fde031111263a32fb0c699f9c38419be343e29962f34722153e15abff6600d9b4a0afc77b9186635abebb86b2c1e72544a DIST stellarium-24.2.tar.xz 327084704 BLAKE2B b1d38a92d0487a6555f1aad2d544711527a3cf942f47506597c527a85035091a5c6ad787aeeab012f29242388c2f65b3d5e61527de01edfa576b9b7324c6917b SHA512 621d16a70036e2ddea3900c0fcd0d4caadb8f821afda8a5d9818c82d2a846107840e1497a4d79a954ec2a76e434bc99b021e6f15c2af6de2cc4044fb70096929 DIST stellarium-24.2.tar.xz.asc 313 BLAKE2B d76fb00c0446ddeee90c42a3750989746e85334e9ac2bbb723959e87850bc6f9464b6f59d379e9354698d50e7ee447ab6c8ffbeab0fd0cbda9ad3be7765cad41 SHA512 dc5a6d30423f6ac389115c6235656f8f144ba97d2ba09f7f074a17bc6ec92be46a9da741a387f0c149a73e6b15d5906bd0eaec13f6e69b327beeae4512bcf992 +DIST stellarium-24.3.tar.xz 328039964 BLAKE2B 295114fce95e4c01d6f25051d4988328ebaa93b815fa9198e0b6e30f15395116a2cd0974d2d211ba162780e4ae586a33ba98396465d6942c50db3945a206a03c SHA512 8bb8ebdfdf57accf6d200f6c17d39edcda15c7ecdbfcd280f2a21e682fa62d62fc6523965d16b2033cee8f84da3dbb24db837c594a75144f5822d3576067000e +DIST stellarium-24.3.tar.xz.asc 313 BLAKE2B 8f5af1a52e29e029b6e0bf61cb5612ae7ebe688b315e87011661e178dfe309ff76125177cd88dbf9c999abf3bbe5ee4b9ae52235fd0029cb5c2ebf66332f3df4 SHA512 c88e238a311b382be4623c67414dc5cce19cb1accdcbe35077916a0690ecaf0adc34ef43bd1b100f14b0cad8a6a8eec479eff353c32f0ad79b6a3263acf30f64 DIST stellarium-dso-catalog-3.20.dat 28678745 BLAKE2B 24ddf76e81e91424cced5df74dd164d17a45fed2b65c1dc1e7065371c18a796350a1e1aab2da5860376eb90eac07e7c836ffdbb324a0d3eda6c91e8ce1c4ab3a SHA512 c84832bbf56d1097db3ff8fa8f3faadac1470a9f79d9ee759493915a48754dc86174551b5e705786f29331991bee57daa4cab6d7ecc2e4e00a2f895823ccfd87 DIST stellarium-dso-catalog-3.20.dat.asc 313 BLAKE2B a7d9a1977ff4e1b21a80239d85ad5123ad03c2dcd57422cec7c2585eddb1004bbfc2b29a934653bc36c438981218811d21ade7380ae49278ef2c4f387ab762e5 SHA512 e8a7b10bb157d15b550a31646c8d8ce9933a77f748900a9c75f0c78b9b9205ce5e4e2ec18248ba786aacd5fbf36da00bbaf578b8b011c75351a9237568e62f1b -DIST stellarium_user_guide-24.1-1.pdf 32944397 BLAKE2B b99aae0d9c711746281e485175f9b576c7bddf5531c069c68c1a6dac8e64de2d93461ce0b4bc364046ff9a9a0c315a5fb1f5650fbd04afbda063f5dfd4244b88 SHA512 fab491fed6463375e33082551d95200ffa3e40422c09a3ab2cc7d607a30437890dead38e74db451a24e53f009dd1dedb7df16838ae18495b286396d9ca5741fc -DIST stellarium_user_guide-24.1-1.pdf.asc 313 BLAKE2B 8e2ef72fd04f694cacc1851e729a8ba5f137f76893bab146ee61c15d46bb64d23af6c1d4920baff4673c6a9bf49a3840addcbd1eb0d18befe04402d4afd9a6ce SHA512 2ea212e5be3858cb662cebed33ad2cb2438dfeb1cf65dde33c46981dc3d9bb8028a844af8f0d095b84df863a0a2a7b0f190c95311b13dc30091c9e257ca454c5 DIST stellarium_user_guide-24.2-1.pdf 32957159 BLAKE2B 4a6b7d93484945dffbee72eb4b3eba52cbe7affae63c9989b95dfe86be00d09ba3c283629a2939bca140daa1fd987dd6faa6e346fe56456777990fabcb46eb36 SHA512 784005bbd13333d2ab7ea0d043077ace88f0e824aef51ad65e2b3c11e6e2761f75332f7d03aa15a271078406688237da316f9d2077eb4155eaa9aa683b22e616 DIST stellarium_user_guide-24.2-1.pdf.asc 313 BLAKE2B 7e2093891fc6250982a95436f1e4fe39861f08e1adec3251d35fbe991c155cf5df0cfe1e78af3511da7e8f29268beae905e7f79a1e3e7677b649527c34df6aad SHA512 c5cd4603e6d1f02569be9d5bbb54a051b60143eb3967b56aa727525de67f8af4e4405d26b1ca25bc118d400d49f06f32cbafdbbecf6b2339000ab3366a722a7a -EBUILD stellarium-24.1.ebuild 5964 BLAKE2B 0e1389ef1b1db50f6262f72167f3bfac6b99507897e47e20b56fbe46f84c67ea82ade7e773a79ae898be016f84a968a94c53c2702a81b23074d15e97d90a4283 SHA512 24186d504fbc48035bfc52cd138f95c44d09f13ca62e2e1eb967e89a22d90e9175afdca453dfc00450dc57ea3fc8fc9a402b030c4f5df1b5974c1648f2673533 +DIST stellarium_user_guide-24.3-1.pdf 33106635 BLAKE2B 60b165bcb4d6ce8d0226e6c8c341a87ac38939e6f91155ea647b73e365f5dd76d812f48f10d36995fa27e8f56c7433256c8e6e4b190fc6cabf2c712a506fc8a6 SHA512 ba87fcb9b64faa123965c710b06e585ae20594e84aef59fe804d858f33497683fe4a5a2de6e0d7b1eff071e654d8ee3802e625a2f3f76712ec5962f919cc0ff1 +DIST stellarium_user_guide-24.3-1.pdf.asc 313 BLAKE2B a61d77585af364b977c1eb4ca40910c2dffc4905ba04426aa4c664975a5021c97f681395a64b7cf3556887d96a49f851ca289f74325283344d442b89ecc6783b SHA512 1aa60a229336aa17b22364589425a1001175d7478ec5a5258d5b305ac6b6e2c508d97224a497d1b64d9f961cc454b39a1a7a95c4e0333c9e6fddfc1b3f54cca8 EBUILD stellarium-24.2.ebuild 5964 BLAKE2B 0e1389ef1b1db50f6262f72167f3bfac6b99507897e47e20b56fbe46f84c67ea82ade7e773a79ae898be016f84a968a94c53c2702a81b23074d15e97d90a4283 SHA512 24186d504fbc48035bfc52cd138f95c44d09f13ca62e2e1eb967e89a22d90e9175afdca453dfc00450dc57ea3fc8fc9a402b030c4f5df1b5974c1648f2673533 -MISC metadata.xml 1745 BLAKE2B 46404a5e8352ad1eb9f365f7efc95569636a9c1c70c3b361361243e191763e6b08b7a481bc1a5732f38fcd0b257b97f0404b751ccae1ddb3ebf3c89b2c5b9834 SHA512 be2e183c283d5361202e1a4a59f02646b5a731e0bcab51e43ac5dd06d67270b2266a682d2ef1f63dd422e1b846c1aeab2ab38421b88b58711284e38734edabaa +EBUILD stellarium-24.3.ebuild 6386 BLAKE2B 55412e18c6ef3c71eb15793371108c7df59ebe05095bdcd7092f6e532f77ed6fca2352445b89b465e22bc1597a7a7879b3568c404c898f6b8e2cec61030aa72b SHA512 f521826418d6d43427e0b23c4d01c374fe2882e5a4c5ba71b8c4c925b1de9f09b26daf89745b23c707b39bedc1ad36adf12a20cffcccfff938ba1342e83e6c0c +MISC metadata.xml 1838 BLAKE2B 67fa2ad6e5fe2c1dd3f7aa678d41f0f6f2749e44b2cf76730f60a84af792e3b78f293b487c7a2732da171f2c291afbe49d9126a29e4e66e569873a9861200509 SHA512 f9d117746a3bec0b6726ec66c322f7e7cfb00bf3735b1f4f85b2388b310337abdd90881fff048e3abaf05eee74338c98975619e9255e9fd111485337a8d9374a diff --git a/sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch b/sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch new file mode 100644 index 000000000000..bc46b58c137b --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch @@ -0,0 +1,23 @@ +https://github.com/Stellarium/stellarium/pull/3949 + +libc++ doesn't support std::from_chars yet, and in such case Stellarium uses an external library + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1053,13 +1053,13 @@ ENDIF() + + include("cmake/Check-from_chars.cmake") + IF(NOT FROM_CHARS_WORKS) +- CPMFindPackage(NAME fast_float ++ CPMFindPackage(NAME FastFloat + GIT_REPOSITORY https://github.com/fastfloat/fast_float + VERSION 6.1.0 + EXCLUDE_FROM_ALL yes) +- GET_TARGET_PROPERTY(fast_float_INCLUDE_DIRECTORIES ++ GET_TARGET_PROPERTY(FastFloat_INCLUDE_DIRECTORIES + FastFloat::fast_float INTERFACE_INCLUDE_DIRECTORIES) +- INCLUDE_DIRECTORIES(${fast_float_INCLUDE_DIRECTORIES}) ++ INCLUDE_DIRECTORIES(${FastFloat_INCLUDE_DIRECTORIES}) + ADD_DEFINITIONS(-DUSE_FAST_FLOAT) + ENDIF() + diff --git a/sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch b/sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch new file mode 100644 index 000000000000..3cb67584d056 --- /dev/null +++ b/sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch @@ -0,0 +1,35 @@ +From 02e37f3b76ef20786f10a6d89d23944e330aecf4 Mon Sep 17 00:00:00 2001 +From: Ruslan Kabatsayev <b7.10110111@gmail.com> +Date: Mon, 23 Sep 2024 22:40:01 +0400 +Subject: [PATCH] Include <execution> before any Qt headers + +Fixes #3905. +--- a/src/core/modules/SolarSystem.cpp ++++ b/src/core/modules/SolarSystem.cpp +@@ -19,6 +19,8 @@ + * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. + */ + ++#include <execution> // must be included before Qt because some versions of libtbb use "emit" identifier for their needs ++ + #include "SolarSystem.hpp" + #include "StelTexture.hpp" + #include "EphemWrapper.hpp" +@@ -48,7 +50,6 @@ + #include "StelObserver.hpp" + + #include <algorithm> +-#include <execution> + + #include <QTextStream> + #include <QSettings> +--- a/src/stelMain_pch.hpp ++++ b/src/stelMain_pch.hpp +@@ -28,6 +28,7 @@ + // It seems that inclusion of some headers is actually bad for build time, these are commented away again. More teting or other compiler combinations may have slightly other results. + + // Base time was 284s from first test without PCH ++#include <execution> // must be included before Qt because some versions of libtbb use "emit" identifier for their needs + #include "StelApp.hpp" + #include<QDebug> + #include "StelUtils.hpp" diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml index da8ff2303389..684dbcfe02e5 100644 --- a/sci-astronomy/stellarium/metadata.xml +++ b/sci-astronomy/stellarium/metadata.xml @@ -22,6 +22,7 @@ <use> <flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag> <flag name="lens-distortion">Enable lens distortion estimator plugin</flag> + <flag name="libcxx">Use external libraries for STL features not available in libc++</flag> <flag name="media">Enable sound and video support</flag> <flag name="scripting">Enable JS scripting via <pkg>dev-qt/qtscript</pkg> in Qt5 or using Qml via <pkg>dev-qt/qtdeclarative</pkg> in Qt6</flag> <flag name="show-my-sky">Enable a better atmosphere model via <pkg>sci-astronomy/calcmysky</pkg></flag> diff --git a/sci-astronomy/stellarium/stellarium-24.1.ebuild b/sci-astronomy/stellarium/stellarium-24.3.ebuild index 5065b8b36107..d2da046cefea 100644 --- a/sci-astronomy/stellarium/stellarium-24.1.ebuild +++ b/sci-astronomy/stellarium/stellarium-24.3.ebuild @@ -3,8 +3,8 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake desktop flag-o-matic python-any-r1 xdg verify-sig virtualx +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake desktop flag-o-matic python-any-r1 toolchain-funcs xdg verify-sig virtualx DESCRIPTION="3D photo-realistic skies in real time" HOMEPAGE="https://stellarium.org/ https://github.com/Stellarium/stellarium" @@ -33,8 +33,8 @@ SRC_URI=" LICENSE="GPL-2+ SGI-B-2.0" SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86" -IUSE="debug deep-sky doc gps +lens-distortion media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx" +KEYWORDS="~amd64 ~ppc64" +IUSE="debug deep-sky doc gps +lens-distortion libcxx media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx" # Python interpreter is used while building RemoteControl plugin BDEPEND=" @@ -47,7 +47,9 @@ BDEPEND=" ) verify-sig? ( sec-keys/openpgp-keys-stellarium ) " +# TODO: review need for dev-cpp/tbb after several releases of gcc and clang RDEPEND=" + dev-cpp/tbb:= media-fonts/dejavu sys-libs/zlib gps? ( sci-geosciences/gpsd:=[cxx] ) @@ -58,6 +60,7 @@ RDEPEND=" media? ( virtual/opengl ) !qt6? ( dev-qt/qtcharts:5 + dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5 @@ -77,7 +80,7 @@ RDEPEND=" xlsx? ( dev-libs/qxlsx:=[qt5] ) ) qt6? ( - dev-qt/qtbase:6=[gui,network,widgets] + dev-qt/qtbase:6=[concurrent,gui,network,widgets] dev-qt/qtcharts:6 >=sci-astronomy/calcmysky-0.3.0:=[qt6] gps? ( @@ -94,20 +97,28 @@ RDEPEND=" ) " DEPEND="${RDEPEND} + libcxx? ( dev-cpp/fast_float ) !qt6? ( - dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) ) - qt6? ( dev-qt/qtbase:6=[concurrent] ) " RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/stellarium-0.23.4-unbundle-zlib.patch" + "${FILESDIR}/stellarium-0.24.3-fast_float.patch" + "${FILESDIR}/stellarium-0.24.3-tbb-emit.patch" ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/stellarium.asc + +pkg_setup() { + if tc-is-clang && ! use libcxx && [[ $(tc-get-cxx-stdlib) == libc++ ]]; then + die "When using libc++, please enable USE=libcxx" + fi +} + src_unpack() { # stars-2.0 are not signed if use verify-sig; then @@ -127,6 +138,7 @@ src_prepare() { cmake_src_prepare use debug || append-cppflags -DQT_NO_DEBUG #415769 + rm -r src/external/qtcompress/ || die rm -r src/external/zlib/ || die # for glues_stel aka libtess I couldn't find an upstream with the same API @@ -143,6 +155,7 @@ src_configure() { local mycmakeargs=( -DCCACHE_PROGRAM=no -DCPM_LOCAL_PACKAGES_ONLY=yes + -DUSE_BUNDLED_QTCOMPRESS=no -DENABLE_GPS="$(usex gps)" -DENABLE_MEDIA="$(usex media)" -DENABLE_NLS="$(usex nls)" |