| 1 |
commit: 65694ad1e08c912a93373c422ba23be6bef4381a |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 30 15:46:28 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 30 15:46:28 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/dev/johu.git/commit/?id=65694ad1 |
| 7 |
|
| 8 |
[net-irc/quassel] Remove upstreamed patch |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20 |
| 11 |
|
| 12 |
net-irc/quassel/files/quassel-0.12.2-qt55.patch | 53 ------------------------- |
| 13 |
net-irc/quassel/quassel-9999.ebuild | 2 - |
| 14 |
2 files changed, 55 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-irc/quassel/files/quassel-0.12.2-qt55.patch b/net-irc/quassel/files/quassel-0.12.2-qt55.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 3bf8989..0000000 |
| 19 |
--- a/net-irc/quassel/files/quassel-0.12.2-qt55.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,53 +0,0 @@ |
| 22 |
-From 0df317e85ab3d1d80135995d3b5d7f5341fef6e4 Mon Sep 17 00:00:00 2001 |
| 23 |
-From: Armin K <krejzi@×××××.com> |
| 24 |
-Date: Sat, 2 May 2015 23:04:53 +0200 |
| 25 |
-Subject: [PATCH] Fix build with Qt-5.5 |
| 26 |
- |
| 27 |
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c |
| 28 |
---- |
| 29 |
- src/client/treemodel.cpp | 5 ++--- |
| 30 |
- src/common/peer.h | 1 + |
| 31 |
- 2 files changed, 3 insertions(+), 3 deletions(-) |
| 32 |
- |
| 33 |
-diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp |
| 34 |
-index f599803..fd47bc0 100644 |
| 35 |
---- a/src/client/treemodel.cpp |
| 36 |
-+++ b/src/client/treemodel.cpp |
| 37 |
-@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds() |
| 38 |
- ChildStatus cs = _childStatus; |
| 39 |
- #ifndef QT_NO_DEBUG |
| 40 |
- QModelIndex parent = indexByItem(parentItem); |
| 41 |
--#endif |
| 42 |
- Q_ASSERT(cs.parent == parent); |
| 43 |
- Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1); |
| 44 |
-- |
| 45 |
-+#endif |
| 46 |
- _aboutToRemoveOrInsert = false; |
| 47 |
- for (int i = cs.start; i <= cs.end; i++) { |
| 48 |
- connectItem(parentItem->child(i)); |
| 49 |
-@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds() |
| 50 |
- #ifndef QT_NO_DEBUG |
| 51 |
- ChildStatus cs = _childStatus; |
| 52 |
- QModelIndex parent = indexByItem(parentItem); |
| 53 |
--#endif |
| 54 |
- Q_ASSERT(cs.parent == parent); |
| 55 |
- Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1); |
| 56 |
-+#endif |
| 57 |
- _aboutToRemoveOrInsert = false; |
| 58 |
- |
| 59 |
- endRemoveRows(); |
| 60 |
-diff --git a/src/common/peer.h b/src/common/peer.h |
| 61 |
-index 02eb3c0..79204b4 100644 |
| 62 |
---- a/src/common/peer.h |
| 63 |
-+++ b/src/common/peer.h |
| 64 |
-@@ -22,6 +22,7 @@ |
| 65 |
- #define PEER_H |
| 66 |
- |
| 67 |
- #include <QAbstractSocket> |
| 68 |
-+#include <QDataStream> |
| 69 |
- #include <QPointer> |
| 70 |
- |
| 71 |
- #include "authhandler.h" |
| 72 |
--- |
| 73 |
-2.4.0 |
| 74 |
- |
| 75 |
|
| 76 |
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild |
| 77 |
index 77dd2a2..8f38939 100644 |
| 78 |
--- a/net-irc/quassel/quassel-9999.ebuild |
| 79 |
+++ b/net-irc/quassel/quassel-9999.ebuild |
| 80 |
@@ -97,8 +97,6 @@ DEPEND="${RDEPEND} |
| 81 |
|
| 82 |
DOCS=( AUTHORS ChangeLog README ) |
| 83 |
|
| 84 |
-PATCHES=( "${FILESDIR}/${PN}-0.12.2-qt55.patch" ) |
| 85 |
- |
| 86 |
REQUIRED_USE=" |
| 87 |
|| ( X server monolithic ) |
| 88 |
ayatana? ( || ( X monolithic ) ) |
Archives