diff --git a/patch-src_common_types.h b/patch-src_common_types.h new file mode 100644 index 0000000..41f2029 --- /dev/null +++ b/patch-src_common_types.h @@ -0,0 +1,23 @@ +Fix with Qt5-5.14 + +Obtained from: + https://github.com/quassel/quassel/commit/579e559a6322209df7cd51c34801fecff5fe734b + +--- src/common/types.h.orig 2020-04-04 10:50:56 UTC ++++ src/common/types.h +@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) + typedef QList MsgIdList; + typedef QList 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(v); + return in; + } ++#endif + + // Exceptions + diff --git a/quassel.spec b/quassel.spec index f53fcde..2cb8d30 100755 --- a/quassel.spec +++ b/quassel.spec @@ -9,7 +9,10 @@ Release: 5%{?dist} License: GPLv2 or GPLv3 URL: http://quassel-irc.org/ Source0: http://quassel-irc.org/pub/quassel-%{version}.tar.bz2 -Patch0: patch-src_common_types.h + +# patch from freebsd ports treee +#https://github.com/freebsd/freebsd-ports/blob/b6c49e02ef34b163293e453c7245093cb7668a40/irc/quassel/files/patch-src_common_types.h +Patch0: https://raw.githubusercontent.com/freebsd/freebsd-ports/b6c49e02ef34b163293e453c7245093cb7668a40/irc/quassel/files/patch-src_common_types.h BuildRequires: cmake BuildRequires: dbusmenu-qt5-devel