Date: Thursday, February 11, 2016 @ 08:32:02 Author: jlichtblau Revision: 161137
upgpkg: quassel 0.12.3-1 - new upstream release Modified: quassel/trunk/PKGBUILD Deleted: quassel/trunk/qt55.patch ------------+ PKGBUILD | 17 ++++++++--------- qt55.patch | 50 -------------------------------------------------- 2 files changed, 8 insertions(+), 59 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-11 07:30:36 UTC (rev 161136) +++ PKGBUILD 2016-02-11 07:32:02 UTC (rev 161137) @@ -1,11 +1,11 @@ # $Id$ -# Maintainer: Vesa Kaihlavirta <[email protected]> # Maintainer: Jaroslav Lichtblau <[email protected]> +# Contributor: Vesa Kaihlavirta <[email protected]> pkgbase=quassel pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic') -pkgver=0.12.2 -pkgrel=4 +pkgver=0.12.3 +pkgrel=1 pkgdesc="Next-generation distributed IRC client" arch=('i686' 'x86_64') url="http://quassel-irc.org/"; @@ -13,18 +13,15 @@ makedepends=('cmake' 'extra-cmake-modules' 'qt5-base' 'qt5-tools' 'qca-qt5' 'qt5-script' 'knotifyconfig') source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2 $pkgbase.service - $pkgbase.conf - qt55.patch) -sha256sums=('6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897' + $pkgbase.conf) +sha256sums=('4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434' '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f' - 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8' - '85adfbe4613688d0f282deb5250fb39f7534d9e6ac7450cf035cca7bbcb25cda') + 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') prepare() { cd "${srcdir}" mkdir build{,-client,-mono} cd quassel-${pkgver} - patch -Np1 -i ../qt55.patch } build() { @@ -83,6 +80,7 @@ package_quassel-core() { pkgdesc="Next-generation distributed IRC client - core only" depends=('icu' 'qca-qt5' 'qt5-script') +optdepends=('postgresql: PostgreSQL database support') backup=(etc/conf.d/quassel) install=quassel.install cd "${srcdir}"/build @@ -111,6 +109,7 @@ package_quassel-monolithic() { pkgdesc="Next-generation distributed IRC client - monolithic" depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig') +optdepends=('postgresql: PostgreSQL database support') conflicts=('quassel-client') install=quassel-monolithic.install cd "${srcdir}"/build-mono Deleted: qt55.patch =================================================================== --- qt55.patch 2016-02-11 07:30:36 UTC (rev 161136) +++ qt55.patch 2016-02-11 07:32:02 UTC (rev 161137) @@ -1,50 +0,0 @@ -From 078477395aaec1edee90922037ebc8a36b072d90 Mon Sep 17 00:00:00 2001 -From: Armin K <[email protected]> -Date: Sat, 2 May 2015 23:04:53 +0200 -Subject: [PATCH] Fix build with Qt-5.5 - -http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c ---- - src/client/treemodel.cpp | 5 ++--- - src/common/peer.h | 1 + - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp -index f599803..fd47bc0 100644 ---- a/src/client/treemodel.cpp -+++ b/src/client/treemodel.cpp -@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds() - ChildStatus cs = _childStatus; - #ifndef QT_NO_DEBUG - QModelIndex parent = indexByItem(parentItem); --#endif - Q_ASSERT(cs.parent == parent); - Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1); -- -+#endif - _aboutToRemoveOrInsert = false; - for (int i = cs.start; i <= cs.end; i++) { - connectItem(parentItem->child(i)); -@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds() - #ifndef QT_NO_DEBUG - ChildStatus cs = _childStatus; - QModelIndex parent = indexByItem(parentItem); --#endif - Q_ASSERT(cs.parent == parent); - Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1); -+#endif - _aboutToRemoveOrInsert = false; - - endRemoveRows(); -diff --git a/src/common/peer.h b/src/common/peer.h -index 02eb3c0..79204b4 100644 ---- a/src/common/peer.h -+++ b/src/common/peer.h -@@ -22,6 +22,7 @@ - #define PEER_H - - #include <QAbstractSocket> -+#include <QDataStream> - #include <QPointer> - - #include "authhandler.h"
