[gentoo-commits] proj/kde:master commit in: net-irc/konversation/, net-irc/konversation/files/
commit: a057a3f7cc4a21467fc69051dff572220831c535
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 1 11:16:30 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 1 15:35:48 2020 +
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 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..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..00
--- 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
-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 @@
-
-
-
--
-- false
-- Enable emoticons
--
--
-- Default
-- Emoticons theme
--
-
-
-
-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
-@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const
QString& defaultColor, const
- QLatin1String("\">") + filteredLine + QLatin1String("");
- }
-
--filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine);
--
- return filteredLine;
- }
-
---
-cgit v1.1
-
-From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001
-From: Peter Simonsson
-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..00
--- 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
-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
-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
-Date: Tue Oct 22 21:35:25 2019 +0200
-Subject: Don't use deprecated SmallIcon
-
- CMakeLists.txt
[gentoo-commits] proj/kde:master commit in: net-irc/konversation/, net-irc/konversation/files/
commit: 3465c2f72285e1a4abe8cb3c54b5846fbe0c8427
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 24 09:22:52 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 24 09:22:52 2020 +
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 gentoo.org>
.../konversation-1.7.5-kf5bookmarks-5.69.patch | 51 --
net-irc/konversation/konversation-1.7..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..00
--- 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
-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
- #include "connectionmanager.h"
- #include "viewer/viewcontainer.h"
-
-+#include
-+#include
- #include
-+#include
- #include
-
-
-@@ -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..ebuild
b/net-irc/konversation/konversation-1.7..ebuild
index 820ba38372..5775461662 100644
--- a/net-irc/konversation/konversation-1.7..ebuild
+++ b/net-irc/konversation/konversation-1.7..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
)
[gentoo-commits] proj/kde:master commit in: net-irc/konversation/, net-irc/konversation/files/
commit: fe5cb7379daae9dd06a37f015a930fb5322c76fb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Apr 17 19:53:14 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jul 10 13:15:25 2020 +
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 gentoo.org>
.../konversation-2.-unused-kemoticons.patch| 112 +
net-irc/konversation/konversation-2..ebuild| 6 +-
net-irc/konversation/konversation-.ebuild | 1 -
3 files changed, 117 insertions(+), 2 deletions(-)
diff --git
a/net-irc/konversation/files/konversation-2.-unused-kemoticons.patch
b/net-irc/konversation/files/konversation-2.-unused-kemoticons.patch
new file mode 100644
index 00..742038b551
--- /dev/null
+++ b/net-irc/konversation/files/konversation-2.-unused-kemoticons.patch
@@ -0,0 +1,112 @@
+From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001
+From: David Edmundson
+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 @@
+
+
+
+-
+- false
+- Enable emoticons
+-
+-
+- Default
+- Emoticons theme
+-
+
+
+
+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
+@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const
QString& defaultColor, const
+ QLatin1String("\">") + filteredLine + QLatin1String("");
+ }
+
+-filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine);
+-
+ return filteredLine;
+ }
+
+--
+cgit v1.1
+
+From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001
+From: Peter Simonsson
+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..ebuild
b/net-irc/konversation/konversation-2..ebuild
index d5e892653f..d713dd034d 100644
--- a/net-irc/konversation/konversation-2..ebuild
+++ b/net-irc/konversation/konversation-2..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-.ebuild
b/net-irc/konversation/konversation-.ebuild
index f6f8e38ebc..74a24ddb25
