Accepting request 722627 from KDE:Extra

Fix build with Qt 5.13

OBS-URL: https://build.opensuse.org/request/show/722627
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tellico?expand=0&rev=79
This commit is contained in:
Dominique Leuenberger 2019-08-13 11:22:58 +00:00 committed by Git OBS Bridge
commit 82de7dd272
3 changed files with 46 additions and 2 deletions

View File

@ -0,0 +1,38 @@
commit 43851a0a655a3a961f289087bdea989aa32cc028
Author: Luca Beltrame <lbeltrame@kde.org>
Date: Sun Jul 21 09:21:16 2019 +0200
Fix build with Qt 5.13
(cherry picked from commit 43e6bbb4721adc83d8b2a77bd51d9efaf7aefd6b)
diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp
index 724370e2..e6502bb0 100644
--- a/src/gui/datewidget.cpp
+++ b/src/gui/datewidget.cpp
@@ -35,6 +35,7 @@
#include <QPushButton>
#include <QHBoxLayout>
#include <QFrame>
+#include <QDate>
#include <QEvent>
#include <QMenu>
#include <QWidgetAction>
commit d3c56eca11cd059d4348ab6696822c23d85af61a
Author: Robby Stephenson <robby@periapsis.org>
Date: Sun Jul 21 19:17:35 2019 -0400
Fix apparent build problem on Jenkins
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d8348e80..8250c562 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -108,6 +108,7 @@
#include <QMimeType>
#include <QMenuBar>
#include <QFileDialog>
+#include <QMetaMethod>
#include <unistd.h>

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 12 09:07:26 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
- Add Fix-build-with-Qt-5_13.patch
-------------------------------------------------------------------
Wed Jul 10 11:21:14 UTC 2019 - wbauer@tmo.at

View File

@ -24,6 +24,7 @@ License: GPL-2.0-or-later
Group: Productivity/Office/Other
URL: http://tellico-project.org/
Source0: http://tellico-project.org/files/%{name}-%{version}.tar.xz
Patch0: Fix-build-with-Qt-5_13.patch
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: libcdio-devel
@ -79,7 +80,7 @@ stamps, trading cards, comic books, and wines.
%lang_package
%prep
%setup -q
%autosetup -p1
%build
%cmake_kf5 "-DENABLE_WEBCAM=true" -d build
@ -93,7 +94,7 @@ stamps, trading cards, comic books, and wines.
%endif
%find_lang %{name}
%kf5_find_htmldocs
%{kf5_find_htmldocs}
%{kf5_post_install}