Hello community, here is the log from the commit of package kstars for openSUSE:Factory checked in at 2018-06-22 13:30:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kstars (Old) and /work/SRC/openSUSE:Factory/.kstars.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kstars" Fri Jun 22 13:30:30 2018 rev:96 rq:615219 version:2.9.5 Changes: -------- --- /work/SRC/openSUSE:Factory/kstars/kstars.changes 2018-04-26 13:38:36.322817836 +0200 +++ /work/SRC/openSUSE:Factory/.kstars.new/kstars.changes 2018-06-22 13:30:32.593384936 +0200 @@ -1,0 +2,6 @@ +Sun Jun 3 17:04:41 UTC 2018 - christo...@krop.fr + +- Add Fix-build-with-Qt-511.patch +- Run spec-cleaner + +------------------------------------------------------------------- New: ---- Fix-build-with-Qt-511.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kstars.spec ++++++ --- /var/tmp/diff_new_pack.AipVWM/_old 2018-06-22 13:30:34.385318704 +0200 +++ /var/tmp/diff_new_pack.AipVWM/_new 2018-06-22 13:30:34.389318556 +0200 @@ -17,7 +17,6 @@ %bcond_without lang - Name: kstars Version: 2.9.5 Release: 0 @@ -26,12 +25,14 @@ # Android version - they're neither built nor installed # Likewise, the non-commercial files in kstars-17.04.2/README.images are not # used nor installed -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Scientific/Astronomy -Url: http://edu.kde.org/kstars/ +URL: http://edu.kde.org/kstars/ Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE -- disable_downloading_into_system_dirs.patch -- do not allow saving runtime files into system dirs. Patch0: disable_downloading_into_system_dirs.patch +# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch -- Fix build with Qt 5.11 +Patch1: Fix-build-with-Qt-511.patch BuildRequires: Mesa-devel BuildRequires: cfitsio-devel BuildRequires: eigen3-devel @@ -53,15 +54,9 @@ BuildRequires: libraw-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files -%if 0%{?suse_version} > 1320 || (0%{?is_opensuse} && 0%{?sle_version} >= 120300) -BuildRequires: wcslib-devel -%endif BuildRequires: xplanet BuildRequires: cmake(KF5NotifyConfig) BuildRequires: pkgconfig(Qt5Concurrent) -%if 0%{?suse_version} > 1320 -BuildRequires: pkgconfig(Qt5DataVisualization) -%endif BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5PrintSupport) @@ -73,10 +68,15 @@ BuildRequires: pkgconfig(Qt5Xml) Recommends: libindi Recommends: xplanet +%if 0%{?suse_version} > 1320 || (0%{?is_opensuse} && 0%{?sle_version} >= 120300) +BuildRequires: wcslib-devel +%endif +%if 0%{?suse_version} > 1320 +BuildRequires: pkgconfig(Qt5DataVisualization) +%endif %if %{with lang} Recommends: %{name}-lang %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description KStars is a Desktop Planetarium for KDE. It provides an accurate graphical @@ -87,8 +87,7 @@ %endif %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %ifarch ppc ppc64 @@ -102,13 +101,13 @@ %if %{with lang} %find_lang %{name} --with-man --all-name %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 - %kf5_find_htmldocs + %{kf5_find_htmldocs} %else # %%kf5_find_htmldocs is only defined since Leap 42.3 CURDIR=`pwd` pushd %{buildroot}%{_kf5_htmldir} for i in *; do - if ! [ -d "/usr/share/locale/${i}" ]; then + if ! [ -d "%{_datadir}/locale/${i}" ]; then echo "Removing unsupported translation %{_kf5_htmldir}/${i}" rm -rf "$i" elif [ "$i" != "en" ]; then @@ -125,20 +124,19 @@ %fdupes -s %{buildroot} %files -%defattr(-,root,root,-) %license COPYING COPYING.DOC %doc AUTHORS ChangeLog README README.customize README.ephemerides README.images +%dir %{_kf5_appstreamdir} +%dir %{_kf5_configkcfgdir} +%doc %{_kf5_htmldir}/en/kstars/ +%{_datadir}/sounds/*.ogg %{_kf5_applicationsdir}/org.kde.kstars.desktop %{_kf5_appsdir}/kstars/ +%{_kf5_appstreamdir}/org.kde.kstars.appdata.xml %{_kf5_bindir}/kstars -%dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/kstars.kcfg -%doc %{_kf5_htmldir}/en/kstars/ %{_kf5_iconsdir}/hicolor/*/*/* -%{_kf5_appstreamdir}/org.kde.kstars.appdata.xml %{_kf5_notifydir}/kstars.notifyrc -%{_datadir}/sounds/*.ogg -%dir %{_kf5_appstreamdir} %if %{with lang} %files lang -f %{name}.lang ++++++ Fix-build-with-Qt-511.patch ++++++ commit 093e6715c6fef5f7ed7eb0e3021bf132f110b582 Author: Andreas Sturmlechner <ast...@gentoo.org> Date: Wed Apr 25 22:05:50 2018 +0200 Fix build with Qt 5.11 (missing QDoubleValidator) Reviewers: mutlaqja Reviewed By: mutlaqja Subscribers: #kde_edu Tags: #kde_edu Differential Revision: https://phabricator.kde.org/D12525 diff --git a/kstars/dialogs/focusdialog.cpp b/kstars/dialogs/focusdialog.cpp index d09ce9273..b264ee5c9 100644 --- a/kstars/dialogs/focusdialog.cpp +++ b/kstars/dialogs/focusdialog.cpp @@ -24,6 +24,7 @@ #include "skyobjects/skypoint.h" #include <KLocalizedString> +#include <QDoubleValidator> #include <KMessageBox> #include <QPushButton>
