Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package stellarium for openSUSE:Factory
checked in at 2022-10-14 15:41:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/stellarium (Old)
and /work/SRC/openSUSE:Factory/.stellarium.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stellarium"
Fri Oct 14 15:41:05 2022 rev:58 rq:1010338 version:1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/stellarium/stellarium.changes 2022-07-18
18:33:29.689719717 +0200
+++ /work/SRC/openSUSE:Factory/.stellarium.new.2275/stellarium.changes
2022-10-14 15:41:45.895840815 +0200
@@ -1,0 +2,20 @@
+Sun Oct 9 20:29:19 UTC 2022 - Arjen de Korte <suse+bu...@de-korte.org>
+
+- update to 1.0:
+ * A new, much better skylight model
+ * Many details around eclipses
+ * Updated Observation List features
+ * New features in AstroCalc tool
+ * HiDPI improvements
+ * Better dithering
+ * New skyculture: Samoan
+ * Updated several skycultures
+ * Updates in Angle Measure, Satellites, Oculars, Remote Control,
+ Pulsars plugins
+ * Many more bugfixes.
+- Add patch from upstream to allow building with Qt >= 6.4.0
+ + use-QString-instead-of-QByteArray.patch
+- Add patch from upstream to make XLSX support optional
+ + make-support-XLSX-files-optional.patch
+
+-------------------------------------------------------------------
Old:
----
stellarium-0.22.2.tar.gz
stellarium-0.22.2.tar.gz.asc
New:
----
make-support-XLSX-files-optional.patch
stellarium-1.0.tar.gz
stellarium-1.0.tar.gz.asc
use-QString-instead-of-QByteArray.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ stellarium.spec ++++++
--- /var/tmp/diff_new_pack.z9gtHP/_old 2022-10-14 15:41:51.331849892 +0200
+++ /var/tmp/diff_new_pack.z9gtHP/_new 2022-10-14 15:41:51.335849899 +0200
@@ -16,10 +16,14 @@
#
-%global qt_version %(qtpaths --qt-version | awk -F. '{ printf "%02d%02d%02d",
$1, $2, $3 }')
+%if 0%{?suse_version} > 1500
+%bcond_with Qt5
+%else
+%bcond_without Qt5
+%endif
Name: stellarium
-Version: 0.22.2
+Version: 1.0
Release: 0
Summary: Astronomical Sky Simulator
License: GPL-2.0-or-later
@@ -28,16 +32,27 @@
Source0:
https://github.com/Stellarium/stellarium/releases/download/v%{version}/stellarium-%{version}.tar.gz
Source1:
https://github.com/Stellarium/stellarium/releases/download/v%{version}/stellarium-%{version}.tar.gz.asc
Source2: %{name}.keyring
-BuildRequires: cmake >= 2.8.12
+# PATCH-FIX-UPSTREAM https://github.com/Stellarium/stellarium/issues/2709
+Patch0: use-QString-instead-of-QByteArray.patch
+# PATCH-FEATURE-UPSTREAM https://github.com/Stellarium/stellarium/pull/2723
+Patch1: make-support-XLSX-files-optional.patch
+BuildRequires: cmake >= 3.16.0
BuildRequires: fdupes
-BuildRequires: gcc-c++ >= 4.8.1
+BuildRequires: gcc-c++ >= 7
BuildRequires: hicolor-icon-theme
-BuildRequires: libqt5-qtpaths
-BuildRequires: pkgconfig
+BuildRequires: libnova-devel
+BuildRequires: libxkbcommon-devel >= 0.5.0
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(libindi)
+BuildRequires: pkgconfig(zlib)
+%if %{with Qt5}
+BuildRequires: libqt5-qtpaths
+BuildRequires: libQt5Core-private-headers-devel >= 5.9.0
+BuildRequires: libQt5Gui-private-headers-devel >= 5.9.0
BuildRequires: pkgconfig(Qt5Charts)
BuildRequires: pkgconfig(Qt5Concurrent)
-BuildRequires: pkgconfig(Qt5Gui) >= 5.9.0
+BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5MultimediaWidgets)
BuildRequires: pkgconfig(Qt5Network)
@@ -49,9 +64,26 @@
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5UiTools)
BuildRequires: pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(dri)
-BuildRequires: pkgconfig(glu)
-BuildRequires: pkgconfig(zlib)
+%else
+BuildRequires: qt6-core-private-devel >= 6.2.0
+BuildRequires: qt6-gui-private-devel >= 6.2.0
+BuildRequires: pkgconfig(Qt6Charts)
+BuildRequires: pkgconfig(Qt6Concurrent)
+BuildRequires: pkgconfig(Qt6Gui)
+BuildRequires: pkgconfig(Qt6Linguist)
+BuildRequires: pkgconfig(Qt6Multimedia)
+BuildRequires: pkgconfig(Qt6MultimediaWidgets)
+BuildRequires: pkgconfig(Qt6Network)
+BuildRequires: pkgconfig(Qt6OpenGL)
+BuildRequires: pkgconfig(Qt6Positioning)
+BuildRequires: pkgconfig(Qt6PrintSupport)
+BuildRequires: pkgconfig(Qt6Qml)
+BuildRequires: pkgconfig(Qt6SerialPort)
+BuildRequires: pkgconfig(Qt6Test)
+BuildRequires: pkgconfig(Qt6UiTools)
+BuildRequires: pkgconfig(Qt6Widgets)
+Requires: qt6-multimedia
+%endif
%if 0%{?is_opensuse}
BuildRequires: pkgconfig(libgps)
%endif
@@ -62,22 +94,16 @@
binoculars or a small telescope.
%prep
-%autosetup
+%autosetup -p1
%build
export QT_HASH_SEED=0
-%cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_POLICY_DEFAULT_CMP0063=NEW \
-%if %{qt_version} >= 051500 && %{qt_version} < 051503 && 0%{?suse_version} <
1550
-%ifarch i586
- -DENABLE_NLS=OFF \
-%endif
-%endif
- -DCMAKE_CXX_VISIBILITY_PRESET=hidden -DCMAKE_VISIBILITY_INLINES_HIDDEN=1
-%if %{qt_version} >= 051500 && %{qt_version} < 051503 && 0%{?suse_version} <
1550
-%make_jobs -j1
-%else
-%make_jobs
-%endif
+%cmake -DCMAKE_BUILD_TYPE=Release \
+ -DCPM_USE_LOCAL_PACKAGES=yes \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DENABLE_SHOWMYSKY=OFF \
+ -DENABLE_XLSX=OFF
+%cmake_build
%install
%cmake_install
++++++ make-support-XLSX-files-optional.patch ++++++
++++ 1245 lines (skipped)
++++++ stellarium-0.22.2.tar.gz -> stellarium-1.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/stellarium/stellarium-0.22.2.tar.gz
/work/SRC/openSUSE:Factory/.stellarium.new.2275/stellarium-1.0.tar.gz differ:
char 5, line 1
++++++ use-QString-instead-of-QByteArray.patch ++++++
>From 02feef10d62d8fdfae5d02b9217593c29558c7fd Mon Sep 17 00:00:00 2001
From: Georg Zotti <georg.zo...@univie.ac.at>
Date: Sun, 2 Oct 2022 13:51:26 +0200
Subject: [PATCH] Use QString instead of QByteArray (Fix #2709)
---
plugins/Satellites/src/Satellite.cpp | 16 ++++++++--------
plugins/Satellites/src/Satellite.hpp | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/plugins/Satellites/src/Satellite.cpp
b/plugins/Satellites/src/Satellite.cpp
index ff97eb2d8ac..589fd5ffee4 100644
--- a/plugins/Satellites/src/Satellite.cpp
+++ b/plugins/Satellites/src/Satellite.cpp
@@ -251,8 +251,8 @@ QVariantMap Satellite::getMap(void)
map["stdMag"] = stdMag;
map["rcs"] = RCS;
map["status"] = status;
- map["tle1"] = tleElements.first.data();
- map["tle2"] = tleElements.second.data();
+ map["tle1"] = tleElements.first;
+ map["tle2"] = tleElements.second;
if (!description.isEmpty())
map["description"] = description;
@@ -544,8 +544,8 @@ QVariantMap Satellite::getInfoMap(const StelCore *core)
const
map.insert("description", QString(description).replace("\n", " - "));
map.insert("catalog", id);
- map.insert("tle1", tleElements.first.data());
- map.insert("tle2", tleElements.second.data());
+ map.insert("tle1", tleElements.first);
+ map.insert("tle2", tleElements.second);
map.insert("tle-epoch", tleEpoch);
if (!internationalDesignator.isEmpty())
@@ -788,8 +788,8 @@ void Satellite::setNewTleElements(const QString& tle1,
const QString& tle2)
delete old;
}
- tleElements.first = tle1.toUtf8();
- tleElements.second = tle2.toUtf8();
+ tleElements.first = tle1;
+ tleElements.second = tle2;
pSatWrapper = new gSatWrapper(id, tle1, tle2);
orbitPoints.clear();
@@ -802,8 +802,8 @@ void Satellite::setNewTleElements(const QString& tle1,
const QString& tle2)
void Satellite::recomputeSatData()
{
- calculateEpochFromLine1(tleElements.first.data());
- calculateSatDataFromLine2(tleElements.second.data());
+ calculateEpochFromLine1(tleElements.first);
+ calculateSatDataFromLine2(tleElements.second);
}
void Satellite::update(double)
diff --git a/plugins/Satellites/src/Satellite.hpp
b/plugins/Satellites/src/Satellite.hpp
index f6120996527..e0be4e545f0 100644
--- a/plugins/Satellites/src/Satellite.hpp
+++ b/plugins/Satellites/src/Satellite.hpp
@@ -313,7 +313,7 @@ class Satellite : public StelObject
int status;
//! Contains the J2000 position.
Vec3d XYZ;
- QPair< QByteArray, QByteArray > tleElements;
+ QPair< QString, QString> tleElements;
double height, range, rangeRate;
QList<CommLink> comms;
Vec3f hintColor;
