summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-03-27 08:45:26 +0000
committernia <nia@pkgsrc.org>2020-03-27 08:45:26 +0000
commit8dda19c4dd46af1192f09d2bb889187ddc367f34 (patch)
tree7971ac83b58a753195744b8ed5229279fb48149c /chat
parentd35aa25acc46988abab084a7073c2be9acdc1903 (diff)
downloadpkgsrc-8dda19c4dd46af1192f09d2bb889187ddc367f34.tar.gz
quassel: Fix build problems caused by Qt 5.14 update
from upstream
Diffstat (limited to 'chat')
-rw-r--r--chat/quassel/distinfo3
-rw-r--r--chat/quassel/patches/patch-src_common_types.h24
2 files changed, 26 insertions, 1 deletions
diff --git a/chat/quassel/distinfo b/chat/quassel/distinfo
index 3c7851e2aac..2ae69c8f89a 100644
--- a/chat/quassel/distinfo
+++ b/chat/quassel/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/02/17 10:17:46 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/03/27 08:45:26 nia Exp $
SHA1 (quassel-0.13.1.tar.bz2) = a2a734d4f6332912f341ea18337ea330669b4e18
RMD160 (quassel-0.13.1.tar.bz2) = e129944a8863abc3bf03e78c53630b6639b94bab
SHA512 (quassel-0.13.1.tar.bz2) = 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
Size (quassel-0.13.1.tar.bz2) = 4289663 bytes
+SHA1 (patch-src_common_types.h) = bc1c32f97faf271402a7886cc4f1fd33cfce0984
diff --git a/chat/quassel/patches/patch-src_common_types.h b/chat/quassel/patches/patch-src_common_types.h
new file mode 100644
index 00000000000..1df0338eb5a
--- /dev/null
+++ b/chat/quassel/patches/patch-src_common_types.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_common_types.h,v 1.1 2020/03/27 08:45:26 nia Exp $
+
+Fix building with Qt>=5.14
+
+https://github.com/quassel/quassel/pull/518
+
+--- src/common/types.h.orig 2019-02-15 16:17:28.000000000 +0000
++++ 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,
+ value = static_cast<T>(v);
+ return in;
+ }
++#endif
+
+ // Exceptions
+