1 |
commit: d576e38aec358c2742223e2fd6efaf2a33eaaf7a |
2 |
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Jul 20 11:42:04 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 9 12:33:40 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d576e38a |
7 |
|
8 |
net-im/qutim: fix build with gcc 6.1.0 and above |
9 |
|
10 |
Gentoo-Bug: 623572 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/5147 |
12 |
|
13 |
...-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch | 26 ++++++++++++++++++++++ |
14 |
net-im/qutim/qutim-0.3.3_p1.ebuild | 4 +++- |
15 |
2 files changed, 29 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/net-im/qutim/files/qutim-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch b/net-im/qutim/files/qutim-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..955fd0dc5e1 |
20 |
--- /dev/null |
21 |
+++ b/net-im/qutim/files/qutim-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch |
22 |
@@ -0,0 +1,26 @@ |
23 |
+Fix issues caused by turning on -std=c++14 by default in gcc.6.1+. |
24 |
+See Gentoo-Bug #623572. |
25 |
+Upstream commit 7453ef49e8fb64b05cfe7b8c0622bf00eba3080f "Turned on -std=c++11 by default " does the same changes. |
26 |
+ |
27 |
+diff --git a/protocols/irc/src/irccommandalias.cpp b/protocols/irc/src/irccommandalias.cpp |
28 |
+index cfe8a620e..41282f15f 100644 |
29 |
+--- a/protocols/irc/src/irccommandalias.cpp |
30 |
++++ b/protocols/irc/src/irccommandalias.cpp |
31 |
+@@ -148,7 +148,7 @@ QString IrcPingAlias::generate(IrcCommandAlias::Type aliasType, const QStringLis |
32 |
+ } |
33 |
+ |
34 |
+ #define ADD_BAN_CMD(MODE, TYPE, NAME, TITLE, ADDITIONALCMD) \ |
35 |
+- cmd = new IrcCommandAlias(NAME, "MODE %n +b "MODE ADDITIONALCMD, IrcCommandAlias::Participant); \ |
36 |
++ cmd = new IrcCommandAlias(NAME, "MODE %n +b " MODE ADDITIONALCMD, IrcCommandAlias::Participant); \ |
37 |
+ gen = new IrcActionGenerator(QIcon(), TITLE, cmd); \ |
38 |
+ gen->setType(TYPE); \ |
39 |
+ MenuController::addAction<IrcChannelParticipant>(gen, kickBanGroup); |
40 |
+@@ -172,7 +172,7 @@ QString IrcPingAlias::generate(IrcCommandAlias::Type aliasType, const QStringLis |
41 |
+ REGISTER_CTCP_CMD(TITLE) |
42 |
+ |
43 |
+ #define ADD_MODE(MODE, PRIORITY, NAME, TITLE)\ |
44 |
+- cmd = new IrcCommandAlias(NAME, "MODE %n "MODE" %o", IrcCommandAlias::Participant);\ |
45 |
++ cmd = new IrcCommandAlias(NAME, "MODE %n " MODE " %o", IrcCommandAlias::Participant);\ |
46 |
+ gen = new IrcActionGenerator(QIcon(), TITLE, cmd);\ |
47 |
+ gen->setPriority(PRIORITY);\ |
48 |
+ MenuController::addAction<IrcChannelParticipant>(gen, modesGroup);\ |
49 |
|
50 |
diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild |
51 |
index 073f594fa87..0a867366a10 100644 |
52 |
--- a/net-im/qutim/qutim-0.3.3_p1.ebuild |
53 |
+++ b/net-im/qutim/qutim-0.3.3_p1.ebuild |
54 |
@@ -87,9 +87,11 @@ RDEPEND="${CDEPEND} |
55 |
kde-frameworks/oxygen-icons |
56 |
" |
57 |
|
58 |
-DOCS=( AUTHORS INSTALL ChangeLog ) |
59 |
+DOCS=( AUTHORS ChangeLog ) |
60 |
+ |
61 |
PATCHES=( |
62 |
"${FILESDIR}/${PN}-0.3.2-astral-migrate-qt-telepaphy.patch" |
63 |
+ "${FILESDIR}/${PN}-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch" |
64 |
) |
65 |
|
66 |
S="${WORKDIR}/${PN}-${MY_PV}" |