Date: Sat, 23 Jan 2016 19:28:55 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407052 - head/irc/quassel/files Message-ID: <201601231928.u0NJStcs027732@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Jan 23 19:28:55 2016 New Revision: 407052 URL: https://svnweb.freebsd.org/changeset/ports/407052 Log: Add upstream patch to fix the build with the upcoming Qt 5.5.1. Added: head/irc/quassel/files/patch-git_07847739 (contents, props changed) Added: head/irc/quassel/files/patch-git_07847739 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/quassel/files/patch-git_07847739 Sat Jan 23 19:28:55 2016 (r407052) @@ -0,0 +1,43 @@ +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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601231928.u0NJStcs027732>