CVS commit: pkgsrc/chat/swift

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May  3 20:03:32 UTC 2022

Modified Files:
        pkgsrc/chat/swift: Makefile distinfo
        pkgsrc/chat/swift/patches: patch-BuildTools_SCons_SConscript.boot
            patch-BuildTools_SCons_SConstruct
            patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h
Added Files:
        pkgsrc/chat/swift/files: swift-im.1
        pkgsrc/chat/swift/patches:
            patch-Swift_Controllers_ShowProfileController.h
            patch-Swift_QtUI_Roster_GroupItemDelegate.cpp
            patch-Swiften_Base_Platform.h
            patch-Swiften_Network_PlatformNATTraversalWorker.cpp
            patch-Swiften_SConscript

Log Message:
swift: Update to 4.0.2. Fixes build with latest version of Qt/Boost.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/chat/swift/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/chat/swift/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/swift/files/swift-im.1
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot \
    pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConstruct
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/chat/swift/patches/patch-Swift_Controllers_ShowProfileController.h \
    pkgsrc/chat/swift/patches/patch-Swift_QtUI_Roster_GroupItemDelegate.cpp \
    pkgsrc/chat/swift/patches/patch-Swiften_Base_Platform.h \
    pkgsrc/chat/swift/patches/patch-Swiften_Network_PlatformNATTraversalWorker.cpp \
    pkgsrc/chat/swift/patches/patch-Swiften_SConscript
cvs rdiff -u -r1.1 -r1.2 \
    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.74 pkgsrc/chat/swift/Makefile:1.75
--- pkgsrc/chat/swift/Makefile:1.74     Sun Apr 24 22:45:40 2022
+++ pkgsrc/chat/swift/Makefile  Tue May  3 20:03:31 2022
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2022/04/24 22:45:40 tnn Exp $
+# $NetBSD: Makefile,v 1.75 2022/05/03 20:03:31 nia Exp $
 
-DISTNAME=      swift-3.0
-PKGREVISION=   55
+DISTNAME=      swift-4.0.2
 CATEGORIES=    chat
-MASTER_SITES=  http://swift.im/downloads/releases/${DISTNAME}/
+MASTER_SITES=  https://swift.im/downloads/releases/${DISTNAME}/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://swift.im/
@@ -13,6 +12,7 @@ LICENSE=      gnu-gpl-v3
 # would be nicer to build with pkgsrc version, but
 # swift-3.0 does not build with scons>=3
 #DEPENDS+=     scons>=1.3:../../devel/scons
+TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
 USE_LANGUAGES= c c++11
 USE_TOOLS+=    pkg-config
@@ -46,7 +46,7 @@ do-install:
        cd ${WRKSRC} && \
        ${SETENV} ${MAKE_ENV} ./scons \
            SWIFT_INSTALLDIR=${DESTDIR}/${PREFIX} ${DESTDIR}/${PREFIX}
-       ${INSTALL_DATA} ${WRKSRC}/Swift/Packaging/Debian/debian/swift-im.1 \
+       ${INSTALL_DATA} ${FILESDIR}/swift-im.1 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../lang/python/application.mk"
@@ -59,7 +59,7 @@ BUILDLINK_API_DEPENDS.boost-headers+=   
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/swift/distinfo
diff -u pkgsrc/chat/swift/distinfo:1.8 pkgsrc/chat/swift/distinfo:1.9
--- pkgsrc/chat/swift/distinfo:1.8      Tue Oct 26 10:05:26 2021
+++ pkgsrc/chat/swift/distinfo  Tue May  3 20:03:31 2022
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:05:26 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/05/03 20:03:31 nia Exp $
 
