Received: by mail.netbsd.org (Postfix, from userid 605) id A234284DC1; Thu, 18 Jun 2020 13:55:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2BFA084D66 for ; Thu, 18 Jun 2020 13:55:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id LLjQ3R8c5TP4 for ; Thu, 18 Jun 2020 13:55:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8F6A784CE2 for ; Thu, 18 Jun 2020 13:55:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 89724FB28; Thu, 18 Jun 2020 13:55:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1592488515171230" MIME-Version: 1.0 Date: Thu, 18 Jun 2020 13:55:15 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/chat/psi To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200618135515.89724FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1592488515171230 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Jun 18 13:55:15 UTC 2020 Modified Files: pkgsrc/chat/psi: Makefile distinfo Added Files: pkgsrc/chat/psi/patches: patch-src_avatars.cpp patch-src_contactlistdragview.cpp patch-src_rosteravatarframe.cpp Log Message: psi: Fix Qt 5.15 fallout To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 pkgsrc/chat/psi/Makefile cvs rdiff -u -r1.28 -r1.29 pkgsrc/chat/psi/distinfo cvs rdiff -u -r0 -r1.1 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. --_----------=_1592488515171230 Content-Disposition: inline Content-Length: 3681 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/psi/Makefile diff -u pkgsrc/chat/psi/Makefile:1.98 pkgsrc/chat/psi/Makefile:1.99 --- pkgsrc/chat/psi/Makefile:1.98 Tue Jun 2 08:23:20 2020 +++ pkgsrc/chat/psi/Makefile Thu Jun 18 13:55:15 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2020/06/02 08:23:20 adam Exp $ +# $NetBSD: Makefile,v 1.99 2020/06/18 13:55:15 nia Exp $ DISTNAME= psi-1.4 PKGREVISION= 8 @@ -17,7 +17,7 @@ DIST_SUBDIR= ${DISTNAME} DISTFILES= ${DEFAULT_DISTFILES} USE_TOOLS+= gmake unzip pkg-config -USE_LANGUAGES= c c++03 +USE_LANGUAGES= c c++ USE_LIBTOOL= yes HAS_CONFIGURE= yes Index: pkgsrc/chat/psi/distinfo diff -u pkgsrc/chat/psi/distinfo:1.28 pkgsrc/chat/psi/distinfo:1.29 --- pkgsrc/chat/psi/distinfo:1.28 Fri Feb 8 14:56:01 2019 +++ pkgsrc/chat/psi/distinfo Thu Jun 18 13:55:15 2020 @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.28 2019/02/08 14:56:01 nia Exp $ +$NetBSD: distinfo,v 1.29 2020/06/18 13:55:15 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 (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 Added files: Index: pkgsrc/chat/psi/patches/patch-src_avatars.cpp diff -u /dev/null pkgsrc/chat/psi/patches/patch-src_avatars.cpp:1.1 --- /dev/null Thu Jun 18 13:55:15 2020 +++ pkgsrc/chat/psi/patches/patch-src_avatars.cpp Thu Jun 18 13:55:15 2020 @@ -0,0 +1,14 @@ +$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 + #include + #include ++#include + + #include "xmpp_xmlcommon.h" + #include "xmpp_vcard.h" Index: pkgsrc/chat/psi/patches/patch-src_contactlistdragview.cpp diff -u /dev/null pkgsrc/chat/psi/patches/patch-src_contactlistdragview.cpp:1.1 --- /dev/null Thu Jun 18 13:55:15 2020 +++ pkgsrc/chat/psi/patches/patch-src_contactlistdragview.cpp Thu Jun 18 13:55:15 2020 @@ -0,0 +1,14 @@ +$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 + #include + #include ++#include + #include + #include + Index: pkgsrc/chat/psi/patches/patch-src_rosteravatarframe.cpp diff -u /dev/null pkgsrc/chat/psi/patches/patch-src_rosteravatarframe.cpp:1.1 --- /dev/null Thu Jun 18 13:55:15 2020 +++ pkgsrc/chat/psi/patches/patch-src_rosteravatarframe.cpp Thu Jun 18 13:55:15 2020 @@ -0,0 +1,14 @@ +$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) --_----------=_1592488515171230--