From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DFD19138334 for ; Sun, 11 Aug 2019 10:37:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF7C6E084E; Sun, 11 Aug 2019 10:37:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BAE8CE084E for ; Sun, 11 Aug 2019 10:37:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 151F33498B6 for ; Sun, 11 Aug 2019 10:37:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8659740 for ; Sun, 11 Aug 2019 10:37:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1565519607.348a173ce9ef47821c1a26cafed5fc4277e3d019.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch net-irc/konversation/files/konversation-1.7.5-missing-header.patch net-irc/konversation/konversation-1.7.5-r1.ebuild X-VCS-Directories: net-irc/konversation/ net-irc/konversation/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 348a173ce9ef47821c1a26cafed5fc4277e3d019 X-VCS-Branch: master Date: Sun, 11 Aug 2019 10:37:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 122daef2-682a-4193-ba18-b74841386ace X-Archives-Hash: 906126b1ff8a973a3f7103a05c97d622 commit: 348a173ce9ef47821c1a26cafed5fc4277e3d019 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 11 10:33:27 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 11 10:33:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348a173c net-irc/konversation: Fix missing header with Frameworks 5.61, EAPI-7 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../konversation-1.7.5-fix-regex-for-cap-ack.patch | 25 ++++++++ .../files/konversation-1.7.5-missing-header.patch | 23 +++++++ net-irc/konversation/konversation-1.7.5-r1.ebuild | 75 ++++++++++++++++++++++ 3 files changed, 123 insertions(+) diff --git a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch new file mode 100644 index 00000000000..f351dd00134 --- /dev/null +++ b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch @@ -0,0 +1,25 @@ +From 6d896b4efc93c18246ce4db7c788929b0ce75559 Mon Sep 17 00:00:00 2001 +From: Peter Simonsson +Date: Sun, 23 Sep 2018 08:29:43 +0200 +Subject: Fix regex for cap ack + +Seems to have worked despite being broken +--- + src/irc/inputfilter.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp +index fbd268b..45d4f88 100644 +--- a/src/irc/inputfilter.cpp ++++ b/src/irc/inputfilter.cpp +@@ -795,7 +795,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma + + foreach(const QString& capability, capabilities) + { +- int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9"), Qt::CaseInsensitive)); ++ int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9]"), Qt::CaseInsensitive)); + QString modifierString = capability.left(nameStart); + QString name = capability.mid(nameStart); + +-- +cgit v1.1 diff --git a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch new file mode 100644 index 00000000000..1ff14b81ec5 --- /dev/null +++ b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch @@ -0,0 +1,23 @@ +From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Sun, 21 Jul 2019 09:14:32 +0200 +Subject: Fix build with Qt 5.13 + +--- + src/irc/outputfilter.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp +index f9e6253..45d11fb 100644 +--- a/src/irc/outputfilter.cpp ++++ b/src/irc/outputfilter.cpp +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +cgit v1.1 diff --git a/net-irc/konversation/konversation-1.7.5-r1.ebuild b/net-irc/konversation/konversation-1.7.5-r1.ebuild new file mode 100644 index 00000000000..6232ab88eb8 --- /dev/null +++ b/net-irc/konversation/konversation-1.7.5-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="User friendly IRC Client" +HOMEPAGE="https://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" + +BDEPEND="sys-devel/gettext" +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(+)] + crypt? ( app-crypt/qca:2[qt5(+)] ) +" +RDEPEND="${DEPEND} + crypt? ( app-crypt/qca:2[ssl] ) +" + +PATCHES=( + "${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch + "${FILESDIR}"/${P}-missing-header.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 +}