commit swift-im for openSUSE:Factory

Hello community, here is the log from the commit of package swift-im for openSUSE:Factory checked in at 2019-04-02 09:23:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swift-im (Old) and /work/SRC/openSUSE:Factory/.swift-im.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swift-im" Tue Apr 2 09:23:15 2019 rev:11 rq:690391 version:4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes 2018-06-19 11:56:13.670596724 +0200 +++ /work/SRC/openSUSE:Factory/.swift-im.new.25356/swift-im.changes 2019-04-02 09:23:15.460748252 +0200 @@ -1,0 +2,7 @@ +Mon Apr 1 13:34:41 UTC 2019 - mvetter@suse.com + +- Add swift-im-boost-tribool.patch: Fix for boost >= 1.69.0 +- Remove deprecated libboost_signals-devel + swift-im uses signal2 which is in libboost_headers-devel + +------------------------------------------------------------------- New: ---- swift-im-boost-tribool.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swift-im.spec ++++++ --- /var/tmp/diff_new_pack.TqFjcV/_old 2019-04-02 09:23:16.228748767 +0200 +++ /var/tmp/diff_new_pack.TqFjcV/_new 2019-04-02 09:23:16.232748770 +0200 @@ -1,7 +1,7 @@ # # spec file for package swift-im # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,7 @@ Source1: http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz.asc Source2: %{name}.keyring Patch0: swift-4.0-qt5.11-includes.patch +Patch1: swift-im-boost-tribool.patch BuildRequires: desktop-file-utils BuildRequires: docbook-dtds BuildRequires: fdupes @@ -44,7 +45,6 @@ BuildRequires: libboost_program_options-devel BuildRequires: libboost_regex-devel BuildRequires: libboost_serialization-devel -BuildRequires: libboost_signals-devel BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel BuildRequires: libminiupnpc-devel @@ -108,6 +108,7 @@ %prep %setup -q -n swift-4.0 %patch0 -p1 +%patch1 -p1 # Remove 3rd party libraries # Following ones are used from distro: ++++++ swift-im-boost-tribool.patch ++++++

From a2dc74cd0e4891037b97b6a782de80458675e4f0 Mon Sep 17 00:00:00 2001 From: Bruce Stephens Date: Wed, 9 Jan 2019 16:21:20 +0000 Subject: [PATCH] Don't assume that tribool has an implicit bool conversion

In boost 1.68.0 the conversion is implicit, but in 1.69.0 it's explicit and we must explicitly call it. Change-Id: I24eb78be7510c89b88342d28c539cad4977f99fd --- Swiften/Network/PlatformNATTraversalWorker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Swiften/Network/PlatformNATTraversalWorker.cpp b/Swiften/Network/PlatformNATTraversalWorker.cpp index af1204914f..041ad2defb 100644 --- a/Swiften/Network/PlatformNATTraversalWorker.cpp +++ b/Swiften/Network/PlatformNATTraversalWorker.cpp @@ -157,7 +157,7 @@ NATTraversalInterface* PlatformNATTraversalWorker::getNATTraversalInterface() co 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* PlatformNATTraversalWorker::getNATTraversalInterface() co 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; }