From 712e558ce742730bbece58ffa73a405bd739651e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 25 2018 16:22:00 +0000 Subject: backport upstream Q5.11 fix --- diff --git a/0130-Fix-build-with-Qt-5.11.patch b/0130-Fix-build-with-Qt-5.11.patch new file mode 100644 index 0000000..850cf42 --- /dev/null +++ b/0130-Fix-build-with-Qt-5.11.patch @@ -0,0 +1,24 @@ +From e5198a902996b27bf9abde0ad24af82d55ab5dc1 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Thu, 10 May 2018 09:35:34 +0200 +Subject: [PATCH 130/286] Fix build with Qt 5.11 + +--- + kmymoney/plugins/kbanking/widgets/chiptandialog.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp +index 928e7a87..53fb2a3a 100644 +--- a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp ++++ b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include +-- +2.17.1 + diff --git a/kmymoney.spec b/kmymoney.spec index a46b7ff..8404968 100644 --- a/kmymoney.spec +++ b/kmymoney.spec @@ -2,7 +2,7 @@ Summary: Personal finance Name: kmymoney Version: 5.0.1 -Release: 4%{?dist} +Release: 5%{?dist} # kmm itself is GPLv2+ # bundled kdchart is GPLv2 or GPLv3, but currently not using it @@ -12,7 +12,10 @@ Source0: http://download.kde.org/stable/kmymoney/%{version}/src/kmymoney-%{versi ## upstreamable patches -## upstream patches +## upstream patches (5.0 branch) + +## upstream patches (master branch) +Patch130: 0130-Fix-build-with-Qt-5.11.patch BuildRequires: boost-devel BuildRequires: cppunit-devel @@ -188,6 +191,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.kmymoney. %changelog +* Wed Jul 25 2018 Rex Dieter - 5.0.1-5 +- backport upstream Q5.11 fix + * Fri Jul 13 2018 Fedora Release Engineering - 5.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild