Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package stellarium for openSUSE:Factory
checked in at 2021-09-29 20:19:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/stellarium (Old)
and /work/SRC/openSUSE:Factory/.stellarium.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stellarium"
Wed Sep 29 20:19:02 2021 rev:52 rq:922101 version:0.21.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/stellarium/stellarium.changes 2021-06-26
21:25:52.891376458 +0200
+++ /work/SRC/openSUSE:Factory/.stellarium.new.1899/stellarium.changes
2021-09-29 20:20:26.675121602 +0200
@@ -1,0 +2,21 @@
+Mon Sep 27 19:23:15 UTC 2021 - Arjen de Korte <suse+bu...@de-korte.org>
+
+- Update to 0.21.2:
+ * Annual aberration correction. Planet positions are finally very
+ accurate!
+ * Bookmarks replaced by Observation Lists
+ * Politically neutral geonames
+ * Right-click opens plugin configuration
+ * Improved computation of rising, transit, setting times
+ * "Goto next twilight" functionality
+ * Two new Greek skycultures
+ * Updated Mul-Apin skyculture with new artwork
+ * Improved fidelity of Lunar eclipses
+ * Fixed display of stellar proper motion
+ * Many fixes in core and plugins
+- Add patches from upstream to allow building with Qt >= 5.9.0
+ + stellarium-documentation.patch
+ + stellarium-remove-qt-5_12-code.patch
+ + stellarium-minimum-qt-5_9.patch
+
+-------------------------------------------------------------------
Old:
----
stellarium-0.21.1.tar.gz
stellarium-0.21.1.tar.gz.asc
New:
----
stellarium-0.21.2.tar.gz
stellarium-0.21.2.tar.gz.asc
stellarium-documentation.patch
stellarium-minimum-qt-5_9.patch
stellarium-remove-qt-5_12-code.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ stellarium.spec ++++++
--- /var/tmp/diff_new_pack.erSbmO/_old 2021-09-29 20:20:31.127128058 +0200
+++ /var/tmp/diff_new_pack.erSbmO/_new 2021-09-29 20:20:31.131128064 +0200
@@ -19,7 +19,7 @@
%global qt_version %(qtpaths --qt-version | awk -F. '{ printf "%02d%02d%02d",
$1, $2, $3 }')
Name: stellarium
-Version: 0.21.1
+Version: 0.21.2
Release: 0
Summary: Astronomical Sky Simulator
License: GPL-2.0-or-later
@@ -28,6 +28,9 @@
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
+Patch0: stellarium-remove-qt-5_12-code.patch
+Patch1: stellarium-minimum-qt-5_9.patch
+Patch2: stellarium-documentation.patch
BuildRequires: cmake >= 2.8.11
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -35,19 +38,19 @@
BuildRequires: libqt5-qtpaths
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(Qt5Concurrent) >= 5.7.0
-BuildRequires: pkgconfig(Qt5Gui) >= 5.7.0
-BuildRequires: pkgconfig(Qt5Multimedia) >= 5.7.0
-BuildRequires: pkgconfig(Qt5MultimediaWidgets) >= 5.7.0
-BuildRequires: pkgconfig(Qt5Network) >= 5.7.0
-BuildRequires: pkgconfig(Qt5OpenGL) >= 5.7.0
-BuildRequires: pkgconfig(Qt5Positioning) >= 5.7.0
+BuildRequires: pkgconfig(Qt5Concurrent)
+BuildRequires: pkgconfig(Qt5Gui) >= 5.9.0
+BuildRequires: pkgconfig(Qt5Multimedia)
+BuildRequires: pkgconfig(Qt5MultimediaWidgets)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5OpenGL)
+BuildRequires: pkgconfig(Qt5Positioning)
BuildRequires: pkgconfig(Qt5PrintSupport)
-BuildRequires: pkgconfig(Qt5Script) >= 5.7.0
+BuildRequires: pkgconfig(Qt5Script)
BuildRequires: pkgconfig(Qt5SerialPort)
-BuildRequires: pkgconfig(Qt5Test) >= 5.7.0
-BuildRequires: pkgconfig(Qt5UiTools) >= 5.7.0
-BuildRequires: pkgconfig(Qt5Widgets) >= 5.7.0
+BuildRequires: pkgconfig(Qt5Test)
+BuildRequires: pkgconfig(Qt5UiTools)
+BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(dri)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(zlib)
@@ -62,6 +65,9 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
export QT_HASH_SEED=0
++++++ stellarium-0.21.1.tar.gz -> stellarium-0.21.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/stellarium/stellarium-0.21.1.tar.gz
/work/SRC/openSUSE:Factory/.stellarium.new.1899/stellarium-0.21.2.tar.gz
differ: char 5, line 1
++++++ stellarium-documentation.patch ++++++
>From 3966d0fc28bbbb904da9025660a55bc0c8ff2d62 Mon Sep 17 00:00:00 2001
From: "Alexander V. Wolf" <alex.v.w...@gmail.com>
Date: Tue, 28 Sep 2021 17:08:11 +0700
Subject: [PATCH] Update BUILDIND.md file (fix #1927)
---
BUILDING.md | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/BUILDING.md b/BUILDING.md
index 077f15531ed..5b8ab62f271 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -41,7 +41,7 @@ your distribution. Here's a list.
- A C++ compiler able to compile C++11 code ([GCC](https://gcc.gnu.org/) 4.8.1
or later, Clang 3.3 or later, MSVC 2015 or later)
- [CMake](http://www.cmake.org/) 2.8.12 or later - buildsystem used by many
open source projects
-- [Qt Framework](http://www.qt.io/) 5.7.0 or later
+- [Qt Framework](http://www.qt.io/) 5.9.0 or later
- [OpenGL](https://www.opengl.org/) - graphics library
- [Zlib](http://www.zlib.net) - compression library
@@ -79,19 +79,19 @@ sudo yum install cmake gcc graphviz doxygen gettext git \
Stellarium tracks the recent Qt releases fairly closely and as such many Linux
distribution repositories do not contain an up-to-date enough version for
building Stellarium. In the case of Ubuntu, the ''backports'' repository is
often good enough, but there may be a need to install it "outside" your package
manager. Here's how.
-The Qt development team provides binary installers. If you want to build Qt
yourself from source, this is fine but it will take a ''long'' time. We
recommend the following procedure for manually installing the latest Qt
(required: 5.7 or above at the moment):
+The Qt development team provides binary installers. If you want to build Qt
yourself from source, this is fine but it will take a ''long'' time. We
recommend the following procedure for manually installing the latest Qt
(required: 5.9 or above at the moment):
- Download the Linux/X11 package from [Qt
Company](http://www.qt.io/download-open-source/). Choose 32/64 bit as
appropriate.
- Install it to `/opt/Qt5`
- When you want to build Stellarium, execute these commands to set up the
environment so that the new Qt is used (for 64-bit package):
```
-export QTDIR=/opt/Qt5/5.12.2/gcc_64
+export QTDIR=/opt/Qt5/5.12.11/gcc_64
export PATH=$QTDIR/bin:$PATH
export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
```
- After installation, you should write a script which sets `LD_LIBRARY_PATH`
and then calls Stellarium:
```
#!/bin/sh
-export QTDIR=/opt/Qt5/5.12.2/gcc_64
+export QTDIR=/opt/Qt5/5.12.11/gcc_64
export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
./stellarium
```
@@ -135,20 +135,20 @@ $ brew install qt
export PATH=/usr/local/opt/qt/bin:$PATH
```
-You may using the distribution from the Qt Company to install the [latest
stable version](https://www.qt.io/download-qt-installer) of Qt. In this case
adding Qt to your PATH environment variable will to adding to your
`.bash_profile` file the following line (for example we installed Qt 5.12.2):
+You may using the distribution from the Qt Company to install the [latest
stable version](https://www.qt.io/download-qt-installer) of Qt. In this case
adding Qt to your PATH environment variable will to adding to your
`.bash_profile` file the following line (for example we installed Qt 5.12.11):
```
export PATH=~/Qt/5.12/clang_64/bin:$PATH
```
#### Windows
-- Install the [Microsoft Visual Studio Community
2017](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15)
or [Microsoft Visual Studio Community
2019](https://visualstudio.microsoft.com/downloads/) (or "better" - e.g.
Professional) from Microsoft Website. Qt5.15 requires MSVC2019.
+- Install the [Microsoft Visual Studio Community
2017](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15)
or [Microsoft Visual Studio Community
2019](https://visualstudio.microsoft.com/downloads/) (or "better" - e.g.
Professional) from Microsoft Website. Qt 5.15 requires MSVC2019.
- To get the source code of Stellarium you need to install some git
environment. [Git for Windows](https://git-scm.com/download/win) seems ok, or
the Git Bash and Git GUI, whatever seems suitable for you. But it is not
necessary.
-- Get the [latest version of Qt from Qt
Company](http://www.qt.io/download-open-source/). We recommend to use Qt 5.9 or
later. You must select Qt Script and msvc2017/msvc2019 among so many
checkboxes.
+- Get the [latest version of Qt from Qt
Company](http://www.qt.io/download-open-source/). We recommend to use Qt 5.12
or later. You must select Qt Script and msvc2017/msvc2019 among so many
checkboxes.
After installing all required libraries and tools you should configure the
build environment.
-Add `C:\Qt\Qt5.15.2` to your `PATH` variable - you should add string
`C:\Qt\Qt5.15.2\msvc2019;C:\Qt\Qt5.15.2\msvc2019\bin` for 32-bit or
`C:\Qt\Qt5.15.2\msvc2019_64;C:\Qt\Qt5.15.2\msvc2019_64\bin` for 64-bit to
`PATH` variable.
+Add `C:\Qt\Qt5.15.11` to your `PATH` variable - you should add string
`C:\Qt\Qt5.15.11\msvc2019;C:\Qt\Qt5.15.11\msvc2019\bin` for 32-bit or
`C:\Qt\Qt5.15.11\msvc2019_64;C:\Qt\Qt5.15.11\msvc2019_64\bin` for 64-bit to
`PATH` variable.
(Replace the version numbers of Qt and the version of Visual Studio
(2017/2019) with the version that you have installed)
**Known limitations with Qt 5.15.x:**
@@ -159,9 +159,9 @@ Add `C:\Qt\Qt5.15.2` to your `PATH` variable - you should
add string `C:\Qt\Qt5.
#### Windows (static)
-You can build a static version using MSVC-static kit (for example we installed
Qt 5.15.2 with MSVC2019):
+You can build a static version using MSVC-static kit (for example we installed
Qt 5.15.11 with MSVC2019):
-To prepare a static kit, prepare src package of Qt 5.15.2, and configure
compilation tool (Python, Ruby, Perl and Visual Studio 2019). Enter src folder:
+To prepare a static kit, prepare src package of Qt 5.15.11, and configure
compilation tool (Python, Ruby, Perl and Visual Studio 2019). Enter src folder:
```
configure.bat -static -prefix "D:\Qt\msvc2019_static" -confirm-license
-opensource -debug-and-release -platform win32-msvc -nomake examples -nomake
tests -plugin-sql-sqlite -plugin-sql-odbc -qt-zlib -qt-libpng -qt-libjpeg
-opengl desktop -mp
@@ -169,7 +169,7 @@ nmake
nmake install
```
-When finishing compilation, configure kit in Qt Creator. Clone Kit "Desktop
Qt5.15.2 MSVC" to "Desktop Qt5.15.2 MSVC(static)". Then configure CMake
Generator with NMake Makefiles JOM + Extra generator: CodeBlocks.
+When finishing compilation, configure kit in Qt Creator. Clone Kit "Desktop Qt
5.15.11 MSVC" to "Desktop Qt 5.15.11 MSVC (static)". Then configure CMake
Generator with NMake Makefiles JOM + Extra generator: CodeBlocks.
Finally, just open CMakeLists.txt in Qt Creator and build it with MSVC-static
kit.
@@ -189,9 +189,9 @@ https://github.com/Stellarium/stellarium/releases
Do this command in a terminal (if you prefer, you might use arK or some other
graphical archive tool):
```
-$ tar zxf stellarium-0.20.2.tar.gz
+$ tar zxf stellarium-0.21.2.tar.gz
```
-You should now have a directory `stellarium-0.20.2` with the source code in it.
+You should now have a directory `stellarium-0.21.2` with the source code in it.
### Clone project from GitHub
@@ -221,7 +221,7 @@ You can
[download](https://github.com/Stellarium/stellarium/archive/master.zip)
#### Windows specifics
-On Windows save the file (`master.zip` or `stellarium-0.20.2.tar.gz`) to the
`C:/Devel` directory as example. You will need
+On Windows save the file (`master.zip` or `stellarium-0.21.2.tar.gz`) to the
`C:/Devel` directory as example. You will need
a decompression program installed in Windows, for example
[7-Zip](http://www.7-zip.org/).
The root of the source tree will be `C:/Devel/stellarium` for simplicity.
++++++ stellarium-minimum-qt-5_9.patch ++++++
>From 87b12dfbd2e4abb79de115fdaa7dce4699df11fd Mon Sep 17 00:00:00 2001
From: "Alexander V. Wolf" <alex.v.w...@gmail.com>
Date: Tue, 28 Sep 2021 16:49:17 +0700
Subject: [PATCH] Minimal Qt is 5.9 now
---
CMakeLists.txt | 4 ++--
plugins/Oculars/src/Oculars.cpp | 2 +-
src/core/StelApp.cpp | 6 ------
src/core/StelModule.hpp | 4 ----
4 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa1dcaf3f7..77ab4d2dd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,8 +42,8 @@ ADD_DEFINITIONS(-DPACKAGE_VERSION="${PACKAGE_VERSION}")
ADD_DEFINITIONS(-DCOPYRIGHT_YEARS="${COPYRIGHT_YEARS}")
ADD_DEFINITIONS(-DSTELLARIUM_SOURCE_DIR="${PROJECT_SOURCE_DIR}")
-# currently Qt 5.9/5.12 is recommended
-SET(MINIMAL_QT_VERSION "5.7.0")
+# currently Qt 5.12 is recommended
+SET(MINIMAL_QT_VERSION "5.9.0")
# TODO: Check real minimal supported version of GPSD API
SET(MINIMAL_GPS_API_VERSION "6.0")
diff --git a/plugins/Oculars/src/Oculars.cpp b/plugins/Oculars/src/Oculars.cpp
index 0f1cae34bc..c3a5a0a85d 100644
--- a/plugins/Oculars/src/Oculars.cpp
+++ b/plugins/Oculars/src/Oculars.cpp
@@ -1227,7 +1227,7 @@ void Oculars::displayPopupMenu()
}
}
-#if QT_VERSION >= 0x050700 && defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
popup->showTearOffMenu(QCursor::pos());
#endif
popup->exec(QCursor::pos());
diff --git a/src/core/StelApp.cpp b/src/core/StelApp.cpp
index 57f2a17599..0aaf750b96 100644
--- a/src/core/StelApp.cpp
+++ b/src/core/StelApp.cpp
@@ -434,9 +434,7 @@ void StelApp::init(QSettings* conf)
SplashScreen::showMessage(q_("Initializing network access..."));
networkAccessManager = new QNetworkAccessManager(this);
- #if QT_VERSION >= 0x050900
networkAccessManager->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
- #endif
SplashScreen::showMessage(q_("Initializing network disk cache..."));
// Activate http cache if Qt version >= 4.5
QNetworkDiskCache* cache = new QNetworkDiskCache(networkAccessManager);
@@ -1100,12 +1098,8 @@ QString StelApp::getViewportEffect() const
void StelApp::dumpModuleActionPriorities(StelModule::StelModuleActionName
actionName) const
{
const QList<StelModule*> modules = moduleMgr->getCallOrders(actionName);
- #if QT_VERSION >= 0x050500
QMetaEnum me = QMetaEnum::fromType<StelModule::StelModuleActionName>();
qDebug() << "Module Priorities for action named" <<
me.valueToKey(actionName);
- #else
- qDebug() << "Module Priorities for action named" << actionName;
- #endif
for (auto* module : modules)
{
diff --git a/src/core/StelModule.hpp b/src/core/StelModule.hpp
index 83376e268b..0040f51ff4 100644
--- a/src/core/StelModule.hpp
+++ b/src/core/StelModule.hpp
@@ -120,9 +120,7 @@ class StelModule : public QObject
ReplaceSelection, //!< Set the StelObject as the new list
of selected ones.
RemoveFromSelection //!< Subtract the StelObject from the
current list of selected ones.
};
- #if QT_VERSION >= 0x050500
Q_ENUM(StelModuleSelectAction)
- #endif
//! Define the possible action for which an order is defined
enum StelModuleActionName
{
@@ -132,9 +130,7 @@ class StelModule : public QObject
ActionHandleMouseMoves, //!< Action associated to the
handleMouseMoves() method
ActionHandleKeys //!< Action associated to the
handleKeys() method
};
- #if QT_VERSION >= 0x050500
Q_ENUM(StelModuleActionName)
- #endif
//! Return the value defining the order of call for the given action
//! For example if stars.callOrder[ActionDraw] == 10 and
constellation.callOrder[ActionDraw] == 11,
//! the stars module will be drawn before the constellations
++++++ stellarium-remove-qt-5_12-code.patch ++++++
>From 975f75166936ef2c9baa9fca18e4e66e1d6f5982 Mon Sep 17 00:00:00 2001
From: "Alexander V. Wolf" <alex.v.w...@gmail.com>
Date: Mon, 27 Sep 2021 23:39:02 +0700
Subject: [PATCH] Stupid fixes
---
README.md | 2 +-
.../src/gui/onlineQueriesDialog.ui | 27 -------------------
2 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/README.md b/README.md
index 0d9e67ba74..c07bd2fea8 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you are new to Stellarium, go to
[www.stellarium.org](https://www.stellarium.
## Installation Instructions & Quick Start
-Please refer to the [User Guide, Getting Started
section](https://github.com/Stellarium/stellarium/releases/download/v0.21.1/stellarium_user_guide-0.21.1-1.pdf).
+Please refer to the [User Guide, Getting Started
section](https://github.com/Stellarium/stellarium/releases/download/v0.21.2/stellarium_user_guide-0.21.2-1.pdf).
## Get & build the code
diff --git a/plugins/OnlineQueries/src/gui/onlineQueriesDialog.ui
b/plugins/OnlineQueries/src/gui/onlineQueriesDialog.ui
index bcb76ffe7c..5cc8310e17 100644
--- a/plugins/OnlineQueries/src/gui/onlineQueriesDialog.ui
+++ b/plugins/OnlineQueries/src/gui/onlineQueriesDialog.ui
@@ -104,15 +104,6 @@
</color>
</brush>
</colorrole>
- <colorrole role="PlaceholderText">
- <brush brushstyle="NoBrush">
- <color alpha="128">
- <red>194</red>
- <green>194</green>
- <blue>195</blue>
- </color>
- </brush>
- </colorrole>
</active>
<inactive>
<colorrole role="WindowText">
@@ -133,15 +124,6 @@
</color>
</brush>
</colorrole>
- <colorrole role="PlaceholderText">
- <brush brushstyle="NoBrush">
- <color alpha="128">
- <red>194</red>
- <green>194</green>
- <blue>195</blue>
- </color>
- </brush>
- </colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
@@ -162,15 +144,6 @@
</color>
</brush>
</colorrole>
- <colorrole role="PlaceholderText">
- <brush brushstyle="NoBrush">
- <color alpha="128">
- <red>194</red>
- <green>194</green>
- <blue>195</blue>
- </color>
- </brush>
- </colorrole>
</disabled>
</palette>
</property>
