[gentoo-commits] proj/kde:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: fdbafc16f664ad6ae17906ad7d7c70e872198fad
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Aug 15 13:43:22 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Aug 15 13:44:29 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fdbafc16
net-irc/konversation: drop 2., branch wip/qtquick is dead
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../konversation-2.-unused-kemoticons.patch| 112 -
net-irc/konversation/konversation-2..ebuild| 82 ---
2 files changed, 194 deletions(-)
diff --git
a/net-irc/konversation/files/konversation-2.-unused-kemoticons.patch
b/net-irc/konversation/files/konversation-2.-unused-kemoticons.patch
deleted file mode 100644
index 742038b551..00
--- a/net-irc/konversation/files/konversation-2.-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
- 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
deleted file mode 100644
index 1c94e4c55e..00
--- a/net-irc/konversation/konversation-2..ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_BRANCH="wip/qtquick"
-ECM_HANDBOOK="forceoptional"
-KDE_GEAR="true"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org
-
-DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/;
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS=""
-IUSE="+crypt"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=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
-
[gentoo-commits] proj/kde:master commit in: net-irc/konversation/files/
commit: 128878c1774c4b7c754d7b91eebab3eb40bdeaae Author: Ulrich Müller gentoo org> AuthorDate: Fri Jun 25 08:51:08 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 27 18:28:24 2021 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=128878c1 net-irc/konversation: Update Server default in konversationrc Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Ulrich Müller gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> net-irc/konversation/files/konversationrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-irc/konversation/files/konversationrc b/net-irc/konversation/files/konversationrc index 932374b6bf..3f4a06eff4 100644 --- a/net-irc/konversation/files/konversationrc +++ b/net-irc/konversation/files/konversationrc @@ -13,12 +13,12 @@ Name=#gentoo-xfce [Server 0] Port=8001 SSLEnabled=false -Server=chat.freenode.net +Server=irc.libera.chat [ServerGroup 0] AutoConnect=false AutoJoinChannels=Channel 0,Channel 1,Channel 2,Channel 3 EnableNotifications=true Expanded=false -Name=Freenode +Name=Libera ServerList=Server 0
[gentoo-commits] proj/kde:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: 54a63d88015b66071a4d7b7038854fd5eee179e7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Oct 17 14:32:08 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 17 14:32:50 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54a63d88
net-irc/konversation: Add 1.7 stable branch
Adding release switch and new RDEPEND from upstream commit
42dc7b1429853f0840e4209d9faef3454a034898
Development on 1.7 continues while git master has diverged too much
to spin 1.7 point releases from it.
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../konversation-1.7.5-kf5bookmarks-5.69.patch | 51 +++
.../konversation-1.7.5-unused-kemoticons.patch | 112 +++
.../files/konversation-1.7.6-no-kiconthemes.patch | 347 +
net-irc/konversation/konversation-1.7..ebuild | 83 +
4 files changed, 593 insertions(+)
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
new file mode 100644
index 00..2c36f69aa9
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
@@ -0,0 +1,51 @@
+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/files/konversation-1.7.5-unused-kemoticons.patch
b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
new file mode 100644
index 00..d856a17215
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-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
[gentoo-commits] proj/kde:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: 3a501f8217e06701ab20481c5fb4ab2e28839aed
Author: Maciej Mrozowski gentoo org>
AuthorDate: Thu Apr 20 23:47:19 2017 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Thu Apr 20 23:48:15 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3a501f82
net-irc/konversation: Add Gentoo support channels to default channel list, bug
616162
net-irc/konversation/files/konversationrc | 24
net-irc/konversation/konversation-.ebuild | 8
2 files changed, 32 insertions(+)
diff --git a/net-irc/konversation/files/konversationrc
b/net-irc/konversation/files/konversationrc
new file mode 100644
index 00..932374b6bf
--- /dev/null
+++ b/net-irc/konversation/files/konversationrc
@@ -0,0 +1,24 @@
+[Channel 0]
+Name=#gentoo
+
+[Channel 1]
+Name=#gentoo-desktop
+
+[Channel 2]
+Name=#gentoo-kde
+
+[Channel 3]
+Name=#gentoo-xfce
+
+[Server 0]
+Port=8001
+SSLEnabled=false
+Server=chat.freenode.net
+
+[ServerGroup 0]
+AutoConnect=false
+AutoJoinChannels=Channel 0,Channel 1,Channel 2,Channel 3
+EnableNotifications=true
+Expanded=false
+Name=Freenode
+ServerList=Server 0
diff --git a/net-irc/konversation/konversation-.ebuild
b/net-irc/konversation/konversation-.ebuild
index 0dc5ee98d2..8f66b6c5d9 100644
--- a/net-irc/konversation/konversation-.ebuild
+++ b/net-irc/konversation/konversation-.ebuild
@@ -60,3 +60,11 @@ src_configure() {
kde5_src_configure
}
+
+src_install() {
+ kde5_src_install
+
+ # Bug 616162
+ insinto /etc/xdg
+ doins "${FILESDIR}"/konversationrc
+}
