psi: update to 1.5

Backported fixes to various bugs/crashes from the master branch
Fixed compatibility with Qt 5.15

6 files changed, 23 insertions, 56 deletions

diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index 203b268803a..423af854631 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.102 2020/11/05 09:07:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.103 2020/11/13 14:06:48 nia Exp $
 
-DISTNAME=	psi-1.4
-PKGREVISION=	11
+DISTNAME=	psi-1.5
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psi/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/chat/psi/distinfo b/chat/psi/distinfo
index 8136ab3cb69..0d77b42a141 100644
--- a/chat/psi/distinfo
+++ b/chat/psi/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.29 2020/06/18 13:55:15 nia Exp $
+$NetBSD: distinfo,v 1.30 2020/11/13 14:06:48 nia Exp $
 
-SHA1 (psi-1.4/psi-1.4.tar.xz) = 55c61cc0c1e3990f5a97619dc79fbe320f778770
-RMD160 (psi-1.4/psi-1.4.tar.xz) = 2f047baa0e2af16c949f6bb33667124253e231e4
-SHA512 (psi-1.4/psi-1.4.tar.xz) = 9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
-Size (psi-1.4/psi-1.4.tar.xz) = 2119840 bytes
+SHA1 (psi-1.5/psi-1.5.tar.xz) = 8950a80111f2dabb9c4fa3dc27c0544a970685ce
+RMD160 (psi-1.5/psi-1.5.tar.xz) = fbea608528f90d90b3acf76014e1a6312e39d340
+SHA512 (psi-1.5/psi-1.5.tar.xz) = c2e17dad346b5f7e8c97dc8959d99eaf4c30c1ba11c2d04b562af7b30482d5dbdc3a86508c4c29881ea0fc72db5a9d5fb4017768732cafee6a1d3025a39d8520
+Size (psi-1.5/psi-1.5.tar.xz) = 2125104 bytes
 SHA1 (patch-src_accountmanagedlg.cpp) = ca40ab15b01121a327b4774fb9f6284341f055bd
-SHA1 (patch-src_avatars.cpp) = 0f96f4359f7a853725d9871b893d50d54009b013
-SHA1 (patch-src_contactlistdragview.cpp) = 542c027e91a0945a821a34aedd713834612d3672
 SHA1 (patch-src_options_opt__application.cpp) = b0ddccbd3ffec0d89daa85e92f0ef06bc2d7fe68
-SHA1 (patch-src_rosteravatarframe.cpp) = 34879bfa7d76c542d8882e762b6610059dbafa30
diff --git a/chat/psi/options.mk b/chat/psi/options.mk
index 154b85be9af..14ec2f5ae33 100644
--- a/chat/psi/options.mk
+++ b/chat/psi/options.mk
@@ -1,8 +1,12 @@
-# $NetBSD: options.mk,v 1.5 2019/11/02 22:18:24 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2020/11/13 14:06:48 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.psi
-PKG_SUPPORTED_OPTIONS+=	aspell enchant whiteboard xscreensaver
-PKG_SUGGESTED_OPTIONS+=	aspell enchant
+
+#PKG_SUPPORTED_OPTIONS+=	aspell hunspell enchant whiteboard xscreensaver
+#PKG_SUGGESTED_OPTIONS+=	aspell hunspell enchant
+
+PKG_SUPPORTED_OPTIONS+=	aspell hunspell whiteboard xscreensaver
+PKG_SUGGESTED_OPTIONS+=	aspell hunspell
 
 # from an idea stolen from ../../misc/openoffice3.
 PSI_SUPPORTED_LANGUAGES=	be cs de eo es es-es fr it ja mk pl pt-br ru \
@@ -43,6 +47,15 @@ CONFIGURE_ARGS+=	--disable-aspell
 CONFIGURE_ARGS+=	--disable-enchant
 .endif
 
+# enable hunspell
+.if !empty(PKG_OPTIONS:Mhunspell)
+CONFIGURE_ARGS+=	--with-hunspell-inc=${BUILDLINK_PREFIX.hunspell}/include
+CONFIGURE_ARGS+=	--with-hunspell-lib=${BUILDLINK_PREFIX.hunspell}/lib
+.include "../../textproc/hunspell/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-hunspell
+.endif
+
 # enable whiteboarding
 .if !empty(PKG_OPTIONS:Mwhiteboard)
 CONFIGURE_ARGS+=	--enable-whiteboarding
diff --git a/chat/psi/patches/patch-src_avatars.cpp b/chat/psi/patches/patch-src_avatars.cpp
deleted file mode 100644
index b1f9360d9e5..00000000000
--- a/chat/psi/patches/patch-src_avatars.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_avatars.cpp,v 1.1 2020/06/18 13:55:15 nia Exp $
-
-Fix Qt 5.15 build issues
-
---- src/avatars.cpp.orig	2018-11-02 00:15:39.000000000 +0000
-+++ src/avatars.cpp
-@@ -34,6 +34,7 @@
- #include <QFile>
- #include <QBuffer>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include "xmpp_xmlcommon.h"
- #include "xmpp_vcard.h"
diff --git a/chat/psi/patches/patch-src_contactlistdragview.cpp b/chat/psi/patches/patch-src_contactlistdragview.cpp
deleted file mode 100644
index 8017376ce7d..00000000000
--- a/chat/psi/patches/patch-src_contactlistdragview.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_contactlistdragview.cpp,v 1.1 2020/06/18 13:55:15 nia Exp $
-
-Fix Qt 5.15 build issues
-
---- src/contactlistdragview.cpp.orig	2018-11-02 00:15:39.000000000 +0000
-+++ src/contactlistdragview.cpp
-@@ -43,6 +43,7 @@
- #include <QMimeData>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QScrollBar>
- #include <QMessageBox>
- 
diff --git a/chat/psi/patches/patch-src_rosteravatarframe.cpp b/chat/psi/patches/patch-src_rosteravatarframe.cpp
deleted file mode 100644
index b83ea9bbe31..00000000000
--- a/chat/psi/patches/patch-src_rosteravatarframe.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_rosteravatarframe.cpp,v 1.1 2020/06/18 13:55:15 nia Exp $
-
-Fix Qt 5.15 build issues
-
---- src/rosteravatarframe.cpp.orig	2018-11-02 00:15:39.000000000 +0000
-+++ src/rosteravatarframe.cpp
-@@ -22,6 +22,7 @@
- #include "psioptions.h"
- #include "iconset.h"
- #include "qpainter.h"
-+#include "qpainterpath.h"
- 
- 
- RosterAvatarFrame::RosterAvatarFrame(QWidget *parent)