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