Hello community, here is the log from the commit of package quassel for openSUSE:Factory checked in at 2020-01-27 20:18:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quassel (Old) and /work/SRC/openSUSE:Factory/.quassel.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quassel" Mon Jan 27 20:18:14 2020 rev:52 rq:767652 version:0.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/quassel/quassel.changes 2019-04-26 22:55:18.917281686 +0200 +++ /work/SRC/openSUSE:Factory/.quassel.new.26092/quassel.changes 2020-01-27 20:18:31.524562373 +0100 @@ -1,0 +2,6 @@ +Mon Jan 27 10:50:11 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add patch to fix build with Qt 5.14: + * 0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch + +------------------------------------------------------------------- New: ---- 0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quassel.spec ++++++ --- /var/tmp/diff_new_pack.Ny1Y2c/_old 2020-01-27 20:18:32.856563186 +0100 +++ /var/tmp/diff_new_pack.Ny1Y2c/_new 2020-01-27 20:18:32.860563188 +0100 @@ -1,7 +1,7 @@ # # spec file for package quassel # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,7 +27,7 @@ Summary: Distributed IRC client License: GPL-2.0-only OR GPL-3.0-only Group: Productivity/Networking/IRC -URL: http://quassel-irc.org/ +URL: https://quassel-irc.org/ Source: http://%{name}-irc.org/pub/%{name}-%{realver}.tar.bz2 Source1: service.%{name}core Source2: sysconfig.%{name}core @@ -35,6 +35,8 @@ Source5: quassel-rpmlintrc # PATCH-FIX-SUSE: Set the correct libraries and compiler flags in order to use qglobal.h in check_cxx_source_compiles function Patch0: quassel-set-required-libs-and-flags.patch +# PATCH-FIX-UPSTREAM: Fix build with Qt 5.14 +Patch1: 0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch BuildRequires: cmake >= 2.8.10 BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -149,7 +151,7 @@ %prep %setup -q -n %{name}-%{realver} -%patch0 -p1 +%autopatch -p1 %build FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') ++++++ 0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch ++++++ >From 7860b9699b6a20fdf6e61d89df28e86b1e9a4dc4 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas <[email protected]> Date: Tue, 7 Jan 2020 18:34:54 +0100 Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14 Starting from version 5.14, Qt provides stream operators for enum types, which collide with the ones we ship in types.h. Disable Quassel's stream operators when compiling against Qt 5.14 or later. Add a unit test that ensures that enum serialization honors the width of the underlying type. (original patch trimmed) --- src/common/types.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/types.h b/src/common/types.h index 467d9fb..c4b9f36 100644 --- a/src/common/types.h +++ b/src/common/types.h @@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) typedef QList<MsgId> MsgIdList; typedef QList<BufferId> BufferIdList; +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) /** * Catch-all stream serialization operator for enum types. * @@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { value = static_cast<T>(v); return in; } +#endif // Exceptions -- 2.24.1
