[SCM] quassel packaging branch, master, updated. debian/1%0.12.2-1-2-g72416d0

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/quassel.git;a=commitdiff;h=72416d0

The following commit has been merged in the master branch:
commit 72416d0a6324f5dd9071dcacc42ca172f7a72e59
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Oct 29 17:06:30 2015 +0100

    Fix FTBFS with Qt 5.5.
    
    * Fix FTBFS with Qt 5.5. (Closes: #802868)
      - Add 04_fix_ftbfs_qt55.patch
---
 debian/changelog                       |  7 +++++
 debian/patches/04_fix_ftbfs_qt55.patch | 50 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 823b0cf..d1a358e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+quassel (1:0.12.2-2) unstable; urgency=medium
+
+  * Fix FTBFS with Qt 5.5. (Closes: #802868)
+    - Add 04_fix_ftbfs_qt55.patch
+
+ -- Felix Geyer <fgeyer at debian.org>  Thu, 29 Oct 2015 17:05:50 +0100
+
 quassel (1:0.12.2-1) unstable; urgency=medium
 
   [ Felix Geyer ]
diff --git a/debian/patches/04_fix_ftbfs_qt55.patch b/debian/patches/04_fix_ftbfs_qt55.patch
new file mode 100644
index 0000000..a6fd846
--- /dev/null
+++ b/debian/patches/04_fix_ftbfs_qt55.patch
@@ -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"
diff --git a/debian/patches/series b/debian/patches/series
index ed795b9..a3e4451 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_default_network_channel.patch
 02_set-required-libs-and-flags.patch
 03_force_icon_theme.patch
+04_fix_ftbfs_qt55.patch

-- 
quassel packaging