Date: Saturday, July 11, 2015 @ 15:48:26 Author: arojas Revision: 136699
Rebuild with Qt 5.5 (FS#45609), fix tray icon in Plasma (FS#44249) Added: kadu/trunk/qt_dock_icon.patch Modified: kadu/trunk/PKGBUILD --------------------+ PKGBUILD | 10 +++++++--- qt_dock_icon.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-07-11 12:06:01 UTC (rev 136698) +++ PKGBUILD 2015-07-11 13:48:26 UTC (rev 136699) @@ -5,7 +5,7 @@ pkgname=kadu pkgver=2.1 -pkgrel=1 +pkgrel=2 pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client' arch=('i686' 'x86_64') url='http://www.kadu.net/' @@ -16,9 +16,10 @@ makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath' 'ninja' 'qt5-tools') install=kadu.install -source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2 qdatastream.patch) +source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2 qdatastream.patch qt_dock_icon.patch) md5sums=('b40f95123b1167c51c26bee8d56577d2' - '289814966b21db02efab4125eec41b74') + '289814966b21db02efab4125eec41b74' + '961d79dbbf5ec5827b8cda424773b9c8') prepare() { sed -i 's/unity_integration//g' $pkgname-$pkgver/Plugins.cmake @@ -30,6 +31,9 @@ # Fix build with Qt 5.5 cd $pkgname-$pkgver patch -p1 -i "$srcdir"/qdatastream.patch + +# Fix tray icon in Plasma 5 http://www.kadu.im/redmine/issues/3020 + patch -p2 -i "$srcdir"/qt_dock_icon.patch } build() { Added: qt_dock_icon.patch =================================================================== --- qt_dock_icon.patch (rev 0) +++ qt_dock_icon.patch 2015-07-11 13:48:26 UTC (rev 136699) @@ -0,0 +1,31 @@ +diff --git a/kadu-2.1/plugins/qt4_docking/qt4_docking.cpp b/kadu-2.1/plugins/qt4_docking/qt4_docking.cpp +index 5d228c8..1b576e6 100644 +--- a/kadu-2.1/plugins/qt4_docking/qt4_docking.cpp ++++ b/kadu-2.1/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)