Need to unbundle them To bug wranglers: please assign this to me
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01383e452525c74df3ab9892d2b423c7d9f0619 commit a01383e452525c74df3ab9892d2b423c7d9f0619 Author: Alexey Sokolov <sokolov@google.com> AuthorDate: 2020-09-28 10:07:36 +0000 Commit: Joonas Niilola <juippis@gentoo.org> CommitDate: 2020-10-10 07:22:32 +0000 sci-astronomy/stellarium: version 0.20.3 Unbundle several libraries, install docs, update metadata.xml Due to new deps, even though they were bundled already, dropped some keywords (ppc, ppc64, and prefix ones). Will bring them back some of them later. Bug: https://bugs.gentoo.org/745234 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/17639 Signed-off-by: Joonas Niilola <juippis@gentoo.org> sci-astronomy/stellarium/Manifest | 3 + .../files/stellarium-0.20.3-unbundle-indi.patch | 82 ++++++++ .../stellarium-0.20.3-unbundle-qtcompress.patch | 222 +++++++++++++++++++++ .../files/stellarium-0.20.3-unbundle-zlib.patch | 23 +++ sci-astronomy/stellarium/metadata.xml | 53 ++--- sci-astronomy/stellarium/stellarium-0.20.3.ebuild | 135 +++++++++++++ 6 files changed, 492 insertions(+), 26 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fa1fd73e5f62c262c5dcb076cbcd9b9ae81409 commit 32fa1fd73e5f62c262c5dcb076cbcd9b9ae81409 Author: Alexey Sokolov <sokolov@google.com> AuthorDate: 2020-09-28 08:52:49 +0000 Commit: Joonas Niilola <juippis@gentoo.org> CommitDate: 2020-10-10 07:22:32 +0000 dev-libs/qtcompress: new package Unbundled dependency of sci-astronomy/stellarium Bug: https://bugs.gentoo.org/745234 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Signed-off-by: Joonas Niilola <juippis@gentoo.org> dev-libs/qtcompress/Manifest | 1 + .../files/qtcompress-0_p20180513-remove-zlib.patch | 10 ++++ .../qtcompress-0_p20180513-test-include.patch | 13 +++++ dev-libs/qtcompress/metadata.xml | 15 +++++ dev-libs/qtcompress/qtcompress-0_p20180513.ebuild | 64 ++++++++++++++++++++++ 5 files changed, 103 insertions(+)
The patch stellarium-0.20.3-unbundle-indi.patch fails partially. >>> Preparing source in /var/tmp/portage/sci-astronomy/stellarium-0.20.3/work/stellarium-0.20.3 ... * Applying stellarium-0.20.3-unbundle-indi.patch ... patching file plugins/TelescopeControl/src/INDI/CMakeLists.txt patching file plugins/TelescopeControl/src/INDI/INDIConnection.cpp patching file plugins/TelescopeControl/src/INDI/INDIConnection.hpp patching file plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp patching file plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp patching file src/external/CMakeLists.txt Hunk #1 FAILED at 176 (different line endings). 1 out of 1 hunk FAILED -- saving rejects to file src/external/CMakeLists.txt.rej cat src/external/CMakeLists.txt.rej --- src/external/CMakeLists.txt +++ 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)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36feeb097ad8a44604ff04cda47fad12169139d9 commit 36feeb097ad8a44604ff04cda47fad12169139d9 Author: Alexey Sokolov <sokolov@google.com> AuthorDate: 2020-10-10 10:16:19 +0000 Commit: Joonas Niilola <juippis@gentoo.org> CommitDate: 2020-10-10 11:46:01 +0000 sci-astronomy/stellarium: fix patches Somehow CRLF line endings were lost. Some files have CRLF line endings, and some have LF only. Bug: https://bugs.gentoo.org/745234 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Signed-off-by: Joonas Niilola <juippis@gentoo.org> .../files/stellarium-0.20.3-unbundle-indi.patch | 16 ++++---- .../stellarium-0.20.3-unbundle-qtcompress.patch | 44 +++++++++++----------- .../files/stellarium-0.20.3-unbundle-zlib.patch | 28 +++++++------- 3 files changed, 44 insertions(+), 44 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc5e5301c96d1f8a7779405281beace937aa951 commit dfc5e5301c96d1f8a7779405281beace937aa951 Author: Alexey Sokolov <sokolov@google.com> AuthorDate: 2020-10-10 10:16:19 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2020-10-10 13:35:38 +0000 sci-astronomy/stellarium: fix patches Somehow CRLF line endings were lost. Some files have CRLF line endings, and some have LF only. Bug: https://bugs.gentoo.org/745234 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/17871 Signed-off-by: Sam James <sam@gentoo.org>
With https://github.com/Stellarium/stellarium/pull/1295 merged, after the next version bump the ebuild can be cleaned up, and dev-libs/qtcompress removed.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28410219672502497f887670ae4fc9eda6cd13ff commit 28410219672502497f887670ae4fc9eda6cd13ff Author: Alexey Sokolov <alexey+gentoo@asokolov.org> AuthorDate: 2022-11-04 23:11:05 +0000 Commit: Jason Zaman <perfinion@gentoo.org> CommitDate: 2022-11-05 01:32:24 +0000 sci-astronomy/stellarium: add 1.1 Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Closes: https://bugs.gentoo.org/862249 Bug: https://bugs.gentoo.org/745234 Signed-off-by: Jason Zaman <perfinion@gentoo.org> sci-astronomy/stellarium/Manifest | 3 + .../stellarium/files/stellarium-1.1-qxlsx.patch | 11 ++ sci-astronomy/stellarium/metadata.xml | 3 + sci-astronomy/stellarium/stellarium-1.1.ebuild | 172 +++++++++++++++++++++ 4 files changed, 189 insertions(+)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0885aa386d8451b6750c7c7510dc9ebd412bfb5 commit f0885aa386d8451b6750c7c7510dc9ebd412bfb5 Author: Joonas Niilola <juippis@gentoo.org> AuthorDate: 2023-02-23 07:03:29 +0000 Commit: Joonas Niilola <juippis@gentoo.org> CommitDate: 2023-02-23 07:03:29 +0000 profiles: update & move the qtcompress package.mask message Bug: https://bugs.gentoo.org/745234 Signed-off-by: Joonas Niilola <juippis@gentoo.org> profiles/package.mask | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce29905639d4dc8d183ccc203509fc96dc05479 commit 9ce29905639d4dc8d183ccc203509fc96dc05479 Author: David Seifert <soap@gentoo.org> AuthorDate: 2023-03-26 10:56:40 +0000 Commit: David Seifert <soap@gentoo.org> CommitDate: 2023-03-26 10:56:40 +0000 dev-libs/qtcompress: treeclean Bug: https://bugs.gentoo.org/745234 Signed-off-by: David Seifert <soap@gentoo.org> dev-libs/qtcompress/Manifest | 1 - .../files/qtcompress-0_p20180513-nogui.patch | 10 ---- .../files/qtcompress-0_p20180513-remove-zlib.patch | 10 ---- .../qtcompress-0_p20180513-test-include.patch | 13 ----- dev-libs/qtcompress/metadata.xml | 15 ----- dev-libs/qtcompress/qtcompress-0_p20180513.ebuild | 65 ---------------------- profiles/package.mask | 5 -- 7 files changed, 119 deletions(-)
