rpms/stellarium
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic version update by autodist [release 24.4-1mamba;Mon Dec 23 2024]

Browse Source
This commit is contained in:
Automatic Build System 2024-12-23 20:29:50 +01:00
parent aa27efaeea
commit 3c92c49d42
2 changed files with 4 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
stellarium-24.3-libtbb-2022.0.0.patch
View File

@ -1,44 +0,0 @@
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.
---
src/core/modules/SolarSystem.cpp | 3 ++-
src/stelMain_pch.hpp | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/modules/SolarSystem.cpp b/src/core/modules/SolarSystem.cpp
index 0e8a6f104be18..83ccdd8178d6b 100644
--- 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>
diff --git a/src/stelMain_pch.hpp b/src/stelMain_pch.hpp
index 9c35362285417..c7677fd19c497 100644
--- 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"

7
stellarium.spec
View File

@ -1,7 +1,7 @@
%define majver %(echo %version | cut -d. -f1-2)
%define buildver %(echo %version | sed "s|[a-z]||")
Name: stellarium
Version: 24.3
Version: 24.4
Release: 1mamba
Summary: Stellarium is a free open source planetarium
Group: Graphical Desktop/Applications/Graphics
@ -10,7 +10,6 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://stellarium.org/
Source: https://github.com/Stellarium/stellarium/releases/download/v%{majver}/stellarium-%{version}.tar.gz
Patch0: stellarium-24.3-libtbb-2022.0.0.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -49,7 +48,6 @@ Stellarium is a free open source planetarium for your computer. It shows a reali
%prep
%setup -q -n %{name}-%{majver}
%patch 0 -p1 -b .libtbb-2022.0.0
%build
%cmake -d build \
@ -84,6 +82,9 @@ Stellarium is a free open source planetarium for your computer. It shows a reali
%{_mandir}/man1/stellarium.1*
%changelog
* Mon Dec 23 2024 Automatic Build System <autodist@openmamba.org> 24.4-1mamba
- automatic version update by autodist
* Tue Nov 19 2024 Automatic Build System <autodist@openmamba.org> 24.3-1mamba
- automatic version update by autodist