Hello community, here is the log from the commit of package trojita for openSUSE:Factory checked in at 2019-07-04 15:42:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trojita (Old) and /work/SRC/openSUSE:Factory/.trojita.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trojita" Thu Jul 4 15:42:46 2019 rev:10 rq:713040 version:0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2018-03-28 10:33:22.864730495 +0200 +++ /work/SRC/openSUSE:Factory/.trojita.new.4615/trojita.changes 2019-07-04 15:42:46.586062800 +0200 @@ -1,0 +2,5 @@ +Tue Jul 2 08:49:49 UTC 2019 - wba...@tmo.at + +- Add tests-Fix-build-with-Qt-5.13.patch to fix build with Qt 5.13 + +------------------------------------------------------------------- New: ---- tests-Fix-build-with-Qt-5.13.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trojita.spec ++++++ --- /var/tmp/diff_new_pack.wk6ubP/_old 2019-07-04 15:42:47.302063919 +0200 +++ /var/tmp/diff_new_pack.wk6ubP/_new 2019-07-04 15:42:47.306063925 +0200 @@ -35,6 +35,8 @@ Source1: http://sourceforge.net/projects/trojita/files/src/%{name}-%{version}.tar.xz.asc # PATCH-FIX-OPENSUSE Patch: Skip-QtWebKit-tests.patch +# PATCH-FIX-UPSTREAM +Patch1: tests-Fix-build-with-Qt-5.13.patch BuildRequires: cmake >= 2.8.7 BuildRequires: git BuildRequires: gpgmepp5-devel @@ -69,7 +71,7 @@ %prep %setup -q -%patch -p1 +%autopatch -p1 %build export CXXFLAGS="%{optflags} -fPIC" ++++++ tests-Fix-build-with-Qt-5.13.patch ++++++ >From 39772585033c1c0aff96f297e93de7be53f9b114 Mon Sep 17 00:00:00 2001 From: Heiko Becker <heire...@exherbo.org> Date: Sat, 23 Mar 2019 01:17:11 +0100 Subject: tests: Fix build with Qt 5.13 QTest::toString(QModelIndex) was added in 7ef0b575b38d267bd3dc14ff46935d556562ff00 and thus causes a build error with Qt 5.13 because it's redefined here. Change-Id: I015800e49cf8d0e87f3541642406396f150d0eeb --- tests/Imap/test_Imap_BodyParts.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Imap/test_Imap_BodyParts.cpp b/tests/Imap/test_Imap_BodyParts.cpp index f1c577f..b6e0421 100644 --- a/tests/Imap/test_Imap_BodyParts.cpp +++ b/tests/Imap/test_Imap_BodyParts.cpp @@ -51,6 +51,7 @@ struct Data { Q_DECLARE_METATYPE(QList<Data>) +#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) namespace QTest { template <> char *toString(const QModelIndex &index) @@ -60,6 +61,7 @@ char *toString(const QModelIndex &index) return qstrdup(buf.toUtf8().constData()); } } +#endif using namespace Imap::Mailbox; -- cgit v1.1
