Hello community, here is the log from the commit of package swift-im for openSUSE:Factory checked in at 2016-07-30 00:27:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swift-im (Old) and /work/SRC/openSUSE:Factory/.swift-im.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swift-im" Changes: -------- --- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes 2016-05-25 21:27:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.swift-im.new/swift-im.changes 2016-07-30 00:27:46.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Jul 27 11:53:12 UTC 2016 - [email protected] + +- Add swift-missing-assert.patch: Fix missing include cassert. + Needed to build successfully on Leap. + +------------------------------------------------------------------- +Tue Jul 26 11:12:25 UTC 2016 - [email protected] + +- Update to version 4 Beta 2: + * Support for message carbons (XEP-0280) + * Improved spell checker support on Linux + * Enabled trellis mode as a default feature, allowing several tiled chats windows to be shown at once + * New chat theme including a new font + * And assorted smaller features and usability enhancements + * Fix Swift bug introduced in 4.0-beta1 that results in the UI sometimes getting stuck during login +- Add: + * swift-libminiupnpc.patch: Tumbleweed uses libminiupnpc 2.0 this adds support for version 1 and 2 + * swift-system-font.patch: swift brings its own Fonts, which don't look very good + we stay with the system fonts (for roster, menu. Chatwindow uses Webview with different font) + +------------------------------------------------------------------- Old: ---- swift-3.0.tar.gz New: ---- swift-4.0beta2.tar.gz swift-libminiupnpc.patch swift-missing-assert.patch swift-system-font.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swift-im.spec ++++++ --- /var/tmp/diff_new_pack.rbufhv/_old 2016-07-30 00:27:48.000000000 +0200 +++ /var/tmp/diff_new_pack.rbufhv/_new 2016-07-30 00:27:48.000000000 +0200 @@ -18,13 +18,20 @@ %define _name swift Name: swift-im -Version: 3.0 +Version: 4.0~beta2 Release: 0 Summary: XMPP client License: GPL-3.0 Group: Productivity/Networking/Talk/Clients Url: http://swift.im/ -Source0: http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz +#Source0: http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz +Source0: http://swift.im/downloads/releases/swift-4.0beta2/swift-4.0beta2.tar.gz +# FIX-OPENSUSE: Got added to upstream https://github.com/swift/swift/commit/f0e513b179d1b04c0e16537886b0dc5215537279 +Patch0: swift-libminiupnpc.patch +# FIX-OPENSUSE: Use system font. Reverting https://github.com/swift/swift/commit/baf480995fc479573f549042b2a5f065ee0701ea.diff +Patch1: swift-system-font.patch +# FIX-UPSTREAM: Add missing include cassert. Sent upstream: https://github.com/swift/swift/pull/32 +Patch2: swift-missing-assert.patch BuildRequires: avahi-devel BuildRequires: boost-devel BuildRequires: desktop-file-utils @@ -39,6 +46,7 @@ BuildRequires: libQt5Widgets-devel BuildRequires: libexpat-devel BuildRequires: libidn-devel +BuildRequires: libminiupnpc-devel BuildRequires: libopenssl-devel BuildRequires: libqt5-linguist-devel BuildRequires: libqt5-qtbase-devel @@ -50,7 +58,6 @@ BuildRequires: python-xml BuildRequires: scons BuildRequires: zlib-devel -BuildRequires: libminiupnpc-devel %description Swift is an easy to setup and use Jabber/XMPP instant messaging chat @@ -58,11 +65,11 @@ # -------------------------------- swiften --------------------------- -%package -n libSwiften3 +%package -n libSwiften4 Summary: Cross-platform XMPP client/server library Group: System/Libraries -%description -n libSwiften3 +%description -n libSwiften4 Swiften is a robust, high-quality, standards-compliant, cross-platform, and performant C++ library for implementing XMPP applications. @@ -71,14 +78,19 @@ %package -n swiften-devel Summary: Cross-platform XMPP client/server library (development files) Group: Development/Libraries/C and C++ -Requires: libSwiften3 = %{version} +Requires: libSwiften4 = %{version} %description -n swiften-devel Swiften is a robust, high-quality, standards-compliant, cross-platform, and performant C++ library for implementing XMPP applications. %prep -%setup -q -n %{_name}-%{version} +%setup -q -n swift-4.0beta2 +# TW uses version 2 +%patch0 -p1 +# We want to stay with system fonts not having custom ones +%patch1 -p1 -R +%patch2 -p1 # Remove 3rd party libraries # Following ones are used from distro: @@ -96,8 +108,6 @@ # DNS (they use it on Android) find 3rdParty/Unbound -delete find 3rdParty/Ldns -delete -# Windows stuff -find 3rdParty/Snarl -delete # Only for developers find 3rdParty/LCov -delete # Not used by swift yet @@ -150,8 +160,8 @@ %postun %icon_theme_cache_postun -%post -n libSwiften3 -p /sbin/ldconfig -%postun -n libSwiften3 -p /sbin/ldconfig +%post -n libSwiften4 -p /sbin/ldconfig +%postun -n libSwiften4 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -164,7 +174,7 @@ %{_datadir}/pixmaps/%{_name}.xpm %{_datadir}/icons/hicolor/*/apps/%{_name}.png -%files -n libSwiften3 +%files -n libSwiften4 %defattr(-,root,root) %{_prefix}/lib/libSwiften.so.* ++++++ swift-libminiupnpc.patch ++++++ >From f23437a2a4a5f37500eac38ea557b74d59fdc3f0 Mon Sep 17 00:00:00 2001 From: Tobias Markmann <[email protected]> Date: Fri, 22 Jul 2016 16:07:08 +0200 Subject: [PATCH] Add support for libminiupnpc version 2 Test-Information: Build successfully on openSUSE Tumbleweed which only has libminiupnpc 2.0 as package. Unit tests passed. Change-Id: I650e1224014162b55cdf64df7e72466b52dc3ade --- diff --git a/Swiften/Network/MiniUPnPInterface.cpp b/Swiften/Network/MiniUPnPInterface.cpp index b2afd88..94305b9 100644 --- a/Swiften/Network/MiniUPnPInterface.cpp +++ b/Swiften/Network/MiniUPnPInterface.cpp @@ -35,7 +35,11 @@ MiniUPnPInterface::MiniUPnPInterface() : p(std::make_shared<Private>()) { p->isValid = false; int error = 0; +#if MINIUPNPC_API_VERSION > 14 + p->deviceList = upnpDiscover(1500 /* timeout in ms */, nullptr, nullptr, 0, 0 /* do IPv6? */, 2 /* default TTL */, &error); +#else p->deviceList = upnpDiscover(1500 /* timeout in ms */, nullptr, nullptr, 0, 0 /* do IPv6? */, &error); +#endif if (!p->deviceList) { return; } ++++++ swift-missing-assert.patch ++++++ diff -urEbwB swift-4.0beta2/Swiften/Parser/ExpatParser.cpp swift-4.0beta2.new/Swiften/Parser/ExpatParser.cpp --- swift-4.0beta2/Swiften/Parser/ExpatParser.cpp 2016-07-21 00:17:03.000000000 +0200 +++ swift-4.0beta2.new/Swiften/Parser/ExpatParser.cpp 2016-07-26 17:34:55.366136514 +0200 @@ -8,6 +8,8 @@ #include <string> +#include <cassert> + #include <expat.h> #include <boost/numeric/conversion/cast.hpp> diff -urEbwB swift-4.0beta2/Swiften/Parser/PayloadParsers/CommandParser.cpp swift-4.0beta2.new/Swiften/Parser/PayloadParsers/CommandParser.cpp --- swift-4.0beta2/Swiften/Parser/PayloadParsers/CommandParser.cpp 2016-07-21 00:17:03.000000000 +0200 +++ swift-4.0beta2.new/Swiften/Parser/PayloadParsers/CommandParser.cpp 2016-07-27 11:12:53.301560059 +0200 @@ -8,6 +8,8 @@ #include <boost/cast.hpp> +#include <cassert> + #include <Swiften/Parser/PayloadParsers/FormParser.h> #include <Swiften/Parser/PayloadParsers/FormParserFactory.h> diff -urEbwB swift-4.0beta2/Swiften/Parser/PayloadParsers/DiscoInfoParser.cpp swift-4.0beta2.new/Swiften/Parser/PayloadParsers/DiscoInfoParser.cpp --- swift-4.0beta2/Swiften/Parser/PayloadParsers/DiscoInfoParser.cpp 2016-07-21 00:17:03.000000000 +0200 +++ swift-4.0beta2.new/Swiften/Parser/PayloadParsers/DiscoInfoParser.cpp 2016-07-27 11:13:42.309729464 +0200 @@ -8,6 +8,8 @@ #include <boost/optional.hpp> +#include <cassert> + #include <Swiften/Parser/PayloadParsers/FormParser.h> namespace Swift { diff -urEbwB swift-4.0beta2/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.cpp swift-4.0beta2.new/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.cpp --- swift-4.0beta2/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.cpp 2016-07-21 00:17:03.000000000 +0200 +++ swift-4.0beta2.new/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.cpp 2016-07-27 11:13:26.121673508 +0200 @@ -8,6 +8,8 @@ #include <boost/cast.hpp> +#include <cassert> + #include <Swiften/Parser/PayloadParsers/FormParser.h> #include <Swiften/Parser/PayloadParsers/FormParserFactory.h> diff -urEbwB swift-4.0beta2/Swiften/Parser/PayloadParsers/RosterParser.cpp swift-4.0beta2.new/Swiften/Parser/PayloadParsers/RosterParser.cpp --- swift-4.0beta2/Swiften/Parser/PayloadParsers/RosterParser.cpp 2016-07-21 00:17:03.000000000 +0200 +++ swift-4.0beta2.new/Swiften/Parser/PayloadParsers/RosterParser.cpp 2016-07-27 11:16:04.034219363 +0200 @@ -8,6 +8,8 @@ #include <boost/optional.hpp> +#include <cassert> + #include <Swiften/Parser/SerializingParser.h> namespace Swift { diff -urEbwB swift-4.0beta2/Swiften/Parser/PayloadParsers/SearchPayloadParser.cpp swift-4.0beta2.new/Swiften/Parser/PayloadParsers/SearchPayloadParser.cpp --- swift-4.0beta2/Swiften/Parser/PayloadParsers/SearchPayloadParser.cpp 2016-07-21 00:17:03.000000000 +0200 +++ swift-4.0beta2.new/Swiften/Parser/PayloadParsers/SearchPayloadParser.cpp 2016-07-27 11:15:35.922122188 +0200 @@ -7,6 +7,7 @@ #include <Swiften/Parser/PayloadParsers/SearchPayloadParser.h> #include <boost/cast.hpp> +#include <cassert> #include <Swiften/Parser/PayloadParsers/FormParser.h> #include <Swiften/Parser/PayloadParsers/FormParserFactory.h> diff -urEbwB swift-4.0beta2/Swiften/Parser/PayloadParsers/StreamInitiationParser.cpp swift-4.0beta2.new/Swiften/Parser/PayloadParsers/StreamInitiationParser.cpp --- swift-4.0beta2/Swiften/Parser/PayloadParsers/StreamInitiationParser.cpp 2016-07-21 00:17:03.000000000 +0200 +++ swift-4.0beta2.new/Swiften/Parser/PayloadParsers/StreamInitiationParser.cpp 2016-07-27 11:14:40.649931129 +0200 @@ -9,6 +9,8 @@ #include <boost/lexical_cast.hpp> #include <boost/cast.hpp> +#include <cassert> + #include <Swiften/Parser/PayloadParsers/FormParserFactory.h> #include <Swiften/Parser/PayloadParsers/FormParser.h> #include <Swiften/Base/foreach.h> diff -urEbwB swift-4.0beta2/Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h swift-4.0beta2.new/Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h --- swift-4.0beta2/Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h 2016-07-21 00:17:03.000000000 +0200 +++ swift-4.0beta2.new/Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h 2016-07-27 12:12:23.817902227 +0200 @@ -6,6 +6,8 @@ #pragma once +#include <cassert> + #include <Swiften/Elements/Payload.h> #include <Swiften/Parser/PayloadParser.h> #include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h> diff -urEbwB swift-4.0beta2/Swiften/Parser/PayloadParsers/VCardParser.cpp swift-4.0beta2.new/Swiften/Parser/PayloadParsers/VCardParser.cpp --- swift-4.0beta2/Swiften/Parser/PayloadParsers/VCardParser.cpp 2016-07-21 00:17:03.000000000 +0200 +++ swift-4.0beta2.new/Swiften/Parser/PayloadParsers/VCardParser.cpp 2016-07-27 11:14:10.329826322 +0200 @@ -4,6 +4,8 @@ * See the COPYING file for more information. */ +#include <cassert> + #include <Swiften/Parser/PayloadParsers/VCardParser.h> #include <Swiften/Base/DateTime.h> ++++++ swift-system-font.patch ++++++ diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 56f2907..6e36fa4 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -13,6 +13,7 @@ #include <QApplication> #include <QFile> +#include <QFontDatabase> #include <QMap> #include <QMessageBox> #include <qdebug.h> @@ -171,6 +172,36 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa Log::setLogLevel(Swift::Log::debug); } + // Load fonts + std::vector<std::string> fontNames = { + "themes/Default/Lato2OFL/Lato-Black.ttf", + "themes/Default/Lato2OFL/Lato-BlackItalic.ttf", + "themes/Default/Lato2OFL/Lato-Bold.ttf", + "themes/Default/Lato2OFL/Lato-BoldItalic.ttf", + "themes/Default/Lato2OFL/Lato-Hairline.ttf", + "themes/Default/Lato2OFL/Lato-HairlineItalic.ttf", + "themes/Default/Lato2OFL/Lato-Heavy.ttf", + "themes/Default/Lato2OFL/Lato-HeavyItalic.ttf", + "themes/Default/Lato2OFL/Lato-Italic.ttf", + "themes/Default/Lato2OFL/Lato-Light.ttf", + "themes/Default/Lato2OFL/Lato-LightItalic.ttf", + "themes/Default/Lato2OFL/Lato-Medium.ttf", + "themes/Default/Lato2OFL/Lato-MediumItalic.ttf", + "themes/Default/Lato2OFL/Lato-Regular.ttf", + "themes/Default/Lato2OFL/Lato-Semibold.ttf", + "themes/Default/Lato2OFL/Lato-SemiboldItalic.ttf", + "themes/Default/Lato2OFL/Lato-Thin.ttf", + "themes/Default/Lato2OFL/Lato-ThinItalic.ttf" + }; + + for (auto&& fontName : fontNames) { + std::string fontPath = std::string(":/") + fontName; + int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath)); + assert((error != -1) && "Failed to load font."); + } + + QApplication::setFont(QFont("Lato")); + bool enableAdHocCommandOnJID = options.count("enable-jid-adhocs") > 0; tabs_ = nullptr; if (options.count("no-tabs") && !splitter_) {
