* [gentoo-commits] proj/kde:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2020-07-10 13:28 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-07-10 13:28 UTC (permalink / raw
To: gentoo-commits
commit: fe5cb7379daae9dd06a37f015a930fb5322c76fb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 19:53:14 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 10 13:15:25 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe5cb737
net-irc/konversation: Drop unused kde-frameworks/kemoticons dependency
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../konversation-2.9999-unused-kemoticons.patch | 112 +++++++++++++++++++++
net-irc/konversation/konversation-2.9999.ebuild | 6 +-
net-irc/konversation/konversation-9999.ebuild | 1 -
3 files changed, 117 insertions(+), 2 deletions(-)
diff --git a/net-irc/konversation/files/konversation-2.9999-unused-kemoticons.patch b/net-irc/konversation/files/konversation-2.9999-unused-kemoticons.patch
new file mode 100644
index 0000000000..742038b551
--- /dev/null
+++ b/net-irc/konversation/files/konversation-2.9999-unused-kemoticons.patch
@@ -0,0 +1,112 @@
+From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Mon, 16 Sep 2019 18:18:49 +0100
+Subject: Drop effectively unused kemoticons support
+
+Summary:
+Konversation only supported emoticons if config value EnableEmotIcons
+was true. This by default was false and there is no UI for configuring
+this, making it effectively unused.
+
+This appears to be deliberate from the code comments.
+
+This helps clear up some KEmoticon library usage for future KF6
+transitioning.
+
+UTF-8 emoticons work correctly.
+
+Test Plan: Compiles
+
+Differential Revision: https://phabricator.kde.org/D24000
+---
+ src/CMakeLists.txt | 2 --
+ src/config/konversation.kcfg | 8 --------
+ src/viewer/ircview.cpp | 3 ---
+ 3 files changed, 13 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c2077b3..89616a6 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -138,7 +138,6 @@ set(viewer_SRCS
+ viewer/topiclabel.cpp
+ viewer/awaylabel.cpp
+ viewer/editnotifydialog.cpp
+- viewer/emoticons.cpp
+ viewer/images.cpp
+ viewer/quickbutton.cpp
+ viewer/searchbar.cpp
+@@ -224,7 +223,6 @@ target_link_libraries(konversation
+ KF5::Bookmarks
+ KF5::ConfigWidgets
+ KF5::Crash
+- KF5::Emoticons
+ KF5::I18n
+ KF5::IdleTime
+ KF5::NotifyConfig
+diff --git a/src/config/konversation.kcfg b/src/config/konversation.kcfg
+index 1d59eaf..3f0b7a6 100644
+--- a/src/config/konversation.kcfg
++++ b/src/config/konversation.kcfg
+@@ -844,14 +844,6 @@
+ <label></label>
+ <whatsthis></whatsthis>
+ </entry>
+- <entry key="EnableEmotIcons" type="Bool">
+- <default>false</default>
+- <label>Enable emoticons</label>
+- </entry>
+- <entry key="EmotIconTheme" type="String">
+- <default>Default</default>
+- <label>Emoticons theme</label>
+- </entry>
+ </group>
+ <group name="PreferencesDialog">
+ <entry name="PreferencesDialogSize" key="Size" type="Size">
+diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
+index c129f61..15f78ca 100644
+--- a/src/viewer/ircview.cpp
++++ b/src/viewer/ircview.cpp
+@@ -20,7 +20,6 @@
+ #include "application.h"
+ #include "highlight.h"
+ #include "sound.h"
+-#include "emoticons.h"
+ #include "notificationhandler.h"
+
+ #include <QDrag>
+@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const QString& defaultColor, const
+ QLatin1String("\">") + filteredLine + QLatin1String("</font>");
+ }
+
+- filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine);
+-
+ return filteredLine;
+ }
+
+--
+cgit v1.1
+
+From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001
+From: Peter Simonsson <peter.simonsson@gmail.com>
+Date: Tue, 7 Apr 2020 16:37:53 +0200
+Subject: Remove KEmoticons from dependencies as it's not used
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5315dbd..19facd8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+ ConfigWidgets
+ CoreAddons
+ Crash
+- Emoticons
+ I18n
+ IdleTime
+ NotifyConfig
+--
+cgit v1.1
diff --git a/net-irc/konversation/konversation-2.9999.ebuild b/net-irc/konversation/konversation-2.9999.ebuild
index d5e892653f..d713dd034d 100644
--- a/net-irc/konversation/konversation-2.9999.ebuild
+++ b/net-irc/konversation/konversation-2.9999.ebuild
@@ -35,7 +35,6 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kemoticons-${KFMIN}:5
>=kde-frameworks/kglobalaccel-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
@@ -61,6 +60,11 @@ RDEPEND="${DEPEND}
crypt? ( app-crypt/qca:2[ssl] )
"
+PATCHES=(
+ # git master
+ "${FILESDIR}"/${P}-unused-kemoticons.patch
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package crypt Qca-qt5)
diff --git a/net-irc/konversation/konversation-9999.ebuild b/net-irc/konversation/konversation-9999.ebuild
index f6f8e38ebc..74a24ddb25 100644
--- a/net-irc/konversation/konversation-9999.ebuild
+++ b/net-irc/konversation/konversation-9999.ebuild
@@ -33,7 +33,6 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kemoticons-${KFMIN}:5
>=kde-frameworks/kglobalaccel-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2020-10-24 15:28 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-10-24 15:28 UTC (permalink / raw
To: gentoo-commits
commit: 3465c2f72285e1a4abe8cb3c54b5846fbe0c8427
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 09:22:52 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 09:22:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3465c2f7
net-irc/konversation: Drop patch, cherry-picked upstream
Upstream commit 915fd59dc31ce625dda87cf3ce72519dd8bc5f75
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../konversation-1.7.5-kf5bookmarks-5.69.patch | 51 ----------------------
net-irc/konversation/konversation-1.7.9999.ebuild | 1 -
2 files changed, 52 deletions(-)
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
deleted file mode 100644
index 2c36f69aa9..0000000000
--- a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 57df81cd8a11c4dbe170f9d81abd5b35b4887e0b Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 17 Apr 2020 13:14:26 +0200
-Subject: Adapt the code to KBookmarkMenu-5.69 changes
-
-Test Plan:
-Bookmarks menu still works, and the bookmark actions still show in the
-shortcuts editor dialog.
-
-Reviewers: #konversation, psn
-
-Reviewed By: #konversation, psn
-
-Subscribers: #konversation
-
-Differential Revision: https://phabricator.kde.org/D28911
----
- src/bookmarkhandler.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/bookmarkhandler.cpp b/src/bookmarkhandler.cpp
-index 5a70591..74b51ff 100644
---- a/src/bookmarkhandler.cpp
-+++ b/src/bookmarkhandler.cpp
-@@ -21,7 +21,10 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
- #include "connectionmanager.h"
- #include "viewer/viewcontainer.h"
-
-+#include <KActionCollection>
-+#include <kbookmarks_version.h>
- #include <KBookmarkMenu>
-+#include <QMenu>
- #include <QStandardPaths>
-
-
-@@ -41,7 +44,12 @@ m_mainWindow(mainWindow)
- manager->setEditorOptions(i18n("Konversation Bookmarks Editor"), false);
- manager->setUpdate( true );
-
-+#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
- m_bookmarkMenu = new KBookmarkMenu(manager, this, menu, m_mainWindow->actionCollection());
-+#else
-+ m_bookmarkMenu = new KBookmarkMenu(manager, this, menu);
-+ m_mainWindow->actionCollection()->addActions(menu->actions());
-+#endif
- }
-
- KonviBookmarkHandler::~KonviBookmarkHandler()
---
-cgit v1.1
-
diff --git a/net-irc/konversation/konversation-1.7.9999.ebuild b/net-irc/konversation/konversation-1.7.9999.ebuild
index 820ba38372..5775461662 100644
--- a/net-irc/konversation/konversation-1.7.9999.ebuild
+++ b/net-irc/konversation/konversation-1.7.9999.ebuild
@@ -61,7 +61,6 @@ RDEPEND="${DEPEND}
PATCHES=(
# git master
- "${FILESDIR}"/${PN}-1.7.5-kf5bookmarks-5.69.patch
"${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch
"${FILESDIR}"/${PN}-1.7.6-no-kiconthemes.patch
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2020-11-01 23:11 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-11-01 23:11 UTC (permalink / raw
To: gentoo-commits
commit: a057a3f7cc4a21467fc69051dff572220831c535
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 1 11:16:30 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 15:35:48 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a057a3f7
net-irc/konversation: Drop 1.7 stable branch
Future releases are part of KDE Release Service.
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../konversation-1.7.5-unused-kemoticons.patch | 112 -------
.../files/konversation-1.7.6-no-kiconthemes.patch | 347 ---------------------
net-irc/konversation/konversation-1.7.9999.ebuild | 82 -----
3 files changed, 541 deletions(-)
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
deleted file mode 100644
index d856a17215..0000000000
--- a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Mon, 16 Sep 2019 18:18:49 +0100
-Subject: Drop effectively unused kemoticons support
-
-Summary:
-Konversation only supported emoticons if config value EnableEmotIcons
-was true. This by default was false and there is no UI for configuring
-this, making it effectively unused.
-
-This appears to be deliberate from the code comments.
-
-This helps clear up some KEmoticon library usage for future KF6
-transitioning.
-
-UTF-8 emoticons work correctly.
-
-Test Plan: Compiles
-
-Differential Revision: https://phabricator.kde.org/D24000
----
- src/CMakeLists.txt | 2 --
- src/config/konversation.kcfg | 8 --------
- src/viewer/ircview.cpp | 3 ---
- 3 files changed, 13 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c2077b3..89616a6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -138,7 +138,6 @@ set(viewer_SRCS
- viewer/topiclabel.cpp
- viewer/awaylabel.cpp
- viewer/editnotifydialog.cpp
-- viewer/emoticons.cpp
- viewer/images.cpp
- viewer/quickbutton.cpp
- viewer/searchbar.cpp
-@@ -224,7 +223,6 @@ target_link_libraries(konversation
- KF5::Bookmarks
- KF5::ConfigWidgets
- KF5::Crash
-- KF5::Emoticons
- KF5::I18n
- KF5::IdleTime
- KF5::NotifyConfig
-diff --git a/src/config/konversation.kcfg b/src/config/konversation.kcfg
-index 1d59eaf..3f0b7a6 100644
---- a/src/config/konversation.kcfg
-+++ b/src/config/konversation.kcfg
-@@ -844,14 +844,6 @@
- <label></label>
- <whatsthis></whatsthis>
- </entry>
-- <entry key="EnableEmotIcons" type="Bool">
-- <default>false</default>
-- <label>Enable emoticons</label>
-- </entry>
-- <entry key="EmotIconTheme" type="String">
-- <default>Default</default>
-- <label>Emoticons theme</label>
-- </entry>
- </group>
- <group name="PreferencesDialog">
- <entry name="PreferencesDialogSize" key="Size" type="Size">
-diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
-index c129f61..15f78ca 100644
---- a/src/viewer/ircview.cpp
-+++ b/src/viewer/ircview.cpp
-@@ -20,7 +20,6 @@
- #include "application.h"
- #include "highlight.h"
- #include "sound.h"
--#include "emoticons.h"
- #include "notificationhandler.h"
-
- #include <QDrag>
-@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const QString& defaultColor, const
- QLatin1String("\">") + filteredLine + QLatin1String("</font>");
- }
-
-- filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine);
--
- return filteredLine;
- }
-
---
-cgit v1.1
-
-From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001
-From: Peter Simonsson <peter.simonsson@gmail.com>
-Date: Tue, 7 Apr 2020 16:37:53 +0200
-Subject: Remove KEmoticons from dependencies as it's not used
-
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5315dbd..19facd8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
- CoreAddons
- Crash
- DocTools
-- Emoticons
- I18n
- IdleTime
- NotifyConfig
---
-cgit v1.1
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
deleted file mode 100644
index f631a94934..0000000000
--- a/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-From 2104a776203d32b49512b303506f94085e0e4d89 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 19 Sep 2020 22:50:48 +0200
-Subject: [PATCH] Port away from KIconthemes
-
-Use appropriate QIcon/QStyle API instead
-
-Incorporates:
-
-commit 5cd6c690e005a040e5fd3ccfca7ae23593c6dfe6
-Author: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat Sep 19 22:50:48 2020 +0200
-Subject: Remove unneeded system tray icon update
-
- The system tray icon is specified by name.
- We don't need to do anything when the theme changes.
-
-commit d1bce09605c255f7b96fa677ece363b3053d085e
-Author: Peter Simonsson <peter.simonsson@gmail.com>
-Date: Tue Oct 22 21:35:25 2019 +0200
-Subject: Don't use deprecated SmallIcon
-
----
- CMakeLists.txt | 1 -
- src/CMakeLists.txt | 1 -
- src/dcc/recipientdialog.cpp | 5 ++---
- src/dcc/transferlistmodel.cpp | 25 ++++---------------------
- src/dcc/transferlistmodel.h | 3 +--
- src/irc/channel.cpp | 4 ++--
- src/irc/nicksonline.cpp | 1 -
- src/irc/query.cpp | 4 ++--
- src/mainwindow.cpp | 2 --
- src/statusbar.cpp | 4 ++--
- src/viewer/ircview.cpp | 5 ++---
- src/viewer/ircviewbox.cpp | 1 -
- src/viewer/topiclabel.cpp | 6 ++----
- src/viewer/viewcontainer.cpp | 4 +---
- 14 files changed, 18 insertions(+), 48 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f0cd4b4f..3a1f5274 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,7 +37,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
- DBusAddons
- Notifications
- WindowSystem
-- IconThemes
- ItemViews
- )
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 04f28971..36de36b0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -238,7 +238,6 @@ target_link_libraries(konversation
- KF5::CoreAddons
- KF5::Notifications
- KF5::WindowSystem
-- KF5::IconThemes
- KF5::ItemViews
- Phonon::phonon4qt5)
-
-diff --git a/src/dcc/recipientdialog.cpp b/src/dcc/recipientdialog.cpp
-index 3e6eeae7..e81e91ea 100644
---- a/src/dcc/recipientdialog.cpp
-+++ b/src/dcc/recipientdialog.cpp
-@@ -28,7 +28,6 @@
- #include <KLineEdit>
- #include <KSharedConfig>
- #include <KWindowConfig>
--#include <KIconLoader>
-
- namespace Konversation
- {
-@@ -64,12 +63,12 @@ namespace Konversation
- dialogLayout->addWidget(buttonBox);
- QPushButton* button = buttonBox->addButton(QDialogButtonBox::Ok);
- button->setToolTip(i18n("Select nickname and close the window"));
-- button->setIcon(SmallIcon("dialog-ok"));
-+ button->setIcon(QIcon::fromTheme("dialog-ok"));
- button->setShortcut(Qt::CTRL | Qt::Key_Return);
- button->setDefault(true);
- button = buttonBox->addButton(QDialogButtonBox::Cancel);
- button->setToolTip(i18n("Close the window without changes"));
-- button->setIcon(SmallIcon("dialog-cancel"));
-+ button->setIcon(QIcon::fromTheme("dialog-cancel"));
-
- KWindowConfig::restoreWindowSize(windowHandle(), KConfigGroup(KSharedConfig::openConfig(), "DCCRecipientDialog"));
-
-diff --git a/src/dcc/transferlistmodel.cpp b/src/dcc/transferlistmodel.cpp
-index cc1763f9..2a7e3b15 100644
---- a/src/dcc/transferlistmodel.cpp
-+++ b/src/dcc/transferlistmodel.cpp
-@@ -21,7 +21,6 @@
- #include <KCategorizedSortFilterProxyModel>
- #include <KLocalizedString>
- #include <KCategoryDrawer>
--#include <KIconLoader>
-
- namespace Konversation
- {
-@@ -313,15 +312,11 @@ namespace Konversation
- {
- case TransferHeaderData::Status:
- {
-- QVariant decoration(QVariant::Pixmap);
-- decoration.setValue<QPixmap>(getStatusIcon(transfer->getStatus()));
-- return decoration;
-+ return getStatusIcon(transfer->getStatus());
- }
- case TransferHeaderData::TypeIcon:
- {
-- QVariant decoration(QVariant::Pixmap);
-- decoration.setValue<QPixmap>(getTypeIcon(transfer->getType()));
-- return decoration;
-+ return transfer->getType() == Transfer::Send ? QIcon::fromTheme("arrow-up") : QIcon::fromTheme("arrow-down");
- }
- default:
- return QVariant();
-@@ -384,19 +379,7 @@ namespace Konversation
- }
- }
-
-- QPixmap TransferListModel::getTypeIcon(Transfer::Type type) const
-- {
-- if (type == Transfer::Send)
-- {
-- return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Small);
-- }
-- else
-- {
-- return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Small);
-- }
-- }
--
-- QPixmap TransferListModel::getStatusIcon(Transfer::Status status) const
-+ QIcon TransferListModel::getStatusIcon(Transfer::Status status) const
- {
- QString icon;
- switch (status)
-@@ -422,7 +405,7 @@ namespace Konversation
- default:
- break;
- }
-- return KIconLoader::global()->loadIcon(icon, KIconLoader::Small);
-+ return QIcon::fromTheme(icon);
- }
-
- QString TransferListModel::getSpeedPrettyText (transferspeed_t speed)
-diff --git a/src/dcc/transferlistmodel.h b/src/dcc/transferlistmodel.h
-index 3a8a945c..b8bc0d25 100644
---- a/src/dcc/transferlistmodel.h
-+++ b/src/dcc/transferlistmodel.h
-@@ -164,8 +164,7 @@ namespace Konversation
- inline QString getPositionPrettyText(KIO::fileoffset_t position,
- KIO::filesize_t filesize) const;
- inline QString getSenderAddressPrettyText(Transfer *transfer) const;
-- inline QPixmap getStatusIcon(Transfer::Status status) const;
-- inline QPixmap getTypeIcon(Transfer::Type type) const;
-+ inline QIcon getStatusIcon(Transfer::Status status) const;
- inline QString getStatusDescription(Transfer::Status status, Transfer::Type type, const QString& errorMessage = QString()) const;
-
- QList<TransferItemData> m_transferList;
-diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp
-index 6488a0c1..595d0adc 100644
---- a/src/irc/channel.cpp
-+++ b/src/irc/channel.cpp
-@@ -38,7 +38,6 @@
- #include <KLineEdit>
- #include <KPasswordDialog>
- #include <KMessageBox>
--#include <KIconLoader>
- #include <KComboBox>
-
- #define DELAYED_SORT_TRIGGER 10
-@@ -237,7 +236,8 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent)
- awayLabel->hide();
- cipherLabel = new QLabel(commandLineBox);
- cipherLabel->hide();
-- cipherLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
-+ const int toolBarIconSize = cipherLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
-+ cipherLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
- m_inputBar = new IRCInput(commandLineBox);
-
- commandLineLayout->addWidget(nicknameCombobox);
-diff --git a/src/irc/nicksonline.cpp b/src/irc/nicksonline.cpp
-index e23deab4..bb4cf00e 100644
---- a/src/irc/nicksonline.cpp
-+++ b/src/irc/nicksonline.cpp
-@@ -31,7 +31,6 @@
- #include <QToolTip>
- #include <QTreeWidget>
-
--#include <KIconLoader>
- #include <KToolBar>
-
-
-diff --git a/src/irc/query.cpp b/src/irc/query.cpp
-index 8c1845e6..56310642 100644
---- a/src/irc/query.cpp
-+++ b/src/irc/query.cpp
-@@ -25,7 +25,6 @@
-
- #include <QSplitter>
-
--#include <KIconLoader>
- #include <KMessageBox>
- #include <KSqueezedTextLabel>
-
-@@ -75,7 +74,8 @@ Query::Query(QWidget* parent, const QString& _name) : ChatWindow(parent)
- blowfishLabel = new QLabel(inputBox);
- inputBoxLayout->addWidget(blowfishLabel);
- blowfishLabel->hide();
-- blowfishLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
-+ const int toolBarIconSize = blowfishLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
-+ blowfishLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
- m_inputBar=new IRCInput(inputBox);
- inputBoxLayout->addWidget(m_inputBar);
-
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index 40423d29..a876de30 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -49,7 +49,6 @@
- #include <KActionMenu>
- #include <KNotifyConfigWidget>
- #include <KGlobalAccel>
--#include <KIconLoader>
-
- MainWindow::MainWindow() : KXmlGuiWindow(0)
- {
-@@ -743,7 +742,6 @@ void MainWindow::updateTrayIcon()
- // set up system tray
- m_trayIcon = new Konversation::TrayIcon(this);
- connect(this, SIGNAL(endNotification()), m_trayIcon, SLOT(endNotification()));
-- connect(KIconLoader::global(), SIGNAL(iconChanged(int)), m_trayIcon, SLOT(updateAppearance()));
- QMenu *trayMenu = qobject_cast<QMenu*>(m_trayIcon->contextMenu());
- trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::Preferences))));
- trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::ConfigureNotifications))));
-diff --git a/src/statusbar.cpp b/src/statusbar.cpp
-index 07a22fc6..e0efb02f 100644
---- a/src/statusbar.cpp
-+++ b/src/statusbar.cpp
-@@ -19,7 +19,6 @@
- #include <KLocalizedString>
- #include <QStatusBar>
- #include <KSqueezedTextLabel>
--#include <KIconLoader>
-
- namespace Konversation
- {
-@@ -52,7 +51,8 @@ namespace Konversation
-
- m_sslLabel = new SSLLabel(m_window->statusBar());
- m_sslLabel->setObjectName(QStringLiteral("sslLabel"));
-- m_sslLabel->setPixmap(SmallIcon(QStringLiteral("security-high")));
-+ const int smallIconSize = m_sslLabel->style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize);
-+ m_sslLabel->setPixmap(QIcon::fromTheme(QStringLiteral("security-high")).pixmap(smallIconSize));
- m_sslLabel->hide();
- m_sslLabel->setWhatsThis(i18n("All communication with the server is encrypted. This makes it harder for someone to listen in on your communications."));
-
-diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
-index 73f5305f..86bbc3ae 100644
---- a/src/viewer/ircview.cpp
-+++ b/src/viewer/ircview.cpp
-@@ -30,9 +30,7 @@
- #include <QTextDocumentFragment>
- #include <QMimeData>
-
--#include <KIconLoader>
- #include <KStandardShortcut>
--#include <kio/pixmaploader.h>
- #include <KUrlMimeData>
- #include <QLocale>
-
-@@ -2000,7 +1998,8 @@ void IRCView::mouseMoveEvent(QMouseEvent* ev)
-
- drag->setMimeData(mimeData);
-
-- QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
-+ const QString iconName = KIO::iconNameForUrl(url);
-+ const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
- drag->setPixmap(pixmap);
-
- drag->exec();
-diff --git a/src/viewer/ircviewbox.cpp b/src/viewer/ircviewbox.cpp
-index 463c9fd3..6c10d976 100644
---- a/src/viewer/ircviewbox.cpp
-+++ b/src/viewer/ircviewbox.cpp
-@@ -14,7 +14,6 @@
- #include "ircview.h"
- #include "searchbar.h"
-
--#include <KIconLoader>
- #include <QPixmap>
- #include <QVBoxLayout>
-
-diff --git a/src/viewer/topiclabel.cpp b/src/viewer/topiclabel.cpp
-index 6a8b4331..c96edc6e 100644
---- a/src/viewer/topiclabel.cpp
-+++ b/src/viewer/topiclabel.cpp
-@@ -20,9 +20,6 @@
- #include <QTextDocument>
- #include <QMimeData>
-
--#include <KIconLoader>
--#include <kio/pixmaploader.h>
--
- namespace Konversation
- {
- TopicLabel::TopicLabel(QWidget *parent, const char *name)
-@@ -181,7 +178,8 @@ namespace Konversation
-
- drag->setMimeData(mimeData);
-
-- QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
-+ const QString iconName = KIO::iconNameForUrl(url);
-+ const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
- drag->setPixmap(pixmap);
-
- drag->exec();
-diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp
-index 94d498ea..fd7be5bc 100644
---- a/src/viewer/viewcontainer.cpp
-+++ b/src/viewer/viewcontainer.cpp
-@@ -52,8 +52,6 @@
- #include <KToggleAction>
- #include <KSelectAction>
- #include <KWindowSystem>
--#include <KIconLoader>
--
-
- using namespace Konversation;
-
-@@ -241,7 +239,7 @@ void ViewContainer::setupTabWidget()
- m_vbox->hide();
-
- QToolButton* closeBtn = new QToolButton(m_tabWidget);
-- closeBtn->setIcon(SmallIcon("tab-close"));
-+ closeBtn->setIcon(QIcon::fromTheme("tab-close"));
- closeBtn->adjustSize();
- m_tabWidget->setCornerWidget(closeBtn, Qt::BottomRightCorner);
- connect(closeBtn, SIGNAL(clicked()), this, SLOT(closeCurrentView()));
---
-2.28.0
-
diff --git a/net-irc/konversation/konversation-1.7.9999.ebuild b/net-irc/konversation/konversation-1.7.9999.ebuild
deleted file mode 100644
index 9e21389177..0000000000
--- a/net-irc/konversation/konversation-1.7.9999.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_BRANCH="1.7"
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="+crypt"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=media-libs/phonon-4.11.0
- crypt? ( >=app-crypt/qca-2.3.0:2 )
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtsvg-${QTMIN}:5
- crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
-"
-
-PATCHES=(
- # git master
- "${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch
- "${FILESDIR}"/${PN}-1.7.6-no-kiconthemes.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package crypt Qca-qt5)
- )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # Bug 616162
- insinto /etc/xdg
- doins "${FILESDIR}"/konversationrc
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-01 23:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-10 13:28 [gentoo-commits] proj/kde:master commit in: net-irc/konversation/, net-irc/konversation/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-10-24 15:28 Andreas Sturmlechner
2020-11-01 23:11 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox