[arch-commits] Commit in swift/repos (3 files)

[Sergej Pupykin]

    Date: Thursday, January 30, 2020 @ 10:39:19
  Author: spupykin
Revision: 560107

archrelease: copy trunk to community-x86_64

Added:
  swift/repos/community-x86_64/
  swift/repos/community-x86_64/PKGBUILD
    (from rev 560106, swift/trunk/PKGBUILD)
  swift/repos/community-x86_64/build-fix.patch
    (from rev 560106, swift/trunk/build-fix.patch)

-----------------+
 PKGBUILD        |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 build-fix.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

Copied: swift/repos/community-x86_64/PKGBUILD (from rev 560106, swift/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2020-01-30 10:39:19 UTC (rev 560107)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
+# Previous maintainer: Emmanuel Gil Peyrot <linkmauve at linkmauve.fr>
+
+pkgbase='swift'
+pkgname=('swift-im' 'swiften')
+pkgver=4.0.2
+pkgrel=1
+arch=('x86_64')
+pkgdesc='XMPP client written in C++ with Qt and Swiften'
+url="http://swift.im/"
+license=('GPL3')
+makedepends=('python2' 'openssl' 'boost' 'qt5-base' 'qt5-multimedia'
+             'qt5-webkit' 'qt5-x11extras' 'qt5-tools' 'qt5-svg')
+source=("http://swift.im/downloads/releases/$pkgbase-$pkgver/$pkgbase-$pkgver.tar.gz"
+	"build-fix.patch")
+sha256sums=('1c7c9fb981ecb9b589890c36523dbbabde2f0a708f71a66eb71e9526bf8e0a70'
+            'f1b710245c5630aea585378875b334aa05dea7cb85a80f156e8494d1d5ad9a47')
+
+# Those options need to be consistent between each scons invocation.
+_scons_options='max_jobs=1 optimize=1 debug=0 swiften_dll=1'
+
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -p1 <"$srcdir"/build-fix.patch
+}
+
+build() {
+  cd $pkgbase-$pkgver
+  ./scons $_scons_options Swift Swiften
+}
+
+package_swift-im() {
+  pkgdesc='XMPP client written in C++ with Qt and Swiften'
+  depends=("swiften=$pkgver" 'qt5-base' 'qt5-multimedia' 'qt5-webkit'
+           'qt5-x11extras' 'qt5-svg' 'libxss' 'hicolor-icon-theme')
+
+  cd $pkgbase-$pkgver
+  ./scons $_scons_options SWIFT_INSTALLDIR="$pkgdir"/usr/ "$pkgdir"/usr/
+}
+
+package_swiften() {
+  pkgdesc='XMPP library written in C++ with Boost'
+  depends=('boost-libs' 'libxml2' 'libidn' 'avahi' 'openssl')
+
+  cd $pkgbase-$pkgver
+  ./scons $_scons_options SWIFTEN_INSTALLDIR="$pkgdir"/usr/ "$pkgdir"/usr/
+}

Copied: swift/repos/community-x86_64/build-fix.patch (from rev 560106, swift/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch	                        (rev 0)
+++ community-x86_64/build-fix.patch	2020-01-30 10:39:19 UTC (rev 560107)
@@ -0,0 +1,32 @@
+diff -wbBur swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+--- swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h	2018-04-06 13:06:46.000000000 +0300
++++ swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h	2019-10-08 20:52:23.171475337 +0300
+@@ -9,6 +9,7 @@
+ #include <set>
+ 
+ #include <QWizard>
++#include <QAbstractItemModel>
+ 
+ #include <Swiften/Base/Override.h>
+ 
+diff -wbBur swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp
+--- swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp	2018-04-06 13:06:46.000000000 +0300
++++ swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp	2019-10-08 21:12:25.284754131 +0300
+@@ -157,7 +157,7 @@
+         miniUPnPInterface = new MiniUPnPInterface();
+         miniUPnPSupported = miniUPnPInterface->isAvailable();
+     }
+-    SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
++//    SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl;
+     if (miniUPnPSupported) {
+         return miniUPnPInterface;
+     }
+@@ -168,7 +168,7 @@
+         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: " << natPMPSupported << std::endl;
+     if (natPMPSupported) {
+         return natPMPInterface;
+     }