CVS commit: pkgsrc/chat/psi

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov 13 14:06:48 UTC 2020

Modified Files:
        pkgsrc/chat/psi: Makefile distinfo options.mk
Removed Files:
        pkgsrc/chat/psi/patches: patch-src_avatars.cpp
            patch-src_contactlistdragview.cpp patch-src_rosteravatarframe.cpp

Log Message:
psi: update to 1.5

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


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 pkgsrc/chat/psi/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/chat/psi/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/psi/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/chat/psi/patches/patch-src_avatars.cpp \
    pkgsrc/chat/psi/patches/patch-src_contactlistdragview.cpp \
    pkgsrc/chat/psi/patches/patch-src_rosteravatarframe.cpp

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

Modified files:

Index: pkgsrc/chat/psi/Makefile
diff -u pkgsrc/chat/psi/Makefile:1.102 pkgsrc/chat/psi/Makefile:1.103
--- pkgsrc/chat/psi/Makefile:1.102      Thu Nov  5 09:07:36 2020
+++ pkgsrc/chat/psi/Makefile    Fri Nov 13 14:06:48 2020
@@ -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

Index: pkgsrc/chat/psi/distinfo
diff -u pkgsrc/chat/psi/distinfo:1.29 pkgsrc/chat/psi/distinfo:1.30
--- pkgsrc/chat/psi/distinfo:1.29       Thu Jun 18 13:55:15 2020
+++ pkgsrc/chat/psi/distinfo    Fri Nov 13 14:06:48 2020
@@ -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

Index: pkgsrc/chat/psi/options.mk
diff -u pkgsrc/chat/psi/options.mk:1.5 pkgsrc/chat/psi/options.mk:1.6
--- pkgsrc/chat/psi/options.mk:1.5      Sat Nov  2 22:18:24 2019
+++ pkgsrc/chat/psi/options.mk  Fri Nov 13 14:06:48 2020
@@ -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