1 |
commit: 348a173ce9ef47821c1a26cafed5fc4277e3d019 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 11 10:33:27 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 11 10:33:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348a173c |
7 |
|
8 |
net-irc/konversation: Fix missing header with Frameworks 5.61, EAPI-7 |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../konversation-1.7.5-fix-regex-for-cap-ack.patch | 25 ++++++++ |
14 |
.../files/konversation-1.7.5-missing-header.patch | 23 +++++++ |
15 |
net-irc/konversation/konversation-1.7.5-r1.ebuild | 75 ++++++++++++++++++++++ |
16 |
3 files changed, 123 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..f351dd00134 |
21 |
--- /dev/null |
22 |
+++ b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch |
23 |
@@ -0,0 +1,25 @@ |
24 |
+From 6d896b4efc93c18246ce4db7c788929b0ce75559 Mon Sep 17 00:00:00 2001 |
25 |
+From: Peter Simonsson <peter.simonsson@×××××.com> |
26 |
+Date: Sun, 23 Sep 2018 08:29:43 +0200 |
27 |
+Subject: Fix regex for cap ack |
28 |
+ |
29 |
+Seems to have worked despite being broken |
30 |
+--- |
31 |
+ src/irc/inputfilter.cpp | 2 +- |
32 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
33 |
+ |
34 |
+diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp |
35 |
+index fbd268b..45d4f88 100644 |
36 |
+--- a/src/irc/inputfilter.cpp |
37 |
++++ b/src/irc/inputfilter.cpp |
38 |
+@@ -795,7 +795,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma |
39 |
+ |
40 |
+ foreach(const QString& capability, capabilities) |
41 |
+ { |
42 |
+- int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9"), Qt::CaseInsensitive)); |
43 |
++ int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9]"), Qt::CaseInsensitive)); |
44 |
+ QString modifierString = capability.left(nameStart); |
45 |
+ QString name = capability.mid(nameStart); |
46 |
+ |
47 |
+-- |
48 |
+cgit v1.1 |
49 |
|
50 |
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 |
51 |
new file mode 100644 |
52 |
index 00000000000..1ff14b81ec5 |
53 |
--- /dev/null |
54 |
+++ b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch |
55 |
@@ -0,0 +1,23 @@ |
56 |
+From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001 |
57 |
+From: Luca Beltrame <lbeltrame@×××.org> |
58 |
+Date: Sun, 21 Jul 2019 09:14:32 +0200 |
59 |
+Subject: Fix build with Qt 5.13 |
60 |
+ |
61 |
+--- |
62 |
+ src/irc/outputfilter.cpp | 1 + |
63 |
+ 1 file changed, 1 insertion(+) |
64 |
+ |
65 |
+diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp |
66 |
+index f9e6253..45d11fb 100644 |
67 |
+--- a/src/irc/outputfilter.cpp |
68 |
++++ b/src/irc/outputfilter.cpp |
69 |
+@@ -32,6 +32,7 @@ |
70 |
+ |
71 |
+ #include <QStringList> |
72 |
+ #include <QFile> |
73 |
++#include <QMetaMethod> |
74 |
+ #include <QRegExp> |
75 |
+ #include <QTextCodec> |
76 |
+ #include <QByteArray> |
77 |
+-- |
78 |
+cgit v1.1 |
79 |
|
80 |
diff --git a/net-irc/konversation/konversation-1.7.5-r1.ebuild b/net-irc/konversation/konversation-1.7.5-r1.ebuild |
81 |
new file mode 100644 |
82 |
index 00000000000..6232ab88eb8 |
83 |
--- /dev/null |
84 |
+++ b/net-irc/konversation/konversation-1.7.5-r1.ebuild |
85 |
@@ -0,0 +1,75 @@ |
86 |
+# Copyright 1999-2019 Gentoo Authors |
87 |
+# Distributed under the terms of the GNU General Public License v2 |
88 |
+ |
89 |
+EAPI=7 |
90 |
+ |
91 |
+KDE_HANDBOOK="forceoptional" |
92 |
+inherit kde5 |
93 |
+ |
94 |
+DESCRIPTION="User friendly IRC Client" |
95 |
+HOMEPAGE="https://kde.org/applications/internet/konversation/ https://konversation.kde.org" |
96 |
+SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz" |
97 |
+ |
98 |
+LICENSE="GPL-2" |
99 |
+KEYWORDS="~amd64 ~x86" |
100 |
+IUSE="+crypt" |
101 |
+ |
102 |
+BDEPEND="sys-devel/gettext" |
103 |
+DEPEND=" |
104 |
+ $(add_frameworks_dep karchive) |
105 |
+ $(add_frameworks_dep kbookmarks) |
106 |
+ $(add_frameworks_dep kcodecs) |
107 |
+ $(add_frameworks_dep kcompletion) |
108 |
+ $(add_frameworks_dep kconfig) |
109 |
+ $(add_frameworks_dep kconfigwidgets) |
110 |
+ $(add_frameworks_dep kcoreaddons) |
111 |
+ $(add_frameworks_dep kcrash) |
112 |
+ $(add_frameworks_dep kdbusaddons) |
113 |
+ $(add_frameworks_dep kemoticons) |
114 |
+ $(add_frameworks_dep kglobalaccel) |
115 |
+ $(add_frameworks_dep ki18n) |
116 |
+ $(add_frameworks_dep kiconthemes) |
117 |
+ $(add_frameworks_dep kidletime) |
118 |
+ $(add_frameworks_dep kio) |
119 |
+ $(add_frameworks_dep kitemviews) |
120 |
+ $(add_frameworks_dep knotifications) |
121 |
+ $(add_frameworks_dep knotifyconfig) |
122 |
+ $(add_frameworks_dep kparts) |
123 |
+ $(add_frameworks_dep kservice) |
124 |
+ $(add_frameworks_dep ktextwidgets) |
125 |
+ $(add_frameworks_dep kwallet) |
126 |
+ $(add_frameworks_dep kwidgetsaddons) |
127 |
+ $(add_frameworks_dep kwindowsystem) |
128 |
+ $(add_frameworks_dep kxmlgui) |
129 |
+ $(add_qt_dep qtdbus) |
130 |
+ $(add_qt_dep qtgui) |
131 |
+ $(add_qt_dep qtnetwork) |
132 |
+ $(add_qt_dep qtwidgets) |
133 |
+ $(add_qt_dep qtxml) |
134 |
+ media-libs/phonon[qt5(+)] |
135 |
+ crypt? ( app-crypt/qca:2[qt5(+)] ) |
136 |
+" |
137 |
+RDEPEND="${DEPEND} |
138 |
+ crypt? ( app-crypt/qca:2[ssl] ) |
139 |
+" |
140 |
+ |
141 |
+PATCHES=( |
142 |
+ "${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch |
143 |
+ "${FILESDIR}"/${P}-missing-header.patch |
144 |
+) |
145 |
+ |
146 |
+src_configure() { |
147 |
+ local mycmakeargs=( |
148 |
+ $(cmake-utils_use_find_package crypt Qca-qt5) |
149 |
+ ) |
150 |
+ |
151 |
+ kde5_src_configure |
152 |
+} |
153 |
+ |
154 |
+src_install() { |
155 |
+ kde5_src_install |
156 |
+ |
157 |
+ # Bug 616162 |
158 |
+ insinto /etc/xdg |
159 |
+ doins "${FILESDIR}"/konversationrc |
160 |
+} |