Hello community, here is the log from the commit of package kdesvn for openSUSE:Factory checked in at 2018-06-13 15:35:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesvn (Old) and /work/SRC/openSUSE:Factory/.kdesvn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesvn" Wed Jun 13 15:35:01 2018 rev:65 rq:613811 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdesvn/kdesvn.changes 2017-08-10 14:13:10.883344643 +0200 +++ /work/SRC/openSUSE:Factory/.kdesvn.new/kdesvn.changes 2018-06-13 15:35:05.082068147 +0200 @@ -1,0 +2,5 @@ +Sun Jun 3 20:18:33 UTC 2018 - christo...@krop.fr + +- Add Fix-build-with-Qt-511.patch to fix build with Qt 5.11. + +------------------------------------------------------------------- New: ---- Fix-build-with-Qt-511.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesvn.spec ++++++ --- /var/tmp/diff_new_pack.a5zqLW/_old 2018-06-13 15:35:05.874038997 +0200 +++ /var/tmp/diff_new_pack.a5zqLW/_new 2018-06-13 15:35:05.878038850 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdesvn # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,18 @@ Version: 2.0.0 Release: 0 Summary: KDE Subversion Client -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Version Control -Url: http://kdesvn.alwins-world.de/ +URL: http://kdesvn.alwins-world.de/ Source: %{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM fix-startup.patch boo#1021486 -- fixes starting kdesvn from the application menu -Patch: fix-startup.patch +Patch0: fix-startup.patch # PATCH-FIX-UPSTREAM fix-crash.patch kde#375655 -- fixes crash when there's a '@' in the path Patch1: fix-crash.patch # PATCH-FIX-UPSTREAM fix-crash-root-path.patch kde#383187 -- fix kded crash when the root path ('/') is checked for a working copy Patch2: fix-crash-root-path.patch +# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch -- Fix build with Qt 5.11 +Patch3: Fix-build-with-Qt-511.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: kbookmarks-devel @@ -62,16 +64,12 @@ Provides: kde4-kdesvn = %{version} Obsoletes: kde4-kdesvn < %{version} Obsoletes: libsvnqt7 < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description kdesvn is a GUI client for subversion repositories. %prep -%setup -q -%patch -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build %cmake_kf5 -d build @@ -84,23 +82,23 @@ %fdupes -s %{buildroot}%{_datadir} %files -f %{name}.lang -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING COPYING.OpenSSL +%license COPYING COPYING.OpenSSL +%doc AUTHORS ChangeLog +%dir %{_kf5_htmldir}/pt_BR %dir %{_kf5_iconsdir}/hicolor/96x96 %dir %{_kf5_iconsdir}/hicolor/96x96/actions %dir %{_kf5_iconsdir}/hicolor/96x96/places -%dir %{_kf5_htmldir}/pt_BR +%doc %lang(de) %{_kf5_htmldir}/de/kdesvn/ +%doc %lang(en) %{_kf5_htmldir}/en/kdesvn/ +%doc %lang(nl) %{_kf5_htmldir}/nl/kdesvn/ +%doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR/kdesvn/ +%doc %lang(sv) %{_kf5_htmldir}/sv/kdesvn/ +%doc %lang(uk) %{_kf5_htmldir}/uk/kdesvn/ %{_kf5_applicationsdir}/org.kde.kdesvn.desktop %{_kf5_bindir}/kdesvn %{_kf5_bindir}/kdesvnaskpass %{_kf5_configkcfgdir}/ %{_kf5_dbusinterfacesdir}/kf5_org.kde.kdesvnd.xml -%doc %lang(nl) %{_kf5_htmldir}/nl/kdesvn/ -%doc %lang(uk) %{_kf5_htmldir}/uk/kdesvn/ -%doc %lang(de) %{_kf5_htmldir}/de/kdesvn/ -%doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR/kdesvn/ -%doc %lang(sv) %{_kf5_htmldir}/sv/kdesvn/ -%doc %lang(en) %{_kf5_htmldir}/en/kdesvn/ %{_kf5_iconsdir}/hicolor/*/*/* %{_kf5_kxmlguidir}/kdesvn/ %{_kf5_plugindir}/kdesvnpart.so ++++++ Fix-build-with-Qt-511.patch ++++++ commit f4ec3ee6da0efeea7a62a6ea3a892ac4bb374182 Author: David Faure <fa...@kde.org> Date: Tue Apr 3 00:21:46 2018 +0200 Fix compilation with Qt 5.11 (missing include) diff --git a/src/svnfrontend/blamedisplay.cpp b/src/svnfrontend/blamedisplay.cpp index 6fbc7d0e..345701de 100644 --- a/src/svnfrontend/blamedisplay.cpp +++ b/src/svnfrontend/blamedisplay.cpp @@ -30,6 +30,7 @@ #include <KTextEdit> #include <KTreeWidgetSearchLine> +#include <QAction> #include <QBrush> #include <QFontDatabase> #include <QInputDialog>
