Hello community, here is the log from the commit of package gammaray for openSUSE:Factory checked in at 2020-06-03 20:32:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gammaray (Old) and /work/SRC/openSUSE:Factory/.gammaray.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gammaray" Wed Jun 3 20:32:07 2020 rev:17 rq:810811 version:2.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gammaray/gammaray.changes 2020-05-07 14:56:38.530525175 +0200 +++ /work/SRC/openSUSE:Factory/.gammaray.new.3606/gammaray.changes 2020-06-03 20:32:56.765252279 +0200 @@ -1,0 +2,6 @@ +Tue Jun 2 09:58:03 UTC 2020 - Fabian Vogt <[email protected]> + +- Add another patch to fix build against Qt 5.15: + * fix-build-with-qt-5.15-again.patch + +------------------------------------------------------------------- New: ---- fix-build-with-qt-5.15-again.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gammaray.spec ++++++ --- /var/tmp/diff_new_pack.gGOngd/_old 2020-06-03 20:32:58.085256417 +0200 +++ /var/tmp/diff_new_pack.gGOngd/_new 2020-06-03 20:32:58.089256429 +0200 @@ -32,6 +32,7 @@ Patch0: Fix_icons_installation.patch # PATCH-FIX-UPSTREAM Patch2: 0001-Fix-build-with-Qt-5.15.patch +Patch3: fix-build-with-qt-5.15-again.patch BuildRequires: binutils-devel BuildRequires: cmake >= 3.1 BuildRequires: doxygen ++++++ fix-build-with-qt-5.15-again.patch ++++++ >From 7cd17bca4fb8369b5e1c5822ac1c79574766d3e7 Mon Sep 17 00:00:00 2001 From: Eike Ziller <[email protected]> Date: Wed, 6 May 2020 10:34:01 +0200 Subject: [PATCH] Fix build against Qt 5.15 After qtbase/487dd80bce9c6006f349ccb09222e1c308200f0a which adds a meta type declaration --- plugins/network/networksupport.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/network/networksupport.cpp b/plugins/network/networksupport.cpp index 32191d0ca..97db54222 100644 --- a/plugins/network/networksupport.cpp +++ b/plugins/network/networksupport.cpp @@ -89,7 +89,9 @@ Q_DECLARE_METATYPE(QNetworkInterface::InterfaceFlags) #endif Q_DECLARE_METATYPE(QNetworkProxy::Capabilities) Q_DECLARE_METATYPE(QNetworkProxy::ProxyType) +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) Q_DECLARE_METATYPE(QSocketNotifier::Type) +#endif #ifndef QT_NO_SSL Q_DECLARE_METATYPE(QSsl::KeyAlgorithm) Q_DECLARE_METATYPE(QSsl::KeyType)
