1 |
commit: a9dd217244b946168dca26c5dceb5e7c4c6d4fe4 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 26 20:38:25 2015 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 26 20:38:25 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/dev/johu.git/commit/?id=a9dd2172 |
7 |
|
8 |
[net-irc/quassel] Sync with tree |
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 | 11 +++-- |
14 |
2 files changed, 61 insertions(+), 3 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 |
new file mode 100644 |
18 |
index 0000000..3bf8989 |
19 |
--- /dev/null |
20 |
+++ b/net-irc/quassel/files/quassel-0.12.2-qt55.patch |
21 |
@@ -0,0 +1,53 @@ |
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 c2029a7..77dd2a2 100644 |
78 |
--- a/net-irc/quassel/quassel-9999.ebuild |
79 |
+++ b/net-irc/quassel/quassel-9999.ebuild |
80 |
@@ -11,7 +11,7 @@ EGIT_REPO_URI="git://git.quassel-irc.org/quassel" |
81 |
|
82 |
DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity" |
83 |
HOMEPAGE="http://quassel-irc.org/" |
84 |
-[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P/_/-}.tar.bz2" |
85 |
+[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2" |
86 |
|
87 |
LICENSE="GPL-3" |
88 |
KEYWORDS="" |
89 |
@@ -97,14 +97,14 @@ DEPEND="${RDEPEND} |
90 |
|
91 |
DOCS=( AUTHORS ChangeLog README ) |
92 |
|
93 |
-S="${WORKDIR}/${P/_/-}" |
94 |
+PATCHES=( "${FILESDIR}/${PN}-0.12.2-qt55.patch" ) |
95 |
|
96 |
REQUIRED_USE=" |
97 |
|| ( X server monolithic ) |
98 |
ayatana? ( || ( X monolithic ) ) |
99 |
crypt? ( || ( server monolithic ) ) |
100 |
dbus? ( || ( X monolithic ) ) |
101 |
- kde? ( || ( X monolithic ) ) |
102 |
+ kde? ( || ( X monolithic ) phonon ) |
103 |
phonon? ( || ( X monolithic ) ) |
104 |
postgres? ( || ( server monolithic ) ) |
105 |
qt5? ( !ayatana ) |
106 |
@@ -141,6 +141,11 @@ src_configure() { |
107 |
"-DEMBED_DATA=OFF" |
108 |
) |
109 |
|
110 |
+ # Something broke upstream detection since Qt 5.5 |
111 |
+ if use ssl ; then |
112 |
+ mycmakeargs+=("-DHAVE_SSL=TRUE") |
113 |
+ fi |
114 |
+ |
115 |
cmake-utils_src_configure |
116 |
} |