1 |
commit: 54a63d88015b66071a4d7b7038854fd5eee179e7 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 17 14:32:08 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 17 14:32:50 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=54a63d88 |
7 |
|
8 |
net-irc/konversation: Add 1.7 stable branch |
9 |
|
10 |
Adding release switch and new RDEPEND from upstream commit |
11 |
42dc7b1429853f0840e4209d9faef3454a034898 |
12 |
|
13 |
Development on 1.7 continues while git master has diverged too much |
14 |
to spin 1.7 point releases from it. |
15 |
|
16 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
18 |
|
19 |
.../konversation-1.7.5-kf5bookmarks-5.69.patch | 51 +++ |
20 |
.../konversation-1.7.5-unused-kemoticons.patch | 112 +++++++ |
21 |
.../files/konversation-1.7.6-no-kiconthemes.patch | 347 +++++++++++++++++++++ |
22 |
net-irc/konversation/konversation-1.7.9999.ebuild | 83 +++++ |
23 |
4 files changed, 593 insertions(+) |
24 |
|
25 |
diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch |
26 |
new file mode 100644 |
27 |
index 0000000000..2c36f69aa9 |
28 |
--- /dev/null |
29 |
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch |
30 |
@@ -0,0 +1,51 @@ |
31 |
+From 57df81cd8a11c4dbe170f9d81abd5b35b4887e0b Mon Sep 17 00:00:00 2001 |
32 |
+From: Ahmad Samir <a.samirh78@×××××.com> |
33 |
+Date: Fri, 17 Apr 2020 13:14:26 +0200 |
34 |
+Subject: Adapt the code to KBookmarkMenu-5.69 changes |
35 |
+ |
36 |
+Test Plan: |
37 |
+Bookmarks menu still works, and the bookmark actions still show in the |
38 |
+shortcuts editor dialog. |
39 |
+ |
40 |
+Reviewers: #konversation, psn |
41 |
+ |
42 |
+Reviewed By: #konversation, psn |
43 |
+ |
44 |
+Subscribers: #konversation |
45 |
+ |
46 |
+Differential Revision: https://phabricator.kde.org/D28911 |
47 |
+--- |
48 |
+ src/bookmarkhandler.cpp | 8 ++++++++ |
49 |
+ 1 file changed, 8 insertions(+) |
50 |
+ |
51 |
+diff --git a/src/bookmarkhandler.cpp b/src/bookmarkhandler.cpp |
52 |
+index 5a70591..74b51ff 100644 |
53 |
+--- a/src/bookmarkhandler.cpp |
54 |
++++ b/src/bookmarkhandler.cpp |
55 |
+@@ -21,7 +21,10 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@×××.org> |
56 |
+ #include "connectionmanager.h" |
57 |
+ #include "viewer/viewcontainer.h" |
58 |
+ |
59 |
++#include <KActionCollection> |
60 |
++#include <kbookmarks_version.h> |
61 |
+ #include <KBookmarkMenu> |
62 |
++#include <QMenu> |
63 |
+ #include <QStandardPaths> |
64 |
+ |
65 |
+ |
66 |
+@@ -41,7 +44,12 @@ m_mainWindow(mainWindow) |
67 |
+ manager->setEditorOptions(i18n("Konversation Bookmarks Editor"), false); |
68 |
+ manager->setUpdate( true ); |
69 |
+ |
70 |
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0) |
71 |
+ m_bookmarkMenu = new KBookmarkMenu(manager, this, menu, m_mainWindow->actionCollection()); |
72 |
++#else |
73 |
++ m_bookmarkMenu = new KBookmarkMenu(manager, this, menu); |
74 |
++ m_mainWindow->actionCollection()->addActions(menu->actions()); |
75 |
++#endif |
76 |
+ } |
77 |
+ |
78 |
+ KonviBookmarkHandler::~KonviBookmarkHandler() |
79 |
+-- |
80 |
+cgit v1.1 |
81 |
+ |
82 |
|
83 |
diff --git a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch |
84 |
new file mode 100644 |
85 |
index 0000000000..d856a17215 |
86 |
--- /dev/null |
87 |
+++ b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch |
88 |
@@ -0,0 +1,112 @@ |
89 |
+From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001 |
90 |
+From: David Edmundson <kde@×××××××××××××××××.uk> |
91 |
+Date: Mon, 16 Sep 2019 18:18:49 +0100 |
92 |
+Subject: Drop effectively unused kemoticons support |
93 |
+ |
94 |
+Summary: |
95 |
+Konversation only supported emoticons if config value EnableEmotIcons |
96 |
+was true. This by default was false and there is no UI for configuring |
97 |
+this, making it effectively unused. |
98 |
+ |
99 |
+This appears to be deliberate from the code comments. |
100 |
+ |
101 |
+This helps clear up some KEmoticon library usage for future KF6 |
102 |
+transitioning. |
103 |
+ |
104 |
+UTF-8 emoticons work correctly. |
105 |
+ |
106 |
+Test Plan: Compiles |
107 |
+ |
108 |
+Differential Revision: https://phabricator.kde.org/D24000 |
109 |
+--- |
110 |
+ src/CMakeLists.txt | 2 -- |
111 |
+ src/config/konversation.kcfg | 8 -------- |
112 |
+ src/viewer/ircview.cpp | 3 --- |
113 |
+ 3 files changed, 13 deletions(-) |
114 |
+ |
115 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
116 |
+index c2077b3..89616a6 100644 |
117 |
+--- a/src/CMakeLists.txt |
118 |
++++ b/src/CMakeLists.txt |
119 |
+@@ -138,7 +138,6 @@ set(viewer_SRCS |
120 |
+ viewer/topiclabel.cpp |
121 |
+ viewer/awaylabel.cpp |
122 |
+ viewer/editnotifydialog.cpp |
123 |
+- viewer/emoticons.cpp |
124 |
+ viewer/images.cpp |
125 |
+ viewer/quickbutton.cpp |
126 |
+ viewer/searchbar.cpp |
127 |
+@@ -224,7 +223,6 @@ target_link_libraries(konversation |
128 |
+ KF5::Bookmarks |
129 |
+ KF5::ConfigWidgets |
130 |
+ KF5::Crash |
131 |
+- KF5::Emoticons |
132 |
+ KF5::I18n |
133 |
+ KF5::IdleTime |
134 |
+ KF5::NotifyConfig |
135 |
+diff --git a/src/config/konversation.kcfg b/src/config/konversation.kcfg |
136 |
+index 1d59eaf..3f0b7a6 100644 |
137 |
+--- a/src/config/konversation.kcfg |
138 |
++++ b/src/config/konversation.kcfg |
139 |
+@@ -844,14 +844,6 @@ |
140 |
+ <label></label> |
141 |
+ <whatsthis></whatsthis> |
142 |
+ </entry> |
143 |
+- <entry key="EnableEmotIcons" type="Bool"> |
144 |
+- <default>false</default> |
145 |
+- <label>Enable emoticons</label> |
146 |
+- </entry> |
147 |
+- <entry key="EmotIconTheme" type="String"> |
148 |
+- <default>Default</default> |
149 |
+- <label>Emoticons theme</label> |
150 |
+- </entry> |
151 |
+ </group> |
152 |
+ <group name="PreferencesDialog"> |
153 |
+ <entry name="PreferencesDialogSize" key="Size" type="Size"> |
154 |
+diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp |
155 |
+index c129f61..15f78ca 100644 |
156 |
+--- a/src/viewer/ircview.cpp |
157 |
++++ b/src/viewer/ircview.cpp |
158 |
+@@ -20,7 +20,6 @@ |
159 |
+ #include "application.h" |
160 |
+ #include "highlight.h" |
161 |
+ #include "sound.h" |
162 |
+-#include "emoticons.h" |
163 |
+ #include "notificationhandler.h" |
164 |
+ |
165 |
+ #include <QDrag> |
166 |
+@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const QString& defaultColor, const |
167 |
+ QLatin1String("\">") + filteredLine + QLatin1String("</font>"); |
168 |
+ } |
169 |
+ |
170 |
+- filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine); |
171 |
+- |
172 |
+ return filteredLine; |
173 |
+ } |
174 |
+ |
175 |
+-- |
176 |
+cgit v1.1 |
177 |
+ |
178 |
+From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001 |
179 |
+From: Peter Simonsson <peter.simonsson@×××××.com> |
180 |
+Date: Tue, 7 Apr 2020 16:37:53 +0200 |
181 |
+Subject: Remove KEmoticons from dependencies as it's not used |
182 |
+ |
183 |
+--- |
184 |
+ CMakeLists.txt | 1 - |
185 |
+ 1 file changed, 1 deletion(-) |
186 |
+ |
187 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
188 |
+index 5315dbd..19facd8 100644 |
189 |
+--- a/CMakeLists.txt |
190 |
++++ b/CMakeLists.txt |
191 |
+@@ -24,7 +24,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED |
192 |
+ CoreAddons |
193 |
+ Crash |
194 |
+ DocTools |
195 |
+- Emoticons |
196 |
+ I18n |
197 |
+ IdleTime |
198 |
+ NotifyConfig |
199 |
+-- |
200 |
+cgit v1.1 |
201 |
|
202 |
diff --git a/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch b/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch |
203 |
new file mode 100644 |
204 |
index 0000000000..f631a94934 |
205 |
--- /dev/null |
206 |
+++ b/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch |
207 |
@@ -0,0 +1,347 @@ |
208 |
+From 2104a776203d32b49512b303506f94085e0e4d89 Mon Sep 17 00:00:00 2001 |
209 |
+From: Nicolas Fella <nicolas.fella@×××.de> |
210 |
+Date: Sat, 19 Sep 2020 22:50:48 +0200 |
211 |
+Subject: [PATCH] Port away from KIconthemes |
212 |
+ |
213 |
+Use appropriate QIcon/QStyle API instead |
214 |
+ |
215 |
+Incorporates: |
216 |
+ |
217 |
+commit 5cd6c690e005a040e5fd3ccfca7ae23593c6dfe6 |
218 |
+Author: Nicolas Fella <nicolas.fella@×××.de> |
219 |
+Date: Sat Sep 19 22:50:48 2020 +0200 |
220 |
+Subject: Remove unneeded system tray icon update |
221 |
+ |
222 |
+ The system tray icon is specified by name. |
223 |
+ We don't need to do anything when the theme changes. |
224 |
+ |
225 |
+commit d1bce09605c255f7b96fa677ece363b3053d085e |
226 |
+Author: Peter Simonsson <peter.simonsson@×××××.com> |
227 |
+Date: Tue Oct 22 21:35:25 2019 +0200 |
228 |
+Subject: Don't use deprecated SmallIcon |
229 |
+ |
230 |
+--- |
231 |
+ CMakeLists.txt | 1 - |
232 |
+ src/CMakeLists.txt | 1 - |
233 |
+ src/dcc/recipientdialog.cpp | 5 ++--- |
234 |
+ src/dcc/transferlistmodel.cpp | 25 ++++--------------------- |
235 |
+ src/dcc/transferlistmodel.h | 3 +-- |
236 |
+ src/irc/channel.cpp | 4 ++-- |
237 |
+ src/irc/nicksonline.cpp | 1 - |
238 |
+ src/irc/query.cpp | 4 ++-- |
239 |
+ src/mainwindow.cpp | 2 -- |
240 |
+ src/statusbar.cpp | 4 ++-- |
241 |
+ src/viewer/ircview.cpp | 5 ++--- |
242 |
+ src/viewer/ircviewbox.cpp | 1 - |
243 |
+ src/viewer/topiclabel.cpp | 6 ++---- |
244 |
+ src/viewer/viewcontainer.cpp | 4 +--- |
245 |
+ 14 files changed, 18 insertions(+), 48 deletions(-) |
246 |
+ |
247 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
248 |
+index f0cd4b4f..3a1f5274 100644 |
249 |
+--- a/CMakeLists.txt |
250 |
++++ b/CMakeLists.txt |
251 |
+@@ -37,7 +37,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED |
252 |
+ DBusAddons |
253 |
+ Notifications |
254 |
+ WindowSystem |
255 |
+- IconThemes |
256 |
+ ItemViews |
257 |
+ ) |
258 |
+ |
259 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
260 |
+index 04f28971..36de36b0 100644 |
261 |
+--- a/src/CMakeLists.txt |
262 |
++++ b/src/CMakeLists.txt |
263 |
+@@ -238,7 +238,6 @@ target_link_libraries(konversation |
264 |
+ KF5::CoreAddons |
265 |
+ KF5::Notifications |
266 |
+ KF5::WindowSystem |
267 |
+- KF5::IconThemes |
268 |
+ KF5::ItemViews |
269 |
+ Phonon::phonon4qt5) |
270 |
+ |
271 |
+diff --git a/src/dcc/recipientdialog.cpp b/src/dcc/recipientdialog.cpp |
272 |
+index 3e6eeae7..e81e91ea 100644 |
273 |
+--- a/src/dcc/recipientdialog.cpp |
274 |
++++ b/src/dcc/recipientdialog.cpp |
275 |
+@@ -28,7 +28,6 @@ |
276 |
+ #include <KLineEdit> |
277 |
+ #include <KSharedConfig> |
278 |
+ #include <KWindowConfig> |
279 |
+-#include <KIconLoader> |
280 |
+ |
281 |
+ namespace Konversation |
282 |
+ { |
283 |
+@@ -64,12 +63,12 @@ namespace Konversation |
284 |
+ dialogLayout->addWidget(buttonBox); |
285 |
+ QPushButton* button = buttonBox->addButton(QDialogButtonBox::Ok); |
286 |
+ button->setToolTip(i18n("Select nickname and close the window")); |
287 |
+- button->setIcon(SmallIcon("dialog-ok")); |
288 |
++ button->setIcon(QIcon::fromTheme("dialog-ok")); |
289 |
+ button->setShortcut(Qt::CTRL | Qt::Key_Return); |
290 |
+ button->setDefault(true); |
291 |
+ button = buttonBox->addButton(QDialogButtonBox::Cancel); |
292 |
+ button->setToolTip(i18n("Close the window without changes")); |
293 |
+- button->setIcon(SmallIcon("dialog-cancel")); |
294 |
++ button->setIcon(QIcon::fromTheme("dialog-cancel")); |
295 |
+ |
296 |
+ KWindowConfig::restoreWindowSize(windowHandle(), KConfigGroup(KSharedConfig::openConfig(), "DCCRecipientDialog")); |
297 |
+ |
298 |
+diff --git a/src/dcc/transferlistmodel.cpp b/src/dcc/transferlistmodel.cpp |
299 |
+index cc1763f9..2a7e3b15 100644 |
300 |
+--- a/src/dcc/transferlistmodel.cpp |
301 |
++++ b/src/dcc/transferlistmodel.cpp |
302 |
+@@ -21,7 +21,6 @@ |
303 |
+ #include <KCategorizedSortFilterProxyModel> |
304 |
+ #include <KLocalizedString> |
305 |
+ #include <KCategoryDrawer> |
306 |
+-#include <KIconLoader> |
307 |
+ |
308 |
+ namespace Konversation |
309 |
+ { |
310 |
+@@ -313,15 +312,11 @@ namespace Konversation |
311 |
+ { |
312 |
+ case TransferHeaderData::Status: |
313 |
+ { |
314 |
+- QVariant decoration(QVariant::Pixmap); |
315 |
+- decoration.setValue<QPixmap>(getStatusIcon(transfer->getStatus())); |
316 |
+- return decoration; |
317 |
++ return getStatusIcon(transfer->getStatus()); |
318 |
+ } |
319 |
+ case TransferHeaderData::TypeIcon: |
320 |
+ { |
321 |
+- QVariant decoration(QVariant::Pixmap); |
322 |
+- decoration.setValue<QPixmap>(getTypeIcon(transfer->getType())); |
323 |
+- return decoration; |
324 |
++ return transfer->getType() == Transfer::Send ? QIcon::fromTheme("arrow-up") : QIcon::fromTheme("arrow-down"); |
325 |
+ } |
326 |
+ default: |
327 |
+ return QVariant(); |
328 |
+@@ -384,19 +379,7 @@ namespace Konversation |
329 |
+ } |
330 |
+ } |
331 |
+ |
332 |
+- QPixmap TransferListModel::getTypeIcon(Transfer::Type type) const |
333 |
+- { |
334 |
+- if (type == Transfer::Send) |
335 |
+- { |
336 |
+- return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Small); |
337 |
+- } |
338 |
+- else |
339 |
+- { |
340 |
+- return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Small); |
341 |
+- } |
342 |
+- } |
343 |
+- |
344 |
+- QPixmap TransferListModel::getStatusIcon(Transfer::Status status) const |
345 |
++ QIcon TransferListModel::getStatusIcon(Transfer::Status status) const |
346 |
+ { |
347 |
+ QString icon; |
348 |
+ switch (status) |
349 |
+@@ -422,7 +405,7 @@ namespace Konversation |
350 |
+ default: |
351 |
+ break; |
352 |
+ } |
353 |
+- return KIconLoader::global()->loadIcon(icon, KIconLoader::Small); |
354 |
++ return QIcon::fromTheme(icon); |
355 |
+ } |
356 |
+ |
357 |
+ QString TransferListModel::getSpeedPrettyText (transferspeed_t speed) |
358 |
+diff --git a/src/dcc/transferlistmodel.h b/src/dcc/transferlistmodel.h |
359 |
+index 3a8a945c..b8bc0d25 100644 |
360 |
+--- a/src/dcc/transferlistmodel.h |
361 |
++++ b/src/dcc/transferlistmodel.h |
362 |
+@@ -164,8 +164,7 @@ namespace Konversation |
363 |
+ inline QString getPositionPrettyText(KIO::fileoffset_t position, |
364 |
+ KIO::filesize_t filesize) const; |
365 |
+ inline QString getSenderAddressPrettyText(Transfer *transfer) const; |
366 |
+- inline QPixmap getStatusIcon(Transfer::Status status) const; |
367 |
+- inline QPixmap getTypeIcon(Transfer::Type type) const; |
368 |
++ inline QIcon getStatusIcon(Transfer::Status status) const; |
369 |
+ inline QString getStatusDescription(Transfer::Status status, Transfer::Type type, const QString& errorMessage = QString()) const; |
370 |
+ |
371 |
+ QList<TransferItemData> m_transferList; |
372 |
+diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp |
373 |
+index 6488a0c1..595d0adc 100644 |
374 |
+--- a/src/irc/channel.cpp |
375 |
++++ b/src/irc/channel.cpp |
376 |
+@@ -38,7 +38,6 @@ |
377 |
+ #include <KLineEdit> |
378 |
+ #include <KPasswordDialog> |
379 |
+ #include <KMessageBox> |
380 |
+-#include <KIconLoader> |
381 |
+ #include <KComboBox> |
382 |
+ |
383 |
+ #define DELAYED_SORT_TRIGGER 10 |
384 |
+@@ -237,7 +236,8 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent) |
385 |
+ awayLabel->hide(); |
386 |
+ cipherLabel = new QLabel(commandLineBox); |
387 |
+ cipherLabel->hide(); |
388 |
+- cipherLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar)); |
389 |
++ const int toolBarIconSize = cipherLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize); |
390 |
++ cipherLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize)); |
391 |
+ m_inputBar = new IRCInput(commandLineBox); |
392 |
+ |
393 |
+ commandLineLayout->addWidget(nicknameCombobox); |
394 |
+diff --git a/src/irc/nicksonline.cpp b/src/irc/nicksonline.cpp |
395 |
+index e23deab4..bb4cf00e 100644 |
396 |
+--- a/src/irc/nicksonline.cpp |
397 |
++++ b/src/irc/nicksonline.cpp |
398 |
+@@ -31,7 +31,6 @@ |
399 |
+ #include <QToolTip> |
400 |
+ #include <QTreeWidget> |
401 |
+ |
402 |
+-#include <KIconLoader> |
403 |
+ #include <KToolBar> |
404 |
+ |
405 |
+ |
406 |
+diff --git a/src/irc/query.cpp b/src/irc/query.cpp |
407 |
+index 8c1845e6..56310642 100644 |
408 |
+--- a/src/irc/query.cpp |
409 |
++++ b/src/irc/query.cpp |
410 |
+@@ -25,7 +25,6 @@ |
411 |
+ |
412 |
+ #include <QSplitter> |
413 |
+ |
414 |
+-#include <KIconLoader> |
415 |
+ #include <KMessageBox> |
416 |
+ #include <KSqueezedTextLabel> |
417 |
+ |
418 |
+@@ -75,7 +74,8 @@ Query::Query(QWidget* parent, const QString& _name) : ChatWindow(parent) |
419 |
+ blowfishLabel = new QLabel(inputBox); |
420 |
+ inputBoxLayout->addWidget(blowfishLabel); |
421 |
+ blowfishLabel->hide(); |
422 |
+- blowfishLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar)); |
423 |
++ const int toolBarIconSize = blowfishLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize); |
424 |
++ blowfishLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize)); |
425 |
+ m_inputBar=new IRCInput(inputBox); |
426 |
+ inputBoxLayout->addWidget(m_inputBar); |
427 |
+ |
428 |
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp |
429 |
+index 40423d29..a876de30 100644 |
430 |
+--- a/src/mainwindow.cpp |
431 |
++++ b/src/mainwindow.cpp |
432 |
+@@ -49,7 +49,6 @@ |
433 |
+ #include <KActionMenu> |
434 |
+ #include <KNotifyConfigWidget> |
435 |
+ #include <KGlobalAccel> |
436 |
+-#include <KIconLoader> |
437 |
+ |
438 |
+ MainWindow::MainWindow() : KXmlGuiWindow(0) |
439 |
+ { |
440 |
+@@ -743,7 +742,6 @@ void MainWindow::updateTrayIcon() |
441 |
+ // set up system tray |
442 |
+ m_trayIcon = new Konversation::TrayIcon(this); |
443 |
+ connect(this, SIGNAL(endNotification()), m_trayIcon, SLOT(endNotification())); |
444 |
+- connect(KIconLoader::global(), SIGNAL(iconChanged(int)), m_trayIcon, SLOT(updateAppearance())); |
445 |
+ QMenu *trayMenu = qobject_cast<QMenu*>(m_trayIcon->contextMenu()); |
446 |
+ trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::Preferences)))); |
447 |
+ trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::ConfigureNotifications)))); |
448 |
+diff --git a/src/statusbar.cpp b/src/statusbar.cpp |
449 |
+index 07a22fc6..e0efb02f 100644 |
450 |
+--- a/src/statusbar.cpp |
451 |
++++ b/src/statusbar.cpp |
452 |
+@@ -19,7 +19,6 @@ |
453 |
+ #include <KLocalizedString> |
454 |
+ #include <QStatusBar> |
455 |
+ #include <KSqueezedTextLabel> |
456 |
+-#include <KIconLoader> |
457 |
+ |
458 |
+ namespace Konversation |
459 |
+ { |
460 |
+@@ -52,7 +51,8 @@ namespace Konversation |
461 |
+ |
462 |
+ m_sslLabel = new SSLLabel(m_window->statusBar()); |
463 |
+ m_sslLabel->setObjectName(QStringLiteral("sslLabel")); |
464 |
+- m_sslLabel->setPixmap(SmallIcon(QStringLiteral("security-high"))); |
465 |
++ const int smallIconSize = m_sslLabel->style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize); |
466 |
++ m_sslLabel->setPixmap(QIcon::fromTheme(QStringLiteral("security-high")).pixmap(smallIconSize)); |
467 |
+ m_sslLabel->hide(); |
468 |
+ m_sslLabel->setWhatsThis(i18n("All communication with the server is encrypted. This makes it harder for someone to listen in on your communications.")); |
469 |
+ |
470 |
+diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp |
471 |
+index 73f5305f..86bbc3ae 100644 |
472 |
+--- a/src/viewer/ircview.cpp |
473 |
++++ b/src/viewer/ircview.cpp |
474 |
+@@ -30,9 +30,7 @@ |
475 |
+ #include <QTextDocumentFragment> |
476 |
+ #include <QMimeData> |
477 |
+ |
478 |
+-#include <KIconLoader> |
479 |
+ #include <KStandardShortcut> |
480 |
+-#include <kio/pixmaploader.h> |
481 |
+ #include <KUrlMimeData> |
482 |
+ #include <QLocale> |
483 |
+ |
484 |
+@@ -2000,7 +1998,8 @@ void IRCView::mouseMoveEvent(QMouseEvent* ev) |
485 |
+ |
486 |
+ drag->setMimeData(mimeData); |
487 |
+ |
488 |
+- QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium); |
489 |
++ const QString iconName = KIO::iconNameForUrl(url); |
490 |
++ const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32); |
491 |
+ drag->setPixmap(pixmap); |
492 |
+ |
493 |
+ drag->exec(); |
494 |
+diff --git a/src/viewer/ircviewbox.cpp b/src/viewer/ircviewbox.cpp |
495 |
+index 463c9fd3..6c10d976 100644 |
496 |
+--- a/src/viewer/ircviewbox.cpp |
497 |
++++ b/src/viewer/ircviewbox.cpp |
498 |
+@@ -14,7 +14,6 @@ |
499 |
+ #include "ircview.h" |
500 |
+ #include "searchbar.h" |
501 |
+ |
502 |
+-#include <KIconLoader> |
503 |
+ #include <QPixmap> |
504 |
+ #include <QVBoxLayout> |
505 |
+ |
506 |
+diff --git a/src/viewer/topiclabel.cpp b/src/viewer/topiclabel.cpp |
507 |
+index 6a8b4331..c96edc6e 100644 |
508 |
+--- a/src/viewer/topiclabel.cpp |
509 |
++++ b/src/viewer/topiclabel.cpp |
510 |
+@@ -20,9 +20,6 @@ |
511 |
+ #include <QTextDocument> |
512 |
+ #include <QMimeData> |
513 |
+ |
514 |
+-#include <KIconLoader> |
515 |
+-#include <kio/pixmaploader.h> |
516 |
+- |
517 |
+ namespace Konversation |
518 |
+ { |
519 |
+ TopicLabel::TopicLabel(QWidget *parent, const char *name) |
520 |
+@@ -181,7 +178,8 @@ namespace Konversation |
521 |
+ |
522 |
+ drag->setMimeData(mimeData); |
523 |
+ |
524 |
+- QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium); |
525 |
++ const QString iconName = KIO::iconNameForUrl(url); |
526 |
++ const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32); |
527 |
+ drag->setPixmap(pixmap); |
528 |
+ |
529 |
+ drag->exec(); |
530 |
+diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp |
531 |
+index 94d498ea..fd7be5bc 100644 |
532 |
+--- a/src/viewer/viewcontainer.cpp |
533 |
++++ b/src/viewer/viewcontainer.cpp |
534 |
+@@ -52,8 +52,6 @@ |
535 |
+ #include <KToggleAction> |
536 |
+ #include <KSelectAction> |
537 |
+ #include <KWindowSystem> |
538 |
+-#include <KIconLoader> |
539 |
+- |
540 |
+ |
541 |
+ using namespace Konversation; |
542 |
+ |
543 |
+@@ -241,7 +239,7 @@ void ViewContainer::setupTabWidget() |
544 |
+ m_vbox->hide(); |
545 |
+ |
546 |
+ QToolButton* closeBtn = new QToolButton(m_tabWidget); |
547 |
+- closeBtn->setIcon(SmallIcon("tab-close")); |
548 |
++ closeBtn->setIcon(QIcon::fromTheme("tab-close")); |
549 |
+ closeBtn->adjustSize(); |
550 |
+ m_tabWidget->setCornerWidget(closeBtn, Qt::BottomRightCorner); |
551 |
+ connect(closeBtn, SIGNAL(clicked()), this, SLOT(closeCurrentView())); |
552 |
+-- |
553 |
+2.28.0 |
554 |
+ |
555 |
|
556 |
diff --git a/net-irc/konversation/konversation-1.7.9999.ebuild b/net-irc/konversation/konversation-1.7.9999.ebuild |
557 |
new file mode 100644 |
558 |
index 0000000000..f48f4e97c2 |
559 |
--- /dev/null |
560 |
+++ b/net-irc/konversation/konversation-1.7.9999.ebuild |
561 |
@@ -0,0 +1,83 @@ |
562 |
+# Copyright 1999-2020 Gentoo Authors |
563 |
+# Distributed under the terms of the GNU General Public License v2 |
564 |
+ |
565 |
+EAPI=7 |
566 |
+ |
567 |
+EGIT_BRANCH="1.7" |
568 |
+ECM_HANDBOOK="forceoptional" |
569 |
+KFMIN=5.74.0 |
570 |
+QTMIN=5.14.2 |
571 |
+inherit ecm kde.org |
572 |
+ |
573 |
+DESCRIPTION="User friendly IRC Client" |
574 |
+HOMEPAGE="https://konversation.kde.org" |
575 |
+ |
576 |
+if [[ ${KDE_BUILD_TYPE} == release ]]; then |
577 |
+ SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz" |
578 |
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
579 |
+fi |
580 |
+ |
581 |
+LICENSE="GPL-2" |
582 |
+SLOT="5" |
583 |
+IUSE="+crypt" |
584 |
+ |
585 |
+BDEPEND="sys-devel/gettext" |
586 |
+DEPEND=" |
587 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
588 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
589 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
590 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
591 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
592 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
593 |
+ >=kde-frameworks/kbookmarks-${KFMIN}:5 |
594 |
+ >=kde-frameworks/kcodecs-${KFMIN}:5 |
595 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
596 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
597 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
598 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
599 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
600 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
601 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
602 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
603 |
+ >=kde-frameworks/kidletime-${KFMIN}:5 |
604 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
605 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
606 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
607 |
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
608 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
609 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
610 |
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
611 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
612 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
613 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
614 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
615 |
+ >=media-libs/phonon-4.11.0 |
616 |
+ crypt? ( >=app-crypt/qca-2.3.0:2 ) |
617 |
+" |
618 |
+RDEPEND="${DEPEND} |
619 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
620 |
+ crypt? ( >=app-crypt/qca-2.3.0:2[ssl] ) |
621 |
+" |
622 |
+ |
623 |
+PATCHES=( |
624 |
+ # git master |
625 |
+ "${FILESDIR}"/${PN}-1.7.5-kf5bookmarks-5.69.patch |
626 |
+ "${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch |
627 |
+ "${FILESDIR}"/${PN}-1.7.6-no-kiconthemes.patch |
628 |
+) |
629 |
+ |
630 |
+src_configure() { |
631 |
+ local mycmakeargs=( |
632 |
+ $(cmake_use_find_package crypt Qca-qt5) |
633 |
+ ) |
634 |
+ |
635 |
+ ecm_src_configure |
636 |
+} |
637 |
+ |
638 |
+src_install() { |
639 |
+ ecm_src_install |
640 |
+ |
641 |
+ # Bug 616162 |
642 |
+ insinto /etc/xdg |
643 |
+ doins "${FILESDIR}"/konversationrc |
644 |
+} |