irc/quassel:

- Update to 0.12.3
- Remove upstream patches

PR:		207562
Submitted by:	Adriaan de Groot (groot@kde.org)

4 files changed, 3 insertions, 59 deletions

diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
index d10185b0a809..744843396a9a 100644
--- a/irc/quassel/Makefile
+++ b/irc/quassel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	quassel
-PORTVERSION=	0.12.2
-PORTREVISION=	2
+PORTVERSION=	0.12.3
 CATEGORIES=	irc
 MASTER_SITES=	http://www.quassel-irc.org/pub/
 
diff --git a/irc/quassel/distinfo b/irc/quassel/distinfo
index 98a858c637f9..b9d74486d71c 100644
--- a/irc/quassel/distinfo
+++ b/irc/quassel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (quassel-0.12.2.tar.bz2) = 6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897
-SIZE (quassel-0.12.2.tar.bz2) = 3681838
+SHA256 (quassel-0.12.3.tar.bz2) = 4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434
+SIZE (quassel-0.12.3.tar.bz2) = 3687078
diff --git a/irc/quassel/files/patch-git_07847739 b/irc/quassel/files/patch-git_07847739
deleted file mode 100644
index d576b2124af0..000000000000
--- a/irc/quassel/files/patch-git_07847739
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 078477395aaec1edee90922037ebc8a36b072d90
-Author: Armin K <krejzi@email.com>
-Date:   Sat May 2 23:04:53 2015 +0200
-
-    Fix build with Qt-5.5
-
-    http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c
-
---- src/client/treemodel.cpp
-+++ 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();
---- src/common/peer.h
-+++ src/common/peer.h
-@@ -22,6 +22,7 @@
- #define PEER_H
- 
- #include <QAbstractSocket>
-+#include <QDataStream>
- #include <QPointer>
- 
- #include "authhandler.h"
diff --git a/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp b/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp
deleted file mode 100644
index c3cff156f59c..000000000000
--- a/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix CVE-2015-8547
---- src/core/coreuserinputhandler.cpp.orig	2015-04-23 20:47:17 UTC
-+++ src/core/coreuserinputhandler.cpp
-@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const 
-     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))