Hello community, here is the log from the commit of package swift-im for openSUSE:Factory checked in at 2020-06-09 00:05:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swift-im (Old) and /work/SRC/openSUSE:Factory/.swift-im.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swift-im" Tue Jun 9 00:05:49 2020 rev:12 rq:812482 version:4.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/swift-im/swift-im.changes 2019-04-02 09:23:15.460748252 +0200 +++ /work/SRC/openSUSE:Factory/.swift-im.new.3606/swift-im.changes 2020-06-09 00:07:50.065965485 +0200 @@ -1,0 +2,9 @@ +Sat Jun 6 08:00:37 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 4.0.2 + * Allow setting vCard on servers that do not return an + empty vCard on fresh accounts +- Add patch to fix build with Qt 5.15: + * 0001-Fix-build-with-Qt-5.15.patch + +------------------------------------------------------------------- Old: ---- swift-4.0.tar.gz swift-4.0.tar.gz.asc New: ---- 0001-Fix-build-with-Qt-5.15.patch swift-4.0.2.tar.gz swift-4.0.2.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swift-im.spec ++++++ --- /var/tmp/diff_new_pack.A96Ex9/_old 2020-06-09 00:07:52.529974227 +0200 +++ /var/tmp/diff_new_pack.A96Ex9/_new 2020-06-09 00:07:52.533974241 +0200 @@ -1,7 +1,7 @@ # # spec file for package swift-im # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,17 +23,19 @@ %define _flags V=1 swiften_dll=1 test=none optimize=1 debug=0 cxxflags='%{optflags}' %endif Name: swift-im -Version: 4.0 +Version: 4.0.2 Release: 0 Summary: XMPP client License: GPL-3.0-only Group: Productivity/Networking/Talk/Clients -Url: http://swift.im/ +URL: https://swift.im/ Source0: http://swift.im/downloads/releases/%{_name}-%{version}/%{_name}-%{version}.tar.gz 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 +# PATCH-FIX-UPSTREAM +Patch2: 0001-Fix-build-with-Qt-5.15.patch BuildRequires: desktop-file-utils BuildRequires: docbook-dtds BuildRequires: fdupes @@ -106,9 +108,7 @@ Swiften is a C++ library for implementing XMPP applications. %prep -%setup -q -n swift-4.0 -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 -n swift-%{version} # Remove 3rd party libraries # Following ones are used from distro: @@ -148,15 +148,11 @@ %fdupes %{buildroot}%{_prefix} %suse_update_desktop_file -r %{_name} Network InstantMessaging -%icon_theme_cache_post -%icon_theme_cache_postun - %post -n libSwiften4 -p /sbin/ldconfig %postun -n libSwiften4 -p /sbin/ldconfig %files %license COPYING - %{_bindir}/%{_name}-im %{_bindir}/%{_name}-open-uri %{_datadir}/applications/%{_name}.desktop ++++++ 0001-Fix-build-with-Qt-5.15.patch ++++++ >From 13f7c2778bd5115d5342a8a4bcd0ecc4eca94ce8 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Sat, 6 Jun 2020 10:09:14 +0200 Subject: [PATCH] Fix build with Qt 5.15 --- Swift/QtUI/Roster/GroupItemDelegate.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Swift/QtUI/Roster/GroupItemDelegate.cpp b/Swift/QtUI/Roster/GroupItemDelegate.cpp index 0356aa0..28af259 100644 --- a/Swift/QtUI/Roster/GroupItemDelegate.cpp +++ b/Swift/QtUI/Roster/GroupItemDelegate.cpp @@ -7,6 +7,7 @@ #include <Swift/QtUI/Roster/GroupItemDelegate.h> #include <QPainter> +#include <QPainterPath> #include <QPen> #include <QtDebug> -- 2.26.2 ++++++ swift-4.0.tar.gz -> swift-4.0.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/swift-im/swift-4.0.tar.gz /work/SRC/openSUSE:Factory/.swift-im.new.3606/swift-4.0.2.tar.gz differ: char 5, line 1
