commit: d576e38aec358c2742223e2fd6efaf2a33eaaf7a Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com> AuthorDate: Thu Jul 20 11:42:04 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Sep 9 12:33:40 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d576e38a
net-im/qutim: fix build with gcc 6.1.0 and above Gentoo-Bug: 623572 Closes: https://github.com/gentoo/gentoo/pull/5147 ...-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch | 26 ++++++++++++++++++++++ net-im/qutim/qutim-0.3.3_p1.ebuild | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..955fd0dc5e1 --- /dev/null +++ b/net-im/qutim/files/qutim-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch @@ -0,0 +1,26 @@ +Fix issues caused by turning on -std=c++14 by default in gcc.6.1+. +See Gentoo-Bug #623572. +Upstream commit 7453ef49e8fb64b05cfe7b8c0622bf00eba3080f "Turned on -std=c++11 by default " does the same changes. + +diff --git a/protocols/irc/src/irccommandalias.cpp b/protocols/irc/src/irccommandalias.cpp +index cfe8a620e..41282f15f 100644 +--- a/protocols/irc/src/irccommandalias.cpp ++++ b/protocols/irc/src/irccommandalias.cpp +@@ -148,7 +148,7 @@ QString IrcPingAlias::generate(IrcCommandAlias::Type aliasType, const QStringLis + } + + #define ADD_BAN_CMD(MODE, TYPE, NAME, TITLE, ADDITIONALCMD) \ +- cmd = new IrcCommandAlias(NAME, "MODE %n +b "MODE ADDITIONALCMD, IrcCommandAlias::Participant); \ ++ cmd = new IrcCommandAlias(NAME, "MODE %n +b " MODE ADDITIONALCMD, IrcCommandAlias::Participant); \ + gen = new IrcActionGenerator(QIcon(), TITLE, cmd); \ + gen->setType(TYPE); \ + MenuController::addAction<IrcChannelParticipant>(gen, kickBanGroup); +@@ -172,7 +172,7 @@ QString IrcPingAlias::generate(IrcCommandAlias::Type aliasType, const QStringLis + REGISTER_CTCP_CMD(TITLE) + + #define ADD_MODE(MODE, PRIORITY, NAME, TITLE)\ +- cmd = new IrcCommandAlias(NAME, "MODE %n "MODE" %o", IrcCommandAlias::Participant);\ ++ cmd = new IrcCommandAlias(NAME, "MODE %n " MODE " %o", IrcCommandAlias::Participant);\ + gen = new IrcActionGenerator(QIcon(), TITLE, cmd);\ + gen->setPriority(PRIORITY);\ + MenuController::addAction<IrcChannelParticipant>(gen, modesGroup);\ diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild index 073f594fa87..0a867366a10 100644 --- a/net-im/qutim/qutim-0.3.3_p1.ebuild +++ b/net-im/qutim/qutim-0.3.3_p1.ebuild @@ -87,9 +87,11 @@ RDEPEND="${CDEPEND} kde-frameworks/oxygen-icons " -DOCS=( AUTHORS INSTALL ChangeLog ) +DOCS=( AUTHORS ChangeLog ) + PATCHES=( "${FILESDIR}/${PN}-0.3.2-astral-migrate-qt-telepaphy.patch" + "${FILESDIR}/${PN}-0.3.3-fix-build-with-gcc-6.1.0-and-above.patch" ) S="${WORKDIR}/${PN}-${MY_PV}"
