Hello community, here is the log from the commit of package psi+ for openSUSE:Factory checked in at 2019-02-27 21:12:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psi+ (Old) and /work/SRC/openSUSE:Factory/.psi+.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi+" Wed Feb 27 21:12:36 2019 rev:50 rq:679228 version:1.4.569+2 Changes: -------- --- /work/SRC/openSUSE:Factory/psi+/psi+-lang.changes 2018-12-07 14:37:40.162902439 +0100 +++ /work/SRC/openSUSE:Factory/.psi+.new.28833/psi+-lang.changes 2019-02-27 21:12:36.967185452 +0100 @@ -1,0 +2,10 @@ +Tue Feb 26 09:52:52 UTC 2019 - Jiri Slaby <jsl...@suse.com> + +- update to 1.4.566 + +------------------------------------------------------------------- +Wed Jan 23 08:55:59 UTC 2019 - Jiri Slaby <jsl...@suse.com> + +- update to 1.4.532 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/psi+/psi+.changes 2018-12-07 14:37:40.734901730 +0100 +++ /work/SRC/openSUSE:Factory/.psi+.new.28833/psi+.changes 2019-02-27 21:12:36.991185445 +0100 @@ -1,0 +2,57 @@ +Tue Feb 26 09:50:39 UTC 2019 - Jiri Slaby <jsl...@suse.com> + +- update to 1.4.569+2 + * Update documentation + * libpsi relinked + * Install skins with other extra files when they are available + * SystemInfo: improve detection of macOS version and full name + * Turned off switching of AutoJid to the resource which sent a receipt + * Tiny code refactoring. + * iris relinked + * Fix clang warnings + * fixed EventIdGenerator::getId method + * fixed issue #424 +- enable Qt WebEngine +- add license for qite +- add 0001-iris-return-a-value-from-descriptionFromXml.patch + +------------------------------------------------------------------- +Wed Jan 23 08:59:12 UTC 2019 - Jiri Slaby <jsl...@suse.com> + +- update to 1.4.544+1 + * Reject mucjoindlg if corresponding captcha dialog is rejected + * a try to fix crash mentioned in #411 + * Happy new year 2019! (#413) + * silk iconset better meta info (#419) + * Online Help dead #404 (#420) + * iconsets update (#415) + * email update + * Applied network session close handling patch by Jiri Slaby + * Attempt to fix reconnection to XMPP server after system wakeup + * Fixed crash on multiple vcard update for the same muc contact + * Bring back smooth scrolling + * Fixed regression with copy&paste + * Use plaintext system messages in private chats for consistency + with everything else + * Started work on inline media share (xep-0385) + * Started QITE integration + * Allow set topic even where there is not any topic yet + * Get rid of psi_features for plugins + * Allow plugins send javascript to chatlogs + * More webkit related API for plugins + * Don't rewrite muc jid with participant jid + * Uncommented act_add_to_roster in urlobject menu + * Fixed Psi+ detection + * Step forward with JS filters + * Keep messageview js filters just in plugin manager + * A little progress with js message view filters + * Removed obsolete profile migration + * A try to restore compatibility with old webkit (old javascript standard) + * Remove anti-focus stealing prevention code. + * Merged New History implementation by Alexey Andreev (liuch) + * removed the last piece of map2json + * Fixed scrollkeeper for old webkit version + * Improve scroll keeper with WebEngine version. + * Added support for XEP-0157 + +------------------------------------------------------------------- Old: ---- psi+-1.4.411+0.tar.xz psi-plus-l10n-1.4.404+0.tar.xz New: ---- 0001-iris-return-a-value-from-descriptionFromXml.patch psi+-1.4.569+2.tar.xz psi-plus-l10n-1.4.566+0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi+-lang.spec ++++++ --- /var/tmp/diff_new_pack.pUHjBX/_old 2019-02-27 21:12:37.943185202 +0100 +++ /var/tmp/diff_new_pack.pUHjBX/_new 2019-02-27 21:12:37.943185202 +0100 @@ -1,7 +1,7 @@ # # spec file for package psi+-lang # -# 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 @@ -16,11 +16,11 @@ # -%define version_unconverted 1.4.404+0 +%define version_unconverted 1.4.566+0 Name: psi+-lang Url: https://github.com/psi-plus/psi-plus-l10n -Version: 1.4.404+0 +Version: 1.4.566+0 Release: 0 Summary: Translations for Psi+ License: GPL-2.0-or-later ++++++ psi+.spec ++++++ --- /var/tmp/diff_new_pack.pUHjBX/_old 2019-02-27 21:12:37.967185196 +0100 +++ /var/tmp/diff_new_pack.pUHjBX/_new 2019-02-27 21:12:37.967185196 +0100 @@ -1,7 +1,7 @@ # # spec file for package psi+ # -# 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 @@ -18,16 +18,17 @@ %define __builder ninja -%define version_unconverted 1.4.411+0 +%define version_unconverted 1.4.569+2 Name: psi+ Url: https://github.com/psi-plus -Version: 1.4.411+0 +Version: 1.4.569+2 Release: 0 Summary: Jabber client using Qt -License: GPL-2.0-or-later +License: GPL-2.0-or-later AND Apache-2.0 Group: Productivity/Networking/Talk/Clients Source0: psi+-%{version}.tar.xz +Patch0: 0001-iris-return-a-value-from-descriptionFromXml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 3.1 BuildRequires: dos2unix @@ -55,8 +56,7 @@ BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5WebKit) -BuildRequires: cmake(Qt5WebKitWidgets) +BuildRequires: cmake(Qt5WebEngine) BuildRequires: cmake(Qt5X11Extras) BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(qca2-qt5) @@ -375,6 +375,7 @@ %prep %setup -q +%autopatch -p1 %build %cmake \ @@ -394,6 +395,10 @@ install -m 0644 -t %{buildroot}%{_datadir}/psi-plus/plugins/include/ src/plugins/include/* sed -e 's:target.path.*:target.path = %pluginspath:' src/plugins/psiplugin.pri > %{buildroot}%{_datadir}/psi-plus/plugins/psiplugin.pri +# these are in %%doc and %%license +rm -f %{buildroot}%{_datadir}/psi-plus/COPYING +rm -f %{buildroot}%{_datadir}/psi-plus/README.html + %fdupes $RPM_BUILD_ROOT/%{_datadir} dos2unix ChangeLog.Psi+.txt @@ -528,7 +533,8 @@ %files %defattr(-,root,root) -%doc ChangeLog.Psi+.txt COPYING README TODO +%doc ChangeLog.Psi+.txt README README.html TODO +%license COPYING 3rdparty/qite/LICENSE %{_bindir}/psi-plus %{_datadir}/pixmaps/psi-plus.png %{_datadir}/applications/psi-plus.desktop @@ -564,6 +570,7 @@ %dir %{iconspath}/emoticons %{iconspath}/emoticons/default %{_datadir}/psi-plus/client_icons.txt +%{_datadir}/psi-plus/skins %{_datadir}/psi-plus/sound %{_datadir}/psi-plus/themes ++++++ 0001-iris-return-a-value-from-descriptionFromXml.patch ++++++ >From cc19a91bcf3173b5fb88315d8080ff9e2df9fe13 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jsl...@suse.cz> Date: Tue, 26 Feb 2019 11:15:47 +0100 Subject: [PATCH] iris: return a value from descriptionFromXml The function is supposed to return the created value. Otherwise we see: ../iris/src/xmpp/xmpp-im/jingle-ft.cpp: In member function 'virtual QSharedPointer<XMPP::Jingle::Description> XMPP::Jingle::FileTransfer::FTA n::descriptionFromXml(const QDomElement&)': ../iris/src/xmpp/xmpp-im/jingle-ft.cpp:204:1: warning: no return statement in function returning non-void [-Wreturn-type] } ^ --- iris/src/xmpp/xmpp-im/jingle-ft.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iris/src/xmpp/xmpp-im/jingle-ft.cpp b/iris/src/xmpp/xmpp-im/jingle-ft.cpp index 364a9fb6..8ee8e3a8 100644 --- a/iris/src/xmpp/xmpp-im/jingle-ft.cpp +++ b/iris/src/xmpp/xmpp-im/jingle-ft.cpp @@ -200,7 +200,7 @@ void FTApplication::incomingSession(Session *session) QSharedPointer<Description> FTApplication::descriptionFromXml(const QDomElement &el) { Q_UNUSED(el) // TODO - QSharedPointer<Description>(); + return QSharedPointer<Description>(); } } // namespace FileTransfer -- 2.20.1 ++++++ psi+-1.4.411+0.tar.xz -> psi+-1.4.569+2.tar.xz ++++++ /work/SRC/openSUSE:Factory/psi+/psi+-1.4.411+0.tar.xz /work/SRC/openSUSE:Factory/.psi+.new.28833/psi+-1.4.569+2.tar.xz differ: char 25, line 1 ++++++ psi-plus-l10n-1.4.404+0.tar.xz -> psi-plus-l10n-1.4.566+0.tar.xz ++++++ ++++ 22927 lines of diff (skipped)
