Hello community, here is the log from the commit of package kadu for openSUSE:Factory checked in at 2015-11-24 22:33:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kadu (Old) and /work/SRC/openSUSE:Factory/.kadu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kadu" Changes: -------- --- /work/SRC/openSUSE:Factory/kadu/kadu.changes 2015-09-08 18:11:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kadu.new/kadu.changes 2015-11-24 22:33:55.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 18 22:00:40 UTC 2015 - [email protected] + +- Add qdatastream-qt55.patch: fix compilation with Qt >= 5.5. +- Add qt_dock_icon.patch: fix tray icon in Plasma 5. + +------------------------------------------------------------------- New: ---- qdatastream-qt55.patch qt_dock_icon.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kadu.spec ++++++ --- /var/tmp/diff_new_pack.B68nCk/_old 2015-11-24 22:33:57.000000000 +0100 +++ /var/tmp/diff_new_pack.B68nCk/_new 2015-11-24 22:33:57.000000000 +0100 @@ -33,6 +33,10 @@ Patch0: enable_external_plugins.patch # PATCH-FIX-UPSTREAM 0001-fix_SDK_DIR.patch [email protected] -- fixed CMake Buildfailure Patch1: 0001-fix_SDK_DIR.patch +# PATCH-FIX-UPSTREAM qdatastream-qt55.patch -- fix compilation with Qt55 +Patch2: qdatastream-qt55.patch +# PATCH-FIX-UPSTREAM qt_dock_icon.patch -- fix tray icon in Plasma 5 +Patch3: qt_dock_icon.patch ### 1x - External Plugins ### Source10: http://download.kadu.im/external-plugins/2.0/anonymous_check-2.0.1.tar.bz2 Source11: http://download.kadu.im/external-plugins/2.0/import_history-2.0.tar.bz2 @@ -259,6 +263,8 @@ # %patch0 %patch1 -p1 +%patch2 +%patch3 -p1 # fix QtCrypto path sed -e 's:QtCrypto/QtCrypto:Qca-qt5/QtCrypto/QtCrypto:' -i kadu-core/main.cpp ++++++ qdatastream-qt55.patch ++++++ Index: kadu-core/os/single-application/single-application.cpp =================================================================== --- kadu-core/os/single-application/single-application.cpp.orig +++ kadu-core/os/single-application/single-application.cpp @@ -26,6 +26,7 @@ #include "long-lived-lock-file.h" #include <QtCore/QCoreApplication> +#include <QtCore/QDataStream> #include <QtCore/QDir> #include <QtCore/QRegExp> #include <QtNetwork/QLocalServer> ++++++ qt_dock_icon.patch ++++++ diff --git a/plugins/qt4_docking/qt4_docking.cpp b/plugins/qt4_docking/qt4_docking.cpp index 5d228c8..1b576e6 100644 --- a/plugins/qt4_docking/qt4_docking.cpp +++ b/plugins/qt4_docking/qt4_docking.cpp @@ -26,6 +26,7 @@ #include <QtCore/QEvent> #include <QtGui/QMouseEvent> #include <QtGui/QMovie> +#include <QtGui/QIcon> #include "plugins/docking/docking.h" @@ -68,7 +69,8 @@ Qt4TrayIcon::Qt4TrayIcon(QWidget *parent) : { kdebugf(); - setIcon(DockingManager::instance()->defaultIcon().icon()); + QIcon icon = QIcon::fromTheme(DockingManager::instance()->defaultIcon().fullPath()); + setIcon(icon); connect(this, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason))); @@ -102,7 +104,7 @@ void Qt4TrayIcon::changeTrayIcon(const KaduIcon &icon) Movie->deleteLater(); Movie = 0; } - setIcon(icon.icon()); + setIcon(QIcon::fromTheme(icon.fullPath())); } void Qt4TrayIcon::changeTrayMovie(const QString &moviePath)
