Hello community, here is the log from the commit of package psi+ for openSUSE:Factory checked in at 2015-12-03 13:32:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psi+ (Old) and /work/SRC/openSUSE:Factory/.psi+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi+" Changes: -------- --- /work/SRC/openSUSE:Factory/psi+/psi+.changes 2015-10-14 16:45:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psi+.new/psi+.changes 2015-12-03 13:32:25.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Nov 24 08:32:00 UTC 2015 - [email protected] + +- update to 20151120 + * updated translations + * some bugfixes +- remove: qt55-build-fixes.patch -- now unneeded, fixed upstream +- enable X11 Screen Saver extension + +------------------------------------------------------------------- Old: ---- psi+-20150925.tar.xz qt55-build-fixes.patch New: ---- psi+-20151120.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi+.spec ++++++ --- /var/tmp/diff_new_pack.6yjssp/_old 2015-12-03 13:32:27.000000000 +0100 +++ /var/tmp/diff_new_pack.6yjssp/_new 2015-12-03 13:32:27.000000000 +0100 @@ -22,14 +22,13 @@ Name: psi+ Url: https://github.com/psi-plus -Version: 20150925 +Version: 20151120 Release: 0 Summary: Jabber client using Qt License: GPL-2.0+ Group: Productivity/Networking/Talk/Clients Source0: psi+-%{version}.tar.xz Source1: psi-plus-l10n-1.tar.xz -Patch0: qt55-build-fixes.patch Patch1: proper-activate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: aspell-devel @@ -59,6 +58,7 @@ BuildRequires: libqt4-devel >= 4.7.0 %endif BuildRequires: libtidy-devel +BuildRequires: libXScrnSaver-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files BuildRequires: xz @@ -332,8 +332,8 @@ %prep %setup -q -b 1 -%patch0 -p1 -%patch1 -p1 +# hopefully not needed +#%%patch1 -p1 %if 0%{?with_qt5} sed -i 's@\<lrelease\>@&-qt5@' ../psi-plus-l10n-1/update-repo.sh ++++++ proper-activate.patch ++++++ --- /var/tmp/diff_new_pack.6yjssp/_old 2015-12-03 13:32:27.000000000 +0100 +++ /var/tmp/diff_new_pack.6yjssp/_new 2015-12-03 13:32:27.000000000 +0100 @@ -1,31 +1,17 @@ From: Jiri Slaby <[email protected]> -With QT5, this tries to load kdeui.so which loads libqt4 -> boom. - -Instead of the hack, properly send an alert for the widget. +Properly send an alert for the widget. --- - src/common.cpp | 13 +------------ - src/tools/advwidget/advwidget.cpp | 4 ++++ - 2 files changed, 5 insertions(+), 12 deletions(-) + src/common.cpp | 1 + + src/tools/advwidget/advwidget.cpp | 3 +++ + 2 files changed, 4 insertions(+) --- a/src/common.cpp +++ b/src/common.cpp -@@ -586,18 +586,7 @@ void bringToFront(QWidget *widget, bool) - w->raise(); - w->activateWindow(); - -- // hack to real bring to front in kde. kde (at least 4.8.5) forbids stilling -- // focus from other applications. this may be fixed on more recent versions. -- // should be removed some day. preferable way for such hacks is plugins. -- // probably works only with gcc. -- if (qgetenv("DESKTOP_SESSION") == "kde-plasma") { -- typedef int (*ActWinFunction)(WId, long); -- ActWinFunction kwinActivateWindow = (ActWinFunction)QLibrary::resolve( -- "libkdeui", 5, "_ZN13KWindowSystem17forceActiveWindowEml"); -- if (kwinActivateWindow) { -- kwinActivateWindow(widget->winId(), 0); -- } -- } +@@ -598,6 +598,7 @@ void bringToFront(QWidget *widget, bool) + kwinActivateWindow(widget->winId(), 0); + } + } + QApplication::alert(w); } @@ -42,11 +28,3 @@ flashing_ = yes; if (parentWidget_->window() != parentWidget_) return; -@@ -285,6 +288,7 @@ void GAdvancedWidget::Private::doFlash(b - } - XSendEvent(xdisplay, rootwin, False, (SubstructureRedirectMask | SubstructureNotifyMask), &e); - -+ qDebug() << "tried to " << (yes ? "" : "de") << "flash a window " << parentWidget_->window()->windowTitle(); - #else - Q_UNUSED(yes) - #endif ++++++ psi+-20150925.tar.xz -> psi+-20151120.tar.xz ++++++ /work/SRC/openSUSE:Factory/psi+/psi+-20150925.tar.xz /work/SRC/openSUSE:Factory/.psi+.new/psi+-20151120.tar.xz differ: char 25, line 1 ++++++ psi-plus-l10n-1.tar.xz ++++++ ++++ 20844 lines of diff (skipped)
