Date: Saturday, February 13, 2016 @ 21:47:23 Author: arojas Revision: 161480
Update to 3.0 Modified: kadu/trunk/PKGBUILD Deleted: kadu/trunk/qdatastream.patch kadu/trunk/qt_dock_icon.patch --------------------+ PKGBUILD | 28 +++++++++------------------- qdatastream.patch | 11 ----------- qt_dock_icon.patch | 31 ------------------------------- 3 files changed, 9 insertions(+), 61 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-13 20:22:41 UTC (rev 161479) +++ PKGBUILD 2016-02-13 20:47:23 UTC (rev 161480) @@ -4,20 +4,21 @@ # Contributor: Jaroslaw Swierczynski <[email protected]> pkgname=kadu -pkgver=2.1 -pkgrel=3 +pkgver=3.0 +pkgrel=1 pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client' arch=('i686' 'x86_64') url='http://www.kadu.net/' license=('GPL') -depends=('libgadu' 'libxss' 'enchant' 'phonon-qt5' 'qca-qt5' 'libidn' +depends=('libgadu' 'libxss' 'enchant' 'phonon-qt5' 'qca-qt5' 'libmpdclient' 'libotr' 'libarchive' 'injeqt' 'xdg-utils' 'qt5-multimedia' - 'qt5-quick1' 'qt5-x11extras' 'qt5-svg' 'hicolor-icon-theme') + 'qt5-x11extras' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'hicolor-icon-theme') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath' 'ninja' - 'qt5-tools') + 'qt5-tools' 'qxmpp') +optdepends=('qxmpp: Jabber protocol') install=kadu.install -source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2 qdatastream.patch qt_dock_icon.patch) -md5sums=('b40f95123b1167c51c26bee8d56577d2' +source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) +md5sums=('9d42c16682b338c14e6a912efd739447' '289814966b21db02efab4125eec41b74' '961d79dbbf5ec5827b8cda424773b9c8') @@ -24,16 +25,6 @@ prepare() { sed -i 's/unity_integration//g' $pkgname-$pkgver/Plugins.cmake sed -i 's/indicator_docking//g' $pkgname-$pkgver/Plugins.cmake - -# Fix build with coinstallable Qca-qt5 - sed -i 's|<QtCrypto/QtCrypto>|<Qca-qt5/QtCrypto/QtCrypto>|g' $pkgname-$pkgver/kadu-core/main.cpp - -# 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() { @@ -44,8 +35,7 @@ -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DQT_QMAKE_EXECUTABLE=qmake-qt4 + -DCMAKE_INSTALL_LIBDIR=/usr/lib ninja } Deleted: qdatastream.patch =================================================================== --- qdatastream.patch 2016-02-13 20:22:41 UTC (rev 161479) +++ qdatastream.patch 2016-02-13 20:47:23 UTC (rev 161480) @@ -1,11 +0,0 @@ -diff -ru kadu-2.1.orig/kadu-core/os/single-application/single-application.cpp kadu-2.1/kadu-core/os/single-application/single-application.cpp ---- kadu-2.1.orig/kadu-core/os/single-application/single-application.cpp 2015-07-11 11:49:28.020701056 +0200 -+++ kadu-2.1/kadu-core/os/single-application/single-application.cpp 2015-07-11 11:50:30.834040618 +0200 -@@ -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> Deleted: qt_dock_icon.patch =================================================================== --- qt_dock_icon.patch 2016-02-13 20:22:41 UTC (rev 161479) +++ qt_dock_icon.patch 2016-02-13 20:47:23 UTC (rev 161480) @@ -1,31 +0,0 @@ -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)
