Date: Monday, December 7, 2015 @ 09:27:54 Author: fyan Revision: 149759
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: kadu/repos/community-staging-i686/ kadu/repos/community-staging-i686/PKGBUILD (from rev 149756, kadu/trunk/PKGBUILD) kadu/repos/community-staging-i686/kadu.install (from rev 149756, kadu/trunk/kadu.install) kadu/repos/community-staging-i686/qdatastream.patch (from rev 149756, kadu/trunk/qdatastream.patch) kadu/repos/community-staging-i686/qt_dock_icon.patch (from rev 149756, kadu/trunk/qt_dock_icon.patch) kadu/repos/community-staging-x86_64/ kadu/repos/community-staging-x86_64/PKGBUILD (from rev 149758, kadu/trunk/PKGBUILD) kadu/repos/community-staging-x86_64/kadu.install (from rev 149758, kadu/trunk/kadu.install) kadu/repos/community-staging-x86_64/qdatastream.patch (from rev 149758, kadu/trunk/qdatastream.patch) kadu/repos/community-staging-x86_64/qt_dock_icon.patch (from rev 149758, kadu/trunk/qt_dock_icon.patch) ---------------------------------------------+ community-staging-i686/PKGBUILD | 55 ++++++++++++++++++++++++++ community-staging-i686/kadu.install | 12 +++++ community-staging-i686/qdatastream.patch | 11 +++++ community-staging-i686/qt_dock_icon.patch | 31 ++++++++++++++ community-staging-x86_64/PKGBUILD | 55 ++++++++++++++++++++++++++ community-staging-x86_64/kadu.install | 12 +++++ community-staging-x86_64/qdatastream.patch | 11 +++++ community-staging-x86_64/qt_dock_icon.patch | 31 ++++++++++++++ 8 files changed, 218 insertions(+) Copied: kadu/repos/community-staging-i686/PKGBUILD (from rev 149756, kadu/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-12-07 08:27:54 UTC (rev 149759) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> + +pkgname=kadu +pkgver=2.1 +pkgrel=3 +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' + 'libmpdclient' 'libotr' 'libarchive' 'injeqt' 'xdg-utils' 'qt5-multimedia' + 'qt5-quick1' 'qt5-x11extras' 'qt5-svg' 'hicolor-icon-theme') +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 qt_dock_icon.patch) +md5sums=('b40f95123b1167c51c26bee8d56577d2' + '289814966b21db02efab4125eec41b74' + '961d79dbbf5ec5827b8cda424773b9c8') + +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() { + mkdir build + cd build + + cmake ../$pkgname-$pkgver \ + -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 + ninja +} + +package() { + DESTDIR="$pkgdir" LIBDIR=/usr/lib ninja -C build install + chrpath -d "$pkgdir"/usr/lib/kadu/plugins/*.so +} Copied: kadu/repos/community-staging-i686/kadu.install (from rev 149756, kadu/trunk/kadu.install) =================================================================== --- community-staging-i686/kadu.install (rev 0) +++ community-staging-i686/kadu.install 2015-12-07 08:27:54 UTC (rev 149759) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + Copied: kadu/repos/community-staging-i686/qdatastream.patch (from rev 149756, kadu/trunk/qdatastream.patch) =================================================================== --- community-staging-i686/qdatastream.patch (rev 0) +++ community-staging-i686/qdatastream.patch 2015-12-07 08:27:54 UTC (rev 149759) @@ -0,0 +1,11 @@ +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> Copied: kadu/repos/community-staging-i686/qt_dock_icon.patch (from rev 149756, kadu/trunk/qt_dock_icon.patch) =================================================================== --- community-staging-i686/qt_dock_icon.patch (rev 0) +++ community-staging-i686/qt_dock_icon.patch 2015-12-07 08:27:54 UTC (rev 149759) @@ -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) Copied: kadu/repos/community-staging-x86_64/PKGBUILD (from rev 149758, kadu/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-12-07 08:27:54 UTC (rev 149759) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> + +pkgname=kadu +pkgver=2.1 +pkgrel=3 +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' + 'libmpdclient' 'libotr' 'libarchive' 'injeqt' 'xdg-utils' 'qt5-multimedia' + 'qt5-quick1' 'qt5-x11extras' 'qt5-svg' 'hicolor-icon-theme') +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 qt_dock_icon.patch) +md5sums=('b40f95123b1167c51c26bee8d56577d2' + '289814966b21db02efab4125eec41b74' + '961d79dbbf5ec5827b8cda424773b9c8') + +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() { + mkdir build + cd build + + cmake ../$pkgname-$pkgver \ + -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 + ninja +} + +package() { + DESTDIR="$pkgdir" LIBDIR=/usr/lib ninja -C build install + chrpath -d "$pkgdir"/usr/lib/kadu/plugins/*.so +} Copied: kadu/repos/community-staging-x86_64/kadu.install (from rev 149758, kadu/trunk/kadu.install) =================================================================== --- community-staging-x86_64/kadu.install (rev 0) +++ community-staging-x86_64/kadu.install 2015-12-07 08:27:54 UTC (rev 149759) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + Copied: kadu/repos/community-staging-x86_64/qdatastream.patch (from rev 149758, kadu/trunk/qdatastream.patch) =================================================================== --- community-staging-x86_64/qdatastream.patch (rev 0) +++ community-staging-x86_64/qdatastream.patch 2015-12-07 08:27:54 UTC (rev 149759) @@ -0,0 +1,11 @@ +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> Copied: kadu/repos/community-staging-x86_64/qt_dock_icon.patch (from rev 149758, kadu/trunk/qt_dock_icon.patch) =================================================================== --- community-staging-x86_64/qt_dock_icon.patch (rev 0) +++ community-staging-x86_64/qt_dock_icon.patch 2015-12-07 08:27:54 UTC (rev 149759) @@ -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)