[arch-commits] Commit in quassel/trunk (PKGBUILD qt55.patch)

[Evangelos Foutras]

    Date: Tuesday, December 8, 2015 @ 12:56:26
  Author: foutrelis
Revision: 150258

Fix build with Qt 5.5

Added:
  quassel/trunk/qt55.patch
Modified:
  quassel/trunk/PKGBUILD

------------+
 PKGBUILD   |   16 +++++++++++-----
 qt55.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-08 11:52:22 UTC (rev 150257)
+++ PKGBUILD	2015-12-08 11:56:26 UTC (rev 150258)
@@ -13,16 +13,22 @@
 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)
+        $pkgbase.conf
+        qt55.patch)
 sha256sums=('6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897'
             '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
-            'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+            'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8'
+            '85adfbe4613688d0f282deb5250fb39f7534d9e6ac7450cf035cca7bbcb25cda')
 
+prepare() {
+  cd "${srcdir}"
+  mkdir build{,-client,-mono}
+  cd quassel-${pkgver}
+  patch -Np1 -i ../qt55.patch
+}
+
 build() {
   cd "${srcdir}"
-  [[ ! -d build ]] && mkdir build
-  [[ ! -d build-client ]] && mkdir build-client
-  [[ ! -d build-mono ]] && mkdir build-mono
 
   # Core
   cd "${srcdir}"/build

Added: qt55.patch
===================================================================
--- qt55.patch	                        (rev 0)
+++ qt55.patch	2015-12-08 11:56:26 UTC (rev 150258)
@@ -0,0 +1,50 @@
+From 078477395aaec1edee90922037ebc8a36b072d90 Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi at email.com>
+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"