CVS commit: pkgsrc/chat/quassel

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar 27 08:45:26 UTC 2020

Modified Files:
        pkgsrc/chat/quassel: distinfo
Added Files:
        pkgsrc/chat/quassel/patches: patch-src_common_types.h

Log Message:
quassel: Fix build problems caused by Qt 5.14 update

from upstream


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/quassel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/quassel/patches/patch-src_common_types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/quassel/distinfo
diff -u pkgsrc/chat/quassel/distinfo:1.1 pkgsrc/chat/quassel/distinfo:1.2
--- pkgsrc/chat/quassel/distinfo:1.1    Sun Feb 17 10:17:46 2019
+++ pkgsrc/chat/quassel/distinfo        Fri Mar 27 08:45:26 2020
@@ -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

Added files:

Index: pkgsrc/chat/quassel/patches/patch-src_common_types.h
diff -u /dev/null pkgsrc/chat/quassel/patches/patch-src_common_types.h:1.1
--- /dev/null   Fri Mar 27 08:45:27 2020
+++ pkgsrc/chat/quassel/patches/patch-src_common_types.h        Fri Mar 27 08:45:26 2020
@@ -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
+