CVS commit: pkgsrc/chat/swift

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jun 23 09:40:53 UTC 2018

Modified Files:
        pkgsrc/chat/swift: Makefile distinfo
Added Files:
        pkgsrc/chat/swift/patches:
            patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h

Log Message:
swift: fix build with Qt 5.11.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/chat/swift/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/swift/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.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/swift/Makefile
diff -u pkgsrc/chat/swift/Makefile:1.36 pkgsrc/chat/swift/Makefile:1.37
--- pkgsrc/chat/swift/Makefile:1.36     Sun Apr 29 21:31:29 2018
+++ pkgsrc/chat/swift/Makefile  Sat Jun 23 09:40:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/04/29 21:31:29 adam Exp $
+# $NetBSD: Makefile,v 1.37 2018/06/23 09:40:53 wiz Exp $
 
 DISTNAME=      swift-3.0
 PKGREVISION=   22
@@ -7,7 +7,7 @@ MASTER_SITES=   http://swift.im/downloads/
 
 MAINTAINER=    eric%cirr.com@localhost
 HOMEPAGE=      http://swift.im/
-COMMENT=       Swift XMPP Client
+COMMENT=       Graphical XMPP Client
 LICENSE=       gnu-gpl-v3
 
 # would be nicer to build with pkgsrc version, but

Index: pkgsrc/chat/swift/distinfo
diff -u pkgsrc/chat/swift/distinfo:1.5 pkgsrc/chat/swift/distinfo:1.6
--- pkgsrc/chat/swift/distinfo:1.5      Tue Mar  1 13:25:01 2016
+++ pkgsrc/chat/swift/distinfo  Sat Jun 23 09:40:53 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2016/03/01 13:25:01 wiz Exp $
+$NetBSD: distinfo,v 1.6 2018/06/23 09:40:53 wiz Exp $
 
 SHA1 (swift-3.0.tar.gz) = 2bafacd9cfffea1044bc8ff6b3547c771aa5547c
 RMD160 (swift-3.0.tar.gz) = 7b25e3655855f18446e0fb5053f37f490f68bda3
@@ -6,3 +6,4 @@ SHA512 (swift-3.0.tar.gz) = 3d635e9a904a
 Size (swift-3.0.tar.gz) = 11084214 bytes
 SHA1 (patch-BuildTools_SCons_SConscript.boot) = f134f01b73e6862171c432c76088947d616c6d3d
 SHA1 (patch-BuildTools_SCons_SConstruct) = a2d68e60a41ea74ad753b17f97c7887cbd458c46
+SHA1 (patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h) = 2ada5f6a38f48c89142371817918121b01819aa7

Added files:

Index: pkgsrc/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h
diff -u /dev/null pkgsrc/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h:1.1
--- /dev/null   Sat Jun 23 09:40:54 2018
+++ pkgsrc/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h  Sat Jun 23 09:40:53 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h,v 1.1 2018/06/23 09:40:53 wiz Exp $
+
+Fix build with Qt 5.11.
+
+--- Swift/QtUI/UserSearch/QtUserSearchWindow.h.orig    2016-02-29 10:29:02.000000000 +0000
++++ Swift/QtUI/UserSearch/QtUserSearchWindow.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include <QAbstractItemModel>
+ #include <QWizard>
+ #include <set>
+