pull in missing patch from prior PR
This commit is contained in:
parent
b86b0448e4
commit
d0d879eaa0
|
@ -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<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
|
||||||
|
|
|
@ -9,7 +9,10 @@ Release: 5%{?dist}
|
||||||
License: GPLv2 or GPLv3
|
License: GPLv2 or GPLv3
|
||||||
URL: http://quassel-irc.org/
|
URL: http://quassel-irc.org/
|
||||||
Source0: http://quassel-irc.org/pub/quassel-%{version}.tar.bz2
|
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: cmake
|
||||||
BuildRequires: dbusmenu-qt5-devel
|
BuildRequires: dbusmenu-qt5-devel
|
||||||
|
|
Loading…
Reference in New Issue