automatic version update by autodist [release 24.3-1mamba;Tue Nov 19 2024]
This commit is contained in:
parent
a6f3340364
commit
aa27efaeea
44
stellarium-24.3-libtbb-2022.0.0.patch
Normal file
44
stellarium-24.3-libtbb-2022.0.0.patch
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
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"
|
@ -1,7 +1,7 @@
|
|||||||
%define majver %(echo %version | cut -d. -f1-2)
|
%define majver %(echo %version | cut -d. -f1-2)
|
||||||
%define buildver %(echo %version | sed "s|[a-z]||")
|
%define buildver %(echo %version | sed "s|[a-z]||")
|
||||||
Name: stellarium
|
Name: stellarium
|
||||||
Version: 24.2
|
Version: 24.3
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: Stellarium is a free open source planetarium
|
Summary: Stellarium is a free open source planetarium
|
||||||
Group: Graphical Desktop/Applications/Graphics
|
Group: Graphical Desktop/Applications/Graphics
|
||||||
@ -10,20 +10,28 @@ Distribution: openmamba
|
|||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: https://stellarium.org/
|
URL: https://stellarium.org/
|
||||||
Source: https://github.com/Stellarium/stellarium/releases/download/v%{majver}/stellarium-%{version}.tar.gz
|
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
|
License: GPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
BuildRequires: libQXlsxQt6-devel
|
BuildRequires: libQXlsxQt6-devel
|
||||||
|
BuildRequires: libQt6Concurrent
|
||||||
|
BuildRequires: libQt6Core
|
||||||
|
BuildRequires: libQt6Gui
|
||||||
|
BuildRequires: libQt6Network
|
||||||
|
BuildRequires: libQt6OpenGL
|
||||||
|
BuildRequires: libQt6PrintSupport
|
||||||
BuildRequires: libQt6SerialPort-devel
|
BuildRequires: libQt6SerialPort-devel
|
||||||
|
BuildRequires: libQt6Widgets
|
||||||
BuildRequires: libexiv2-devel
|
BuildRequires: libexiv2-devel
|
||||||
BuildRequires: libgcc
|
BuildRequires: libgcc
|
||||||
BuildRequires: libglvnd-devel
|
BuildRequires: libglvnd-devel
|
||||||
BuildRequires: libgps-devel
|
BuildRequires: libgps-devel
|
||||||
BuildRequires: libnlopt-devel
|
BuildRequires: libnlopt-devel
|
||||||
BuildRequires: libstdc++6-devel
|
BuildRequires: libstdc++6-devel
|
||||||
|
BuildRequires: libtbb-devel
|
||||||
BuildRequires: libxkbcommon-devel
|
BuildRequires: libxkbcommon-devel
|
||||||
BuildRequires: libz-devel
|
BuildRequires: libz-devel
|
||||||
BuildRequires: qt6-qtbase-devel
|
|
||||||
BuildRequires: qt6-qtcharts-devel
|
BuildRequires: qt6-qtcharts-devel
|
||||||
BuildRequires: qt6-qtdeclarative-devel
|
BuildRequires: qt6-qtdeclarative-devel
|
||||||
BuildRequires: qt6-qtmultimedia-devel
|
BuildRequires: qt6-qtmultimedia-devel
|
||||||
@ -41,6 +49,7 @@ Stellarium is a free open source planetarium for your computer. It shows a reali
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{majver}
|
%setup -q -n %{name}-%{majver}
|
||||||
|
%patch 0 -p1 -b .libtbb-2022.0.0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake -d build \
|
%cmake -d build \
|
||||||
@ -56,14 +65,6 @@ Stellarium is a free open source planetarium for your computer. It shows a reali
|
|||||||
%install
|
%install
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
%makeinstall -C build
|
%makeinstall -C build
|
||||||
#mkdir -p %{buildroot}%{_datadir}/applications
|
|
||||||
#mkdir -p %{buildroot}%{_datadir}/icons
|
|
||||||
#cp %SOURCE1 %{buildroot}%{_datadir}/applications/
|
|
||||||
#cp %{buildroot}%{_datadir}/stellarium/data/stellarium.ico %{buildroot}%{_datadir}/icons/
|
|
||||||
|
|
||||||
#%find_lang %{name}
|
|
||||||
#%find_lang %{name}-skycultures
|
|
||||||
#cat %{name}-skycultures.lang >> %{name}.lang
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
@ -83,6 +84,9 @@ Stellarium is a free open source planetarium for your computer. It shows a reali
|
|||||||
%{_mandir}/man1/stellarium.1*
|
%{_mandir}/man1/stellarium.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 19 2024 Automatic Build System <autodist@openmamba.org> 24.3-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Sun Jun 23 2024 Automatic Build System <autodist@openmamba.org> 24.2-1mamba
|
* Sun Jun 23 2024 Automatic Build System <autodist@openmamba.org> 24.2-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user