swift: Update to 4.0.2. Fixes build with latest version of Qt/Boost.diff -r1.74 -r1.75 pkgsrc/chat/swift/Makefile
(nia)
@@ -1,28 +1,28 @@ | @@ -1,28 +1,28 @@ | |||
1 | # $NetBSD: Makefile,v 1.74 2022/04/24 22:45:40 tnn Exp $ | 1 | # $NetBSD: Makefile,v 1.75 2022/05/03 20:03:31 nia Exp $ | |
2 | 2 | |||
3 | DISTNAME= swift-3.0 | 3 | DISTNAME= swift-4.0.2 | |
4 | PKGREVISION= 55 | |||
5 | CATEGORIES= chat | 4 | CATEGORIES= chat | |
6 | MASTER_SITES= http://swift.im/downloads/releases/${DISTNAME}/ | 5 | MASTER_SITES= https://swift.im/downloads/releases/${DISTNAME}/ | |
7 | 6 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= https://swift.im/ | 8 | HOMEPAGE= https://swift.im/ | |
10 | COMMENT= Graphical XMPP Client | 9 | COMMENT= Graphical XMPP Client | |
11 | LICENSE= gnu-gpl-v3 | 10 | LICENSE= gnu-gpl-v3 | |
12 | 11 | |||
13 | # would be nicer to build with pkgsrc version, but | 12 | # would be nicer to build with pkgsrc version, but | |
14 | # swift-3.0 does not build with scons>=3 | 13 | # swift-3.0 does not build with scons>=3 | |
15 | #DEPENDS+= scons>=1.3:../../devel/scons | 14 | #DEPENDS+= scons>=1.3:../../devel/scons | |
15 | TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools | |||
16 | 16 | |||
17 | USE_LANGUAGES= c c++11 | 17 | USE_LANGUAGES= c c++11 | |
18 | USE_TOOLS+= pkg-config | 18 | USE_TOOLS+= pkg-config | |
19 | 19 | |||
20 | PYTHON_VERSIONS_ACCEPTED= 27 | 20 | PYTHON_VERSIONS_ACCEPTED= 27 | |
21 | 21 | |||
22 | INSTALLATION_DIRS= ${PKGMANDIR}/man1 | 22 | INSTALLATION_DIRS= ${PKGMANDIR}/man1 | |
23 | 23 | |||
24 | SUBST_CLASSES+= path | 24 | SUBST_CLASSES+= path | |
25 | SUBST_STAGE.path= pre-configure | 25 | SUBST_STAGE.path= pre-configure | |
26 | SUBST_SED.path+= -e "s,/usr/local/share/,${PREFIX}/share/," | 26 | SUBST_SED.path+= -e "s,/usr/local/share/,${PREFIX}/share/," | |
27 | SUBST_FILES.path+= SwifTools/Application/UnixApplicationPathProvider.cpp | 27 | SUBST_FILES.path+= SwifTools/Application/UnixApplicationPathProvider.cpp | |
28 | SUBST_MESSAGE.path= Fixing path to support files. | 28 | SUBST_MESSAGE.path= Fixing path to support files. | |
@@ -36,30 +36,30 @@ do-configure: | @@ -36,30 +36,30 @@ do-configure: | |||
36 | ${ECHO} "qt=\"${QTDIR}\"" > config.py ;\ | 36 | ${ECHO} "qt=\"${QTDIR}\"" > config.py ;\ | |
37 | ${ECHO} "qt5=1" >> config.py ;\ | 37 | ${ECHO} "qt5=1" >> config.py ;\ | |
38 | ${ECHO} "linkflags=\"-L${PREFIX}/lib -Wl,-R${QTDIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${BUILDLINK_DIR}/lib ${LDFLAGS}\"" >> config.py ; \ | 38 | ${ECHO} "linkflags=\"-L${PREFIX}/lib -Wl,-R${QTDIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${BUILDLINK_DIR}/lib ${LDFLAGS}\"" >> config.py ; \ | |
39 | ${ECHO} "ccflags=\"${CXXFLAGS}\"" >> config.py ; \ | 39 | ${ECHO} "ccflags=\"${CXXFLAGS}\"" >> config.py ; \ | |
40 | ${ECHO} "allow_warnings=\"true\"" >> config.py ; | 40 | ${ECHO} "allow_warnings=\"true\"" >> config.py ; | |
41 | 41 | |||
42 | do-build: | 42 | do-build: | |
43 | cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./scons Swift | 43 | cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./scons Swift | |
44 | 44 | |||
45 | do-install: | 45 | do-install: | |
46 | cd ${WRKSRC} && \ | 46 | cd ${WRKSRC} && \ | |
47 | ${SETENV} ${MAKE_ENV} ./scons \ | 47 | ${SETENV} ${MAKE_ENV} ./scons \ | |
48 | SWIFT_INSTALLDIR=${DESTDIR}/${PREFIX} ${DESTDIR}/${PREFIX} | 48 | SWIFT_INSTALLDIR=${DESTDIR}/${PREFIX} ${DESTDIR}/${PREFIX} | |
49 | ${INSTALL_DATA} ${WRKSRC}/Swift/Packaging/Debian/debian/swift-im.1 \ | 49 | ${INSTALL_DATA} ${FILESDIR}/swift-im.1 \ | |
50 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | 50 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | |
51 | 51 | |||
52 | .include "../../lang/python/application.mk" | 52 | .include "../../lang/python/application.mk" | |
53 | BUILDLINK_API_DEPENDS.boost-headers+= boost-headers>=1.61.0nb1 | 53 | BUILDLINK_API_DEPENDS.boost-headers+= boost-headers>=1.61.0nb1 | |
54 | .include "../../devel/boost-headers/buildlink3.mk" | 54 | .include "../../devel/boost-headers/buildlink3.mk" | |
55 | .include "../../devel/boost-libs/buildlink3.mk" | 55 | .include "../../devel/boost-libs/buildlink3.mk" | |
56 | .include "../../devel/libidn/buildlink3.mk" | 56 | .include "../../devel/libidn/buildlink3.mk" | |
57 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | 57 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | |
58 | .include "../../security/openssl/buildlink3.mk" | 58 | .include "../../security/openssl/buildlink3.mk" | |
59 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 59 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
60 | .include "../../x11/qt5-qtbase/buildlink3.mk" | 60 | .include "../../x11/qt5-qtbase/buildlink3.mk" | |
61 | .include "../../x11/qt5-qtmultimedia/buildlink3.mk" | 61 | .include "../../x11/qt5-qtmultimedia/buildlink3.mk" | |
62 | .include "../../x11/qt5-qttools/buildlink3.mk" | |||
63 | .include "../../x11/qt5-qtwebkit/buildlink3.mk" | 62 | .include "../../x11/qt5-qtwebkit/buildlink3.mk" | |
63 | .include "../../x11/qt5-qtsvg/buildlink3.mk" | |||
64 | .include "../../x11/qt5-qtx11extras/buildlink3.mk" | 64 | .include "../../x11/qt5-qtx11extras/buildlink3.mk" | |
65 | .include "../../mk/bsd.pkg.mk" | 65 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,13 @@ | @@ -1,8 +1,13 @@ | |||
1 | $NetBSD: distinfo,v 1.8 2021/10/26 10:05:26 nia Exp $ | 1 | $NetBSD: distinfo,v 1.9 2022/05/03 20:03:31 nia Exp $ | |
2 | 2 | |||
3 | BLAKE2s (swift-3.0.tar.gz) = 32fb78855476743ab1d09f3ed978c1f24963be8ada6971864430bb060a0e02b5 | 3 | BLAKE2s (swift-4.0.2.tar.gz) = c00949dee944afc250920f4f53a951806707f980e49a867421db90a73879bc30 | |
4 | SHA512 (swift-3.0.tar.gz) = 3d635e9a904a48a8553e153627242e44fad5d57c48152d3c698cdf73363bdc1c566a13692c7fb2d70f0f6b773f7ff9c2cd717687501940e3b8a30b6bebc44f63 | 4 | SHA512 (swift-4.0.2.tar.gz) = b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167 | |
5 | Size (swift-3.0.tar.gz) = 11084214 bytes | 5 | Size (swift-4.0.2.tar.gz) = 19083393 bytes | |
6 | SHA1 (patch-BuildTools_SCons_SConscript.boot) = f134f01b73e6862171c432c76088947d616c6d3d | 6 | SHA1 (patch-BuildTools_SCons_SConscript.boot) = ad585d6b732efc3301470b31f9f525fbb7afe798 | |
7 | SHA1 (patch-BuildTools_SCons_SConstruct) = a2d68e60a41ea74ad753b17f97c7887cbd458c46 | 7 | SHA1 (patch-BuildTools_SCons_SConstruct) = 0406dcd173e799ee8361553733830b5135a513ea | |
8 | SHA1 (patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h) = 2ada5f6a38f48c89142371817918121b01819aa7 | 8 | SHA1 (patch-Swift_Controllers_ShowProfileController.h) = 889b8507c302b4b3d849130207476a82d10d2ee5 | |
9 | SHA1 (patch-Swift_QtUI_Roster_GroupItemDelegate.cpp) = 0f8ba193194bf6c24624c20e2d7fa7747c4435bd | |||
10 | SHA1 (patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h) = 7e4307a33e73a4f8c230a93616a37ce8f8796d57 | |||
11 | SHA1 (patch-Swiften_Base_Platform.h) = 1db6c68d76666251d0c3248a833f70bbd514225e | |||
12 | SHA1 (patch-Swiften_Network_PlatformNATTraversalWorker.cpp) = e010f9866c1501136038b947bb024e1460c0583a | |||
13 | SHA1 (patch-Swiften_SConscript) = e4c0a14ac0ae0bcf1e8e5e01a5d8c5c586849841 |
.\" 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
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.2 2016/03/01 13:25:01 wiz Exp $ | 1 | $NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.3 2022/05/03 20:03:31 nia Exp $ | |
2 | 2 | |||
3 | Don't strip environment so pkgsrc settings survive. | 3 | Don't strip environment so pkgsrc settings survive. | |
4 | 4 | |||
5 | --- BuildTools/SCons/SConscript.boot.orig 2015-07-22 14:04:23.000000000 +0000 | 5 | --- BuildTools/SCons/SConscript.boot.orig 2018-04-06 10:06:45.000000000 +0000 | |
6 | +++ BuildTools/SCons/SConscript.boot | 6 | +++ BuildTools/SCons/SConscript.boot | |
7 | @@ -106,11 +106,7 @@ vars.Add(BoolVariable("install_git_hooks | 7 | @@ -126,11 +126,7 @@ vars.Add(PathVariable("sparkle_public_ds | |
8 | # Set up default build & configure environment | 8 | # Set up default build & configure environment | |
9 | ################################################################################ | 9 | ################################################################################ | |
10 | 10 | |||
11 | -env_ENV = { | 11 | -env_ENV = { | |
12 | - 'PATH' : os.environ['PATH'], | 12 | - 'PATH' : os.environ['PATH'], | |
13 | - 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""), | 13 | - 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""), | |
14 | - 'TERM' : os.environ.get("TERM", ""), | 14 | - 'TERM' : os.environ.get("TERM", ""), | |
15 | -} | 15 | -} | |
16 | +env_ENV = os.environ | 16 | +env_ENV = os.environ | |
17 | 17 | |||
18 | if "MSVC_VERSION" in ARGUMENTS : | 18 | if "MSVC_VERSION" in ARGUMENTS : | |
19 | env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None)) | 19 | env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None)) |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-BuildTools_SCons_SConstruct,v 1.2 2016/03/01 13:25:01 wiz Exp $ | 1 | $NetBSD: patch-BuildTools_SCons_SConstruct,v 1.3 2022/05/03 20:03:31 nia Exp $ | |
2 | 2 | |||
3 | Don't strip environment so pkgsrc settings survive. | 3 | Don't strip environment so pkgsrc settings survive. | |
4 | 4 | |||
5 | --- BuildTools/SCons/SConstruct.orig 2014-12-11 23:38:09.000000000 +0000 | 5 | --- BuildTools/SCons/SConstruct.orig 2018-04-06 10:06:45.000000000 +0000 | |
6 | +++ BuildTools/SCons/SConstruct | 6 | +++ BuildTools/SCons/SConstruct | |
7 | @@ -194,7 +194,7 @@ if env["PLATFORM"] != "win32" and env["P | 7 | @@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["P | |
8 | gconf_env = conf_env.Clone() | 8 | gconf_env = conf_env.Clone() | |
9 | conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG}) | 9 | conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG}) | |
10 | if conf.CheckPKG("gconf-2.0") : | 10 | if conf.CheckPKG("gconf-2.0") : | |
11 | - gconf_bare_env = Environment() | 11 | - gconf_bare_env = Environment() | |
12 | + gconf_bare_env = Environment(ENV=os.environ) | 12 | + gconf_bare_env = Environment(ENV=os.environ) | |
13 | gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') | 13 | gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') | |
14 | gconf_flags = { | 14 | if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) : | |
15 | "LIBS": gconf_bare_env["LIBS"], | 15 | gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]] |
$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;
$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>
$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
$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;
}
$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 :
@@ -1,14 +1,21 @@ | @@ -1,14 +1,21 @@ | |||
1 | $NetBSD: patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h,v 1.1 2018/06/23 09:40:53 wiz Exp $ | 1 | $NetBSD: patch-Swift_QtUI_UserSearch_QtUserSearchWindow.h,v 1.2 2022/05/03 20:03:31 nia Exp $ | |
2 | 2 | |||
3 | Fix build with Qt 5.11. | 3 | Support newer Qt versions. via Arch Linux. | |
4 | 4 | |||
5 | --- Swift/QtUI/UserSearch/QtUserSearchWindow.h.orig 2016-02-29 10:29:02.000000000 +0000 | 5 | --- Swift/QtUI/UserSearch/QtUserSearchWindow.h.orig 2018-04-06 10:06:46.000000000 +0000 | |
6 | +++ Swift/QtUI/UserSearch/QtUserSearchWindow.h | 6 | +++ Swift/QtUI/UserSearch/QtUserSearchWindow.h | |
7 | @@ -6,6 +6,7 @@ | 7 | @@ -1,5 +1,5 @@ | |
8 | /* | |||
9 | - * Copyright (c) 2010-2016 Isode Limited. | |||
10 | + * Copyright (c) 2010-2018 Isode Limited. | |||
11 | * All rights reserved. | |||
12 | * See the COPYING file for more information. | |||
13 | */ | |||
14 | @@ -8,6 +8,7 @@ | |||
8 | 15 | |||
9 | #pragma once | 16 | #include <set> | |
10 | 17 | |||
11 | +#include <QAbstractItemModel> | 18 | +#include <QAbstractItemModel> | |
12 | #include <QWizard> | 19 | #include <QWizard> | |
13 | #include <set> | |||
14 | 20 | |||
21 | #include <Swiften/Base/Override.h> |