From 8fbd420dce8836e6503b162092e07b6a77a89f1d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Oct 2017 21:03:07 +0100 Subject: gentoo resync : 13.10.2017 --- net-irc/konversation/Manifest | 4 ++ .../files/konversation-1.7.2-extjoin-crash.patch | 47 +++++++++++++ .../files/konversation-1.7.2-focus.patch | 25 +++++++ .../files/konversation-1.7.2-memleak.patch | 33 ++++++++++ net-irc/konversation/konversation-1.7.2-r1.ebuild | 77 ++++++++++++++++++++++ 5 files changed, 186 insertions(+) create mode 100644 net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch create mode 100644 net-irc/konversation/files/konversation-1.7.2-focus.patch create mode 100644 net-irc/konversation/files/konversation-1.7.2-memleak.patch create mode 100644 net-irc/konversation/konversation-1.7.2-r1.ebuild (limited to 'net-irc/konversation') diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest index c109d2417d0f..e28dac8e932b 100644 --- a/net-irc/konversation/Manifest +++ b/net-irc/konversation/Manifest @@ -1,5 +1,9 @@ +AUX konversation-1.7.2-extjoin-crash.patch 1454 SHA256 6a1caf913bf9e3ac6c6b4afe1e9fc87dac47be4fcb77efd12ac4b2ce02cbd77f SHA512 588477e358362c0e089519f20ed10b5331bafb1ecc92a09b4c522f8c2359a38ca322f6d9b3203b89368c3ee3d88423af5153a99427ea7aeb4bc0ca9103fb996b WHIRLPOOL c139e87816d9f940f46b92daab56833ffa3c41c5a479c8134a85e1cc5e84764893b1a286977e519bfce071c9a3875b0dae531c3fb659f3eb7f8a3a63b6759ad2 +AUX konversation-1.7.2-focus.patch 947 SHA256 06b1cef6411c358200db0f6b3e9e92d60ee566245921375b3b957eaee7c3d00b SHA512 4025cde0ce547ce8b58e409ee30658c05ac0b79e758aa5086f02821f03c7611dce1fc1a88e5f53a1088aca7b085bb2fb8872dbbbd1819a32f736083ed8883ea9 WHIRLPOOL f21efbdf3a1a6681b11a1992416d76a5e6938371fcccbaafff247dc1f2d7e1be3941d560e2d99b0efcd69e9d16fb03113498e291bffcff037e73e7828935fcba +AUX konversation-1.7.2-memleak.patch 1014 SHA256 33882f60fb24dd10c4b1bd4b1476bb45b1a78c565d4d719896260239df475531 SHA512 6b3a993348187727b777239a71704fa3bcb181bce2d82720afe0ff84f066d1e381e682e2def7b15239cf696f90bfa543a07f3a55c15f9ac53e9637730f674af0 WHIRLPOOL 811f561e82188fd931bb19ea058c7d0375c35de03686230322163c15b32c8ad044de7abf6230112072b5fffd369fbf52f23a66e63e5d150536e4b52a67e6ac7a AUX konversationrc 350 SHA256 923ac0ab58c466d8d1cace175d8d75abb8e44f241cc97ae570981696900c891d SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731 WHIRLPOOL 95f2f5760a2aa1bd895d9bc3097f687f2b4a0f07889a99c0ef9d8efd1d731bb5e2b615c3e1c57736c57aa02a3c98644894c370c995596edab0347e432ccf59aa DIST konversation-1.7.2.tar.xz 3736968 SHA256 5ff96e84cee4e1eefc404a31d778067ea50dddd8a6c848911fac70bd52812618 SHA512 91523043afd7d7698c8166256d3eba225d8ff1ba44cad6811b00bf0004b765ce1ed618e900c8cafa7b395217b3fa3703db62a79b0a491bcef6c0bb65037add06 WHIRLPOOL 842fac84013a6915b5acad2c7ee8abab794c01722628fb4cbd7a3c462229fadf1c88b340fd094efadb1ac62e2c1838de80a26114bff0c98064c9f57e87974860 +EBUILD konversation-1.7.2-r1.ebuild 1878 SHA256 bf062a4304fad9f620307ce7f37c200b954ffeaa663f63e7f8f81778f6020707 SHA512 12f67041324df8e9f7ef4fbe35845d8ae295444802b6fc4b501f610b7634f9c64d8195dc58115d406cd79ec3700871297adc99e8663f42d2478300b79974c2a6 WHIRLPOOL 946a294823f6c374b2b8eae5931b37556941fc8587f7a65cc960f3e655745d0f69eeb41949bc74cd40a63eab0e201f01d2c4d1eb74c1677fff0fdc32c9f6e304 EBUILD konversation-1.7.2.ebuild 1757 SHA256 9d3d02a35e7edcc3e6319ac33ea25d0934da92158e668aedbc0cfaa0171da03a SHA512 6108c9c797e413c44bca4a3a570c820fa0184c6d7ade4c0f79671cb58ba164fd84e32a3e65ed98d8259c79827c3e5a71f25c2a50ce1dc7b68cbb6be408447d69 WHIRLPOOL 601ffafa0ff6b8b4c4f6ff41a12c0277a341256880300a8edddf49046dbaf426ab61e2a352474465d82cbe4b2e1a29804fbad48578c0f5ba71fb78862984bd4a MISC ChangeLog 4424 SHA256 e7ce43917d507178eaa7b6f54ae86a52dff3c72adc635ecdcdcfbee86e3bce47 SHA512 201c65a4c61acba62885494509e1128bbed73d9c1baf2223209e528e0c1b5fcb6af446f71a305e24cce28d04bd6e1f7d95e03fd766f503ea399403298c0a1659 WHIRLPOOL 994fe6050e59ca77df8c1809d5db924539aee3fce76cdaf58a8dc8f1d39803b0b6ef7e6ff448a050bc34220e4c01695b7bd0e99d44438a8b11c521b98c9c4631 MISC ChangeLog-2015 18031 SHA256 cee214b9f81a6331f35fe326694e8741ae9457fa49ac0c525122249ad391d605 SHA512 84acb3f03ede0561e4e7805d1d9e213c290685d97c13806601e24d9a8af64b0584dfc295e2c2fd2563491d2b21d006b6a7b4597d97bc8f42a9a794a4829e7c45 WHIRLPOOL 564aec04b0df354d10486972291e4df257aeb68a9d76b4f828fa71ab3580645ee33937f7e374d79b69f09bebf8621b928a9b9abf6dd746c26a0d587cc9bcc9c6 diff --git a/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch b/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch new file mode 100644 index 000000000000..97fc4c1494c2 --- /dev/null +++ b/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch @@ -0,0 +1,47 @@ +From 783dc0f595ecf90e37225a57da0ffa2c030a470d Mon Sep 17 00:00:00 2001 +From: Peter Simonsson +Date: Sat, 10 Jun 2017 20:41:50 +0200 +Subject: Fix crash in join handling in inputfilter + +Make sure to check size of parameter list for extended join. + +BUG:378854 +--- + src/irc/inputfilter.cpp | 19 ++++++------------- + 1 file changed, 6 insertions(+), 13 deletions(-) + +diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp +index 53f3b2c..f273d30 100644 +--- a/src/irc/inputfilter.cpp ++++ b/src/irc/inputfilter.cpp +@@ -575,21 +575,14 @@ void InputFilter::parseClientCommand(const QString &prefix, const QString &comma + QString account; + QString realName; + +- if (!m_server->hasExtendedJoin()) +- { +- channelName = trailing; +- // Sometimes JOIN comes without ":" in front of the channel name +- } +- else ++ channelName = parameterList[0]; ++ ++ if (m_server->hasExtendedJoin() && plHas(3)) + { +- channelName = parameterList[0]; +- account = parameterList[1]; +- realName = parameterList[2]; ++ if (parameterList[1] != "*") ++ account = parameterList[1]; + +- if (account == "*") +- { +- account = QString(); +- } ++ realName = parameterList[2]; + } + + // Did we join the channel, or was it someone else? +-- +cgit v0.11.2 + diff --git a/net-irc/konversation/files/konversation-1.7.2-focus.patch b/net-irc/konversation/files/konversation-1.7.2-focus.patch new file mode 100644 index 000000000000..b42bed488f33 --- /dev/null +++ b/net-irc/konversation/files/konversation-1.7.2-focus.patch @@ -0,0 +1,25 @@ +From 3263b47db2d0aab78d6a6fbc99682ac9b5ef2f2e Mon Sep 17 00:00:00 2001 +From: Eike Hein +Date: Wed, 21 Jun 2017 06:36:26 +0900 +Subject: Don't commit on focus loss. + +--- + src/irc/channel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp +index a431c80..a5c313e 100644 +--- a/src/irc/channel.cpp ++++ b/src/irc/channel.cpp +@@ -292,7 +292,7 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent) + connect(nicknameCombobox,SIGNAL (activated(int)),this,SLOT(nicknameComboboxChanged())); + + if(nicknameCombobox->lineEdit()) +- connect(nicknameCombobox->lineEdit(), SIGNAL (editingFinished()),this,SLOT(nicknameComboboxChanged())); ++ connect(nicknameCombobox->lineEdit(), SIGNAL (returnPressed()),this,SLOT(nicknameComboboxChanged())); + + + connect(&userhostTimer,SIGNAL (timeout()),this,SLOT (autoUserhost())); +-- +cgit v0.11.2 + diff --git a/net-irc/konversation/files/konversation-1.7.2-memleak.patch b/net-irc/konversation/files/konversation-1.7.2-memleak.patch new file mode 100644 index 000000000000..c079809f0c60 --- /dev/null +++ b/net-irc/konversation/files/konversation-1.7.2-memleak.patch @@ -0,0 +1,33 @@ +From cb2c91f06bc9247520474372d163bd0520f4db42 Mon Sep 17 00:00:00 2001 +From: Gun Park +Date: Mon, 10 Jul 2017 16:59:28 +0900 +Subject: Fix memory leak + +Reviewers: hein + +Reviewed By: hein + +Differential Revision: https://phabricator.kde.org/D6580 +--- + src/viewer/viewcontainer.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp +index 31ff633..94d498e 100644 +--- a/src/viewer/viewcontainer.cpp ++++ b/src/viewer/viewcontainer.cpp +@@ -2786,9 +2786,8 @@ void ViewContainer::showJoinChannelDialog() + if (dlg->exec() == QDialog::Accepted) + { + Server *server = Application::instance()->getConnectionManager()->getServerByConnectionId(dlg->connectionId()); +- if (!server) +- return; +- server->sendJoinCommand(dlg->channel(), dlg->password()); ++ if (server) ++ server->sendJoinCommand(dlg->channel(), dlg->password()); + } + delete dlg; + } +-- +cgit v0.11.2 + diff --git a/net-irc/konversation/konversation-1.7.2-r1.ebuild b/net-irc/konversation/konversation-1.7.2-r1.ebuild new file mode 100644 index 000000000000..91f420e6b1da --- /dev/null +++ b/net-irc/konversation/konversation-1.7.2-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="A user friendly IRC Client" +HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org" +SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="+crypt" + +DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kidletime) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + media-libs/phonon[qt5(+)] + sys-devel/gettext + crypt? ( app-crypt/qca:2[qt5] ) +" +RDEPEND="${DEPEND} + !net-irc/konversation:4 + crypt? ( app-crypt/qca:2[ssl] ) +" + +PATCHES=( + "${FILESDIR}/${P}-extjoin-crash.patch" + "${FILESDIR}/${P}-memleak.patch" + "${FILESDIR}/${P}-focus.patch" +) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package crypt Qca-qt5) + ) + + kde5_src_configure +} + +src_install() { + kde5_src_install + + # Bug 616162 + insinto /etc/xdg + doins "${FILESDIR}"/konversationrc +} -- cgit v1.2.3