-BLAKE2s (swift-3.0.tar.gz) = 32fb78855476743ab1d09f3ed978c1f24963be8ada6971864430bb060a0e02b5
-SHA512 (swift-3.0.tar.gz) = 3d635e9a904a48a8553e153627242e44fad5d57c48152d3c698cdf73363bdc1c566a13692c7fb2d70f0f6b773f7ff9c2cd717687501940e3b8a30b6bebc44f63
-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
+BLAKE2s (swift-4.0.2.tar.gz) = c00949dee944afc250920f4f53a951806707f980e49a867421db90a73879bc30
+SHA512 (swift-4.0.2.tar.gz) = b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
+Size (swift-4.0.2.tar.gz) = 19083393 bytes
+SHA1 (patch-BuildTools_SCons_SConscript.boot) = ad585d6b732efc3301470b31f9f525fbb7afe798
+SHA1 (patch-BuildTools_SCons_SConstruct) = 0406dcd173e799ee8361553733830b5135a513ea
+SHA1 (patch-Swift_Controllers_ShowProfileController.h) = 889b8507c302b4b3d849130207476a82d10d2ee5
+SHA1 (patch-Swift_QtUI_Roster_GroupItemDelegate.cpp) = 0f8ba193194bf6c24624c20e2d7fa7747c4435bd
+SHA1 (patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h) = 7e4307a33e73a4f8c230a93616a37ce8f8796d57
+SHA1 (patch-Swiften_Base_Platform.h) = 1db6c68d76666251d0c3248a833f70bbd514225e
+SHA1 (patch-Swiften_Network_PlatformNATTraversalWorker.cpp) = e010f9866c1501136038b947bb024e1460c0583a
+SHA1 (patch-Swiften_SConscript) = e4c0a14ac0ae0bcf1e8e5e01a5d8c5c586849841

Index: pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot
diff -u pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot:1.2 pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot:1.3
--- pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot:1.2        Tue Mar  1 13:25:01 2016
+++ pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConscript.boot    Tue May  3 20:03:31 2022
@@ -1,19 +1,19 @@
-$NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.2 2016/03/01 13:25:01 wiz Exp $
+$NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.3 2022/05/03 20:03:31 nia Exp $
 
 Don't strip environment so pkgsrc settings survive.
 
---- BuildTools/SCons/SConscript.boot.orig      2015-07-22 14:04:23.000000000 +0000
+--- BuildTools/SCons/SConscript.boot.orig      2018-04-06 10:06:45.000000000 +0000
 +++ BuildTools/SCons/SConscript.boot
-@@ -106,11 +106,7 @@ vars.Add(BoolVariable("install_git_hooks
+@@ -126,11 +126,7 @@ vars.Add(PathVariable("sparkle_public_ds
  # Set up default build & configure environment
  ################################################################################
  
 -env_ENV = {
--      'PATH' : os.environ['PATH'],
--      'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
--      'TERM' : os.environ.get("TERM", ""),
+-    'PATH' : os.environ['PATH'],
+-    'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
+-    'TERM' : os.environ.get("TERM", ""),
 -}
 +env_ENV = os.environ
  
  if "MSVC_VERSION" in ARGUMENTS :
-       env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None))
+     env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None))
Index: pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConstruct
diff -u pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConstruct:1.2 pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConstruct:1.3
--- pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConstruct:1.2     Tue Mar  1 13:25:01 2016
+++ pkgsrc/chat/swift/patches/patch-BuildTools_SCons_SConstruct Tue May  3 20:03:31 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-BuildTools_SCons_SConstruct,v 1.2 2016/03/01 13:25:01 wiz Exp $
+$NetBSD: patch-BuildTools_SCons_SConstruct,v 1.3 2022/05/03 20:03:31 nia Exp $
 
 Don't strip environment so pkgsrc settings survive.
 
---- BuildTools/SCons/SConstruct.orig   2014-12-11 23:38:09.000000000 +0000
+--- BuildTools/SCons/SConstruct.orig   2018-04-06 10:06:45.000000000 +0000
 +++ BuildTools/SCons/SConstruct
-@@ -194,7 +194,7 @@ if env["PLATFORM"] != "win32" and env["P
-       gconf_env = conf_env.Clone()
-       conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
-       if conf.CheckPKG("gconf-2.0") :
--              gconf_bare_env = Environment()
-+              gconf_bare_env = Environment(ENV=os.environ)
-               gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
-               gconf_flags = {
-                               "LIBS": gconf_bare_env["LIBS"],
+@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["P
+     gconf_env = conf_env.Clone()
+     conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
+     if conf.CheckPKG("gconf-2.0") :
+-        gconf_bare_env = Environment()
++        gconf_bare_env = Environment(ENV=os.environ)
+         gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
+         if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) :
+             gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]]

Index: pkgsrc/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h
diff -u pkgsrc/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h:1.1 pkgsrc/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h:1.2
--- pkgsrc/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h:1.1      Sat Jun 23 09:40:53 2018
+++ pkgsrc/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h  Tue May  3 20:03:31 2022
@@ -1,14 +1,21 @@
-$NetBSD: patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h,v 1.1 2018/06/23 09:40:53 wiz Exp $
+$NetBSD: patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h,v 1.2 2022/05/03 20:03:31 nia Exp $
 
-Fix build with Qt 5.11.
+Support newer Qt versions. via Arch Linux.
 
---- Swift/QtUI/UserSearch/QtUserSearchWindow.h.orig    2016-02-29 10:29:02.000000000 +0000
+--- Swift/QtUI/UserSearch/QtUserSearchWindow.h.orig    2018-04-06 10:06:46.000000000 +0000
 +++ Swift/QtUI/UserSearch/QtUserSearchWindow.h
-@@ -6,6 +6,7 @@
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010-2016 Isode Limited.
++ * Copyright (c) 2010-2018 Isode Limited.
+  * All rights reserved.
+  * See the COPYING file for more information.
+  */
+@@ -8,6 +8,7 @@
  
- #pragma once
+ #include <set>
  
 +#include <QAbstractItemModel>
  #include <QWizard>
- #include <set>
  
+ #include <Swiften/Base/Override.h>

Added files:

Index: pkgsrc/chat/swift/files/swift-im.1
diff -u /dev/null pkgsrc/chat/swift/files/swift-im.1:1.1
--- /dev/null   Tue May  3 20:03:32 2022
+++ pkgsrc/chat/swift/files/swift-im.1  Tue May  3 20:03:31 2022
@@ -0,0 +1,43 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
+.TH SWIFT "1" "May 2022" "Swift 4.0.2" "User Commands"
+.SH NAME
+Swift \- manual page for Swift 4.0.2
+.SH SYNOPSIS
+.B swift-im
+[\fI\,OPTIONS\/\fR]...
+.SH DESCRIPTION
+Swift is an instant messaging client for the XMPP network.
+.SH OPTIONS
+.TP
+\fB\-\-debug\fR
+Turn on debug logging
+.TP
+\fB\-\-help\fR
+Show this help message
+.TP
+\fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-netbook\-mode\fR
+Use netbook mode display (unsupported)
+.TP
+\fB\-\-no\-tabs\fR
+Don't manage chat windows in tabs (unsupported)
+.TP
+\fB\-\-latency\-debug\fR
+Use latency debugging (unsupported)
+.HP
+\fB\-\-multi\-account\fR arg (=1) Number of accounts to open windows for (unsupported)
+.TP
+\fB\-\-start\-minimized\fR
+Don't show the login/roster window at startup
+.TP
+\fB\-\-enable\-jid\-adhocs\fR
+Enable AdHoc commands to custom JID's.
+.TP
+\fB\-\-language\fR arg
+Use a specific language, instead of the system\-wide
+one
+.TP
+\fB\-\-logfile\fR arg
+Save all logging information to a file

Index: pkgsrc/chat/swift/patches/patch-Swift_Controllers_ShowProfileController.h
diff -u /dev/null pkgsrc/chat/swift/patches/patch-Swift_Controllers_ShowProfileController.h:1.1
--- /dev/null   Tue May  3 20:03:32 2022
+++ pkgsrc/chat/swift/patches/patch-Swift_Controllers_ShowProfileController.h   Tue May  3 20:03:31 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-Swift_Controllers_ShowProfileController.h,v 1.1 2022/05/03 20:03:31 nia Exp $
+
+GCC 11 build fix, via Arch Linux.
+
+--- Swift/Controllers/ShowProfileController.h.orig     2018-04-06 10:06:46.000000000 +0000
++++ Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+ 
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+ 
++#include <map>
++
+ namespace Swift {
+     class VCardManager;
+     class ProfileWindow;
Index: pkgsrc/chat/swift/patches/patch-Swift_QtUI_Roster_GroupItemDelegate.cpp
diff -u /dev/null pkgsrc/chat/swift/patches/patch-Swift_QtUI_Roster_GroupItemDelegate.cpp:1.1
--- /dev/null   Tue May  3 20:03:32 2022
+++ pkgsrc/chat/swift/patches/patch-Swift_QtUI_Roster_GroupItemDelegate.cpp     Tue May  3 20:03:31 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-Swift_QtUI_Roster_GroupItemDelegate.cpp,v 1.1 2022/05/03 20:03:31 nia Exp $
+
+Support newer Qt versions. via Arch Linux.
+
+--- Swift/QtUI/Roster/GroupItemDelegate.cpp.orig       2018-04-06 10:06:46.000000000 +0000
++++ Swift/QtUI/Roster/GroupItemDelegate.cpp
+@@ -7,6 +7,7 @@
+ #include <Swift/QtUI/Roster/GroupItemDelegate.h>
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPen>
+ #include <QtDebug>
+ 
Index: pkgsrc/chat/swift/patches/patch-Swiften_Base_Platform.h
diff -u /dev/null pkgsrc/chat/swift/patches/patch-Swiften_Base_Platform.h:1.1
--- /dev/null   Tue May  3 20:03:32 2022
+++ pkgsrc/chat/swift/patches/patch-Swiften_Base_Platform.h     Tue May  3 20:03:31 2022
@@ -0,0 +1,26 @@
+$NetBSD: patch-Swiften_Base_Platform.h,v 1.1 2022/05/03 20:03:31 nia Exp $
+
+Support newer Boost versions. via Arch Linux.
+
+--- Swiften/Base/Platform.h.orig       2018-04-06 10:06:46.000000000 +0000
++++ Swiften/Base/Platform.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010 Isode Limited.
++ * Copyright (c) 2010-2019 Isode Limited.
+  * All rights reserved.
+  * See the COPYING file for more information.
+  */
+@@ -43,9 +43,9 @@
+ #endif
+ 
+ // Endianness
+-#include <boost/detail/endian.hpp>
+-#if defined(BOOST_LITTLE_ENDIAN)
++#include <boost/predef/other/endian.h>
++#if defined(BOOST_ENDIAN_LITTLE_BYTE)
+ #define SWIFTEN_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif defined(BOOST_ENDIAN_BIG_BYTE)
+ #define SWIFTEN_BIG_ENDIAN
+ #endif
Index: pkgsrc/chat/swift/patches/patch-Swiften_Network_PlatformNATTraversalWorker.cpp
diff -u /dev/null pkgsrc/chat/swift/patches/patch-Swiften_Network_PlatformNATTraversalWorker.cpp:1.1
--- /dev/null   Tue May  3 20:03:32 2022
+++ pkgsrc/chat/swift/patches/patch-Swiften_Network_PlatformNATTraversalWorker.cpp      Tue May  3 20:03:31 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-Swiften_Network_PlatformNATTraversalWorker.cpp,v 1.1 2022/05/03 20:03:31 nia Exp $
+
+Support newer Qt versions. via Arch Linux.
+
+--- Swiften/Network/PlatformNATTraversalWorker.cpp.orig        2018-04-06 10:06:46.000000000 +0000
++++ Swiften/Network/PlatformNATTraversalWorker.cpp
+@@ -157,7 +157,7 @@ NATTraversalInterface* PlatformNATTraver
+         miniUPnPInterface = new MiniUPnPInterface();
+         miniUPnPSupported = miniUPnPInterface->isAvailable();
+     }
+-    SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
++    SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << static_cast<bool>(miniUPnPSupported) << std::endl;
+     if (miniUPnPSupported) {
+         return miniUPnPInterface;
+     }
+@@ -168,7 +168,7 @@ NATTraversalInterface* PlatformNATTraver
+         natPMPInterface = new NATPMPInterface();
+         natPMPSupported = natPMPInterface->isAvailable();
+     }
+-    SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl;
++    SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << static_cast<bool>(natPMPSupported) << std::endl;
+     if (natPMPSupported) {
+         return natPMPInterface;
+     }
Index: pkgsrc/chat/swift/patches/patch-Swiften_SConscript
diff -u /dev/null pkgsrc/chat/swift/patches/patch-Swiften_SConscript:1.1
--- /dev/null   Tue May  3 20:03:32 2022
+++ pkgsrc/chat/swift/patches/patch-Swiften_SConscript  Tue May  3 20:03:31 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-Swiften_SConscript,v 1.1 2022/05/03 20:03:31 nia Exp $
+
+Reproducible Builds: Sort directory contents at build. via
+Arch Linux.
+
+--- Swiften/SConscript.orig    2018-04-06 10:06:46.000000000 +0000
++++ Swiften/SConscript
+@@ -567,7 +567,9 @@ if env["SCONS_STAGE"] == "build" :
+     swiften_includes = []
+     swiften_public_includes = []
+     top_path = env.Dir("..").abspath
+-    for root, dirs, files in os.walk(env.Dir(".").abspath) :
++    for root, dirs, files in sorted(os.walk(env.Dir(".").abspath)) :
++        dirs.sort()
++        files.sort()
+         if root.endswith("UnitTest") :
+             continue
+         for file in files :