[SCM] quassel packaging branch, master, updated. debian/1%0.12.2-3-4-g8b50992

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit 8b50992ab1960bc8aba051f16ce759a91fbfdd07
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Feb 11 20:09:48 2016 +0100

    Drop patches that have been applied upstream.
---
 debian/changelog                                   |  4 ++
 .../patches/02_set-required-libs-and-flags.patch   | 14 ------
 debian/patches/04_fix_ftbfs_qt55.patch             | 50 ----------------------
 debian/patches/CVE-2015-8547.patch                 | 22 ----------
 debian/patches/series                              |  6 +--
 5 files changed, 7 insertions(+), 89 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8a2d98..5a65cd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 quassel (1:0.12.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches that have been applied upstream:
+    - 02_set-required-libs-and-flags.patch
+    - 04_fix_ftbfs_qt55.patch
+    - CVE-2015-8547.patch
 
  -- Felix Geyer <fgeyer at debian.org>  Thu, 11 Feb 2016 19:23:22 +0100
 
diff --git a/debian/patches/02_set-required-libs-and-flags.patch b/debian/patches/02_set-required-libs-and-flags.patch
deleted file mode 100644
index 19dcb9f..0000000
--- a/debian/patches/02_set-required-libs-and-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix detection of OpenSSL when building against Qt5.
-Origin: https://build.opensuse.org/package/view_file/openSUSE:Factory/quassel/quassel-set-required-libs-and-flags.patch?expand=1
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -484,6 +484,8 @@ endif()
- # a small test program checking the defines. This works for both Qt4 and Qt5.
- cmake_push_check_state(RESET)
- set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
-+set(CMAKE_REQUIRED_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
-+set(CMAKE_REQUIRED_LIBRARIES ${Qt5Core_LIBRARIES})
- check_cxx_source_compiles("
-     #include \"qglobal.h\"
-     #if defined QT_NO_OPENSSL || defined QT_NO_SSL
diff --git a/debian/patches/04_fix_ftbfs_qt55.patch b/debian/patches/04_fix_ftbfs_qt55.patch
deleted file mode 100644
index a6fd846..0000000
--- a/debian/patches/04_fix_ftbfs_qt55.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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/CVE-2015-8547.patch b/debian/patches/CVE-2015-8547.patch
deleted file mode 100644
index cf838c7..0000000
--- a/debian/patches/CVE-2015-8547.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 476aaa050f26d6a31494631d172724409e4c569b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Konstantin=20Bl=C3=A4si?= <kblaesi at gmail.com>
-Date: Wed, 21 Oct 2015 03:26:02 +0200
-Subject: [PATCH] Fixes a crash of the core when executing "/op *" in a query.
-
----
- src/core/coreuserinputhandler.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
-index 7887a92..73aac48 100644
---- a/src/core/coreuserinputhandler.cpp
-+++ b/src/core/coreuserinputhandler.cpp
-@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const BufferInfo &bufferInfo, const QChar& add
-     if (!isNumber || maxModes == 0) maxModes = 1;
- 
-     QStringList nickList;
--    if (nicks == "*") { // All users in channel
-+    if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // All users in channel
-         const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
-         foreach(IrcUser *user, users) {
-             if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))
diff --git a/debian/patches/series b/debian/patches/series
index 532022c..5500bd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 01_default_network_channel.patch
-02_set-required-libs-and-flags.patch
+#02_set-required-libs-and-flags.patch
 03_force_icon_theme.patch
-04_fix_ftbfs_qt55.patch
-CVE-2015-8547.patch
+#04_fix_ftbfs_qt55.patch
+#CVE-2015-8547.patch

-- 
quassel packaging