Hello community, here is the log from the commit of package stellarium for openSUSE:Factory checked in at 2017-06-20 09:40:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stellarium (Old) and /work/SRC/openSUSE:Factory/.stellarium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stellarium" Tue Jun 20 09:40:09 2017 rev:26 rq:504504 version:0.15.2 Changes: -------- --- /work/SRC/openSUSE:Factory/stellarium/stellarium.changes 2017-04-06 11:03:08.623158519 +0200 +++ /work/SRC/openSUSE:Factory/.stellarium.new/stellarium.changes 2017-06-20 09:40:10.733899231 +0200 @@ -1,0 +2,5 @@ +Sun Jun 18 17:14:21 UTC 2017 - r...@fthiessen.de + +- Added fix-qt-5.9-bzr-rev9474.patch to fix build with qt 5.9 + +------------------------------------------------------------------- New: ---- fix-qt-5.9-bzr-rev9474.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stellarium.spec ++++++ --- /var/tmp/diff_new_pack.ZU3se8/_old 2017-06-20 09:40:17.280976144 +0200 +++ /var/tmp/diff_new_pack.ZU3se8/_new 2017-06-20 09:40:17.284975579 +0200 @@ -24,6 +24,8 @@ Group: Productivity/Scientific/Astronomy Url: http://stellarium.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM - fix-qt-5.9-bzr-rev9474.patch -- Fix build with QT >= 5.9, from https://bazaar.launchpad.net/~stellarium/stellarium/trunk/revision/9474 +Patch0: fix-qt-5.9-bzr-rev9474.patch BuildRequires: cmake >= 2.8.11 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -55,6 +57,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake -DENABLE_SOUND=1 ++++++ fix-qt-5.9-bzr-rev9474.patch ++++++ diff -Nur stellarium-0.15.2/CMakeLists.txt new/CMakeLists.txt --- stellarium-0.15.2/CMakeLists.txt 2017-03-21 07:28:11.000000000 +0100 +++ new/CMakeLists.txt 2017-06-18 19:11:44.090661562 +0200 @@ -331,10 +331,10 @@ ########### Find packages ########### FIND_PACKAGE(Qt5Core REQUIRED) GET_TARGET_PROPERTY(QMAKE_LOCATION Qt5::qmake LOCATION) -IF(${Qt5Core_VERSION_STRING} VERSION_LESS MINIMAL_QT_VERSION) - MESSAGE(FATAL_ERROR "Found Qt5: ${QMAKE_LOCATION} (found unsuitable version \"${Qt5Core_VERSION_STRING}\", required is \"${MINIMAL_QT_VERSION}\")") +IF(${Qt5Core_VERSION} VERSION_LESS MINIMAL_QT_VERSION) + MESSAGE(FATAL_ERROR "Found Qt5: ${QMAKE_LOCATION} (found unsuitable version \"${Qt5Core_VERSION}\", required is \"${MINIMAL_QT_VERSION}\")") ELSE() - MESSAGE(STATUS "Found Qt5: ${QMAKE_LOCATION} (found suitable version \"${Qt5Core_VERSION_STRING}\")") + MESSAGE(STATUS "Found Qt5: ${QMAKE_LOCATION} (found suitable version \"${Qt5Core_VERSION}\")") ENDIF() FIND_PACKAGE(Qt5Concurrent REQUIRED) FIND_PACKAGE(Qt5Gui REQUIRED) @@ -378,9 +378,9 @@ ENDIF() # when using Qt 5.3, default to using the old QGLWidget, but warn -IF(${Qt5Core_VERSION_STRING} VERSION_LESS "5.4") +IF(${Qt5Core_VERSION} VERSION_LESS "5.4") SET(USE_OLD_QGLWIDGET 1) - MESSAGE(WARNING "You are using Qt ${Qt5Core_VERSION_STRING} to build, falling back to legacy QGLWidget rendering. Consider using at least Qt 5.4 if possible.") + MESSAGE(WARNING "You are using Qt ${Qt5Core_VERSION} to build, falling back to legacy QGLWidget rendering. Consider using at least Qt 5.4 if possible.") ELSE() # offer the old widget as an alternative, default off SET(USE_OLD_QGLWIDGET 0 CACHE BOOL "Use the legacy QGLWidget instead of the new QOpenGLWidget for the main viewport, and link to the QtOpenGL module")
