[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/
commit: 674fce47ed938cda7769a9e40c9214d8b18342a7
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Apr 23 16:07:47 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon Apr 25 21:46:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674fce47
net-irc/konversation: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
...tion-21.08.3-fix-case-sensitive-tap-compl.patch | 28 --
1 file changed, 28 deletions(-)
diff --git
a/net-irc/konversation/files/konversation-21.08.3-fix-case-sensitive-tap-compl.patch
b/net-irc/konversation/files/konversation-21.08.3-fix-case-sensitive-tap-compl.patch
deleted file mode 100644
index 5a4fbdfd2498..
---
a/net-irc/konversation/files/konversation-21.08.3-fix-case-sensitive-tap-compl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 68d4efb0e9dbcf1fa22c7975d92164a2f991256b Mon Sep 17 00:00:00 2001
-From: Luke Dashjr
-Date: Sat, 18 Dec 2021 21:40:56 +
-Subject: [PATCH] Bugfix: Correct behaviour of "case sensitive" tab completion
- option
-
-Fixes regression from 5dfb6583.
-BUG:442109
- src/irc/channel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp
-index 7acc86f1..9521c695 100644
a/src/irc/channel.cpp
-+++ b/src/irc/channel.cpp
-@@ -2822,7 +2822,7 @@ QString NickList::completeNick(const QString& pattern,
bool& complete, QStringLi
-
- const QRegularExpression regexp(
- prefix + QRegularExpression::escape(pattern),
--caseSensitive ? QRegularExpression::CaseInsensitiveOption :
QRegularExpression::NoPatternOption);
-+caseSensitive ? QRegularExpression::NoPatternOption :
QRegularExpression::CaseInsensitiveOption);
-
- for (Nick* nick : *this) {
- newNick = nick->getChannelNick()->getNickname();
---
-GitLab
-
[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: 8350e9f4d5536c1319312bb2e5f0b1f93bafa889
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 19 16:16:26 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 19 16:18:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8350e9f4
net-irc/konversation: Fix "case sensitive" tabcompl behavior
See also:
https://invent.kde.org/network/konversation/-/merge_requests/66
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=442109
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
...tion-21.08.3-fix-case-sensitive-tap-compl.patch | 28
.../konversation/konversation-21.08.3-r1.ebuild| 75 ++
.../konversation/konversation-21.12.0-r1.ebuild| 75 ++
3 files changed, 178 insertions(+)
diff --git
a/net-irc/konversation/files/konversation-21.08.3-fix-case-sensitive-tap-compl.patch
b/net-irc/konversation/files/konversation-21.08.3-fix-case-sensitive-tap-compl.patch
new file mode 100644
index ..5a4fbdfd2498
--- /dev/null
+++
b/net-irc/konversation/files/konversation-21.08.3-fix-case-sensitive-tap-compl.patch
@@ -0,0 +1,28 @@
+From 68d4efb0e9dbcf1fa22c7975d92164a2f991256b Mon Sep 17 00:00:00 2001
+From: Luke Dashjr
+Date: Sat, 18 Dec 2021 21:40:56 +
+Subject: [PATCH] Bugfix: Correct behaviour of "case sensitive" tab completion
+ option
+
+Fixes regression from 5dfb6583.
+BUG:442109
+---
+ src/irc/channel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp
+index 7acc86f1..9521c695 100644
+--- a/src/irc/channel.cpp
b/src/irc/channel.cpp
+@@ -2822,7 +2822,7 @@ QString NickList::completeNick(const QString& pattern,
bool& complete, QStringLi
+
+ const QRegularExpression regexp(
+ prefix + QRegularExpression::escape(pattern),
+-caseSensitive ? QRegularExpression::CaseInsensitiveOption :
QRegularExpression::NoPatternOption);
++caseSensitive ? QRegularExpression::NoPatternOption :
QRegularExpression::CaseInsensitiveOption);
+
+ for (Nick* nick : *this) {
+ newNick = nick->getChannelNick()->getNickname();
+--
+GitLab
+
diff --git a/net-irc/konversation/konversation-21.08.3-r1.ebuild
b/net-irc/konversation/konversation-21.08.3-r1.ebuild
new file mode 100644
index ..d0fd40cd3e73
--- /dev/null
+++ b/net-irc/konversation/konversation-21.08.3-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KDE_GEAR="true"
+KFMIN=5.84.0
+QTMIN=5.15.2
+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="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+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/knewstuff-${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=( "${FILESDIR}/${P}-fix-case-sensitive-tap-compl.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
+}
diff --git a/net-irc/konversation/konversation-21.12.0-r1.ebuild
b/net-irc/konversation/konversation-21.12.0-r1.ebuild
new file mode 100644
index ..4071b1c1c723
--- /dev/null
+++ b/net-i
[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: d3aeae754473d460cfb6f5f91e76de862aba6277
Author: Ulrich Müller gentoo org>
AuthorDate: Fri Jun 25 08:51:08 2021 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sat Jun 26 17:40:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3aeae75
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>
net-irc/konversation/files/konversationrc | 4 ++--
.../{konversation-20.12.3.ebuild => konversation-20.12.3-r1.ebuild} | 0
.../{konversation-21.04.2.ebuild => konversation-21.04.2-r1.ebuild} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/konversation/files/konversationrc
b/net-irc/konversation/files/konversationrc
index 932374b6bf4..3f4a06eff4e 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
diff --git a/net-irc/konversation/konversation-20.12.3.ebuild
b/net-irc/konversation/konversation-20.12.3-r1.ebuild
similarity index 100%
rename from net-irc/konversation/konversation-20.12.3.ebuild
rename to net-irc/konversation/konversation-20.12.3-r1.ebuild
diff --git a/net-irc/konversation/konversation-21.04.2.ebuild
b/net-irc/konversation/konversation-21.04.2-r1.ebuild
similarity index 100%
rename from net-irc/konversation/konversation-21.04.2.ebuild
rename to net-irc/konversation/konversation-21.04.2-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: f127dbf10ebeb4a9313332c83f321c08ac1f1b7c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 6 08:10:27 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 6 08:23:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f127dbf1
net-irc/konversation: Drop 1.7.7-r1
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-irc/konversation/Manifest | 1 -
.../konversation-1.7.5-unused-kemoticons.patch | 112 ---
.../files/konversation-1.7.6-no-kiconthemes.patch | 347 -
.../files/konversation-1.7.7-no-solid.patch| 38 ---
net-irc/konversation/konversation-1.7.7-r1.ebuild | 82 -
5 files changed, 580 deletions(-)
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index be7440f0be3..deaf1f04952 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,2 +1 @@
-DIST konversation-1.7.7.tar.xz 3357584 BLAKE2B
9f6817a1e01674f383879eeaafc65a50825aa7554fedcf7fbe7affc43da16f7198761ca12b510d9980df5a5f41819a5415043ec91de55f1cb4d86e62e8e23ea0
SHA512
99026007af7fa00b82240c1f0e46a8d3db6c3434948aff7d0b01c2f99bccdd227a2a705bd83bce1ca2e47be13866d5d0a981c8b4ff8dec472612d6ee40f9ed2c
DIST konversation-20.12.3.tar.xz 4242136 BLAKE2B
2483b34dde69a73029d15e8d626c77ebc9f91aaca0dc7b83f4b92629bbf773873de52bf8fd1ead3d862fbb496f2dcc3823320d983ea0c0f2c0ba8ac831ce379f
SHA512
022854edac9e2b834e9c6795cd02e9d9fe5ab54f4d3facaff9f60cac680e1b6df12ef3ac3281a07d4ce732f491fe2b49f47fd467751c9b87549e02df3ef27bae
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 d856a17215a..000
--- 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/fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: 73a81e6a36909558b066e17fd275ee9cdef3ba8b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 21 08:38:37 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 21 09:22:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a81e6a
net-irc/konversation: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/konversation-1.7.5-qt-5.15.patch | 31 ++
net-irc/konversation/konversation-1.7.5-r2.ebuild | 1 +
2 files changed, 32 insertions(+)
diff --git a/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
new file mode 100644
index 000..a17c0a43231
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
@@ -0,0 +1,31 @@
+From f88c73cf278da9907496eab0777903f942c50cb9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Tue, 21 Apr 2020 10:34:49 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing header)
+
+Test Plan: Build succeeds with Qt 5.15.0_beta4
+
+Reviewers: #konversation, psn
+
+Reviewed By: #konversation, psn
+
+Differential Revision: https://phabricator.kde.org/D29038
+---
+ src/viewer/viewtree.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/viewer/viewtree.cpp b/src/viewer/viewtree.cpp
+index 8fb4..04ec4e54 100644
+--- a/src/viewer/viewtree.cpp
b/src/viewer/viewtree.cpp
+@@ -21,6 +21,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+--
+2.26.1
+
diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild
b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index 8c3b601c6cc..22ed78f5a2d 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
# git master
"${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
"${FILESDIR}"/${P}-unused-kemoticons.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: 50aa962977df4cf074391356df6737c593aff7bf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Apr 17 19:54:23 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 17 20:58:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50aa9629
net-irc/konversation: Port to QElapsedTimer
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/konversation-1.7.5-QElapsedTimer.patch | 81 ++
net-irc/konversation/konversation-1.7.5-r2.ebuild | 81 ++
2 files changed, 162 insertions(+)
diff --git a/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
new file mode 100644
index 000..74fd23e58d3
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
@@ -0,0 +1,81 @@
+From 0efede7857a86f729bec0fdfd1789f7faf23d957 Mon Sep 17 00:00:00 2001
+From: David Faure
+Date: Thu, 28 Nov 2019 17:41:33 +0100
+Subject: Port to QElapsedTimer; remove unused default constructor
+
+Tested by printing out the value of age(), works like before.
+---
+ src/irc/ircqueue.cpp | 8
+ src/irc/ircqueue.h | 18 +++---
+ 2 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/src/irc/ircqueue.cpp b/src/irc/ircqueue.cpp
+index 1101623..3cc33a5 100644
+--- a/src/irc/ircqueue.cpp
b/src/irc/ircqueue.cpp
+@@ -19,6 +19,14 @@
+
+ #include "server.h"
+
++IRCMessage::IRCMessage(const QString &str)
++: s(str) //, codec(QTextCodec::codecForName("utf8"))
++{
++t.start();
++}
++
++
++
+ int IRCQueue::EmptyingRate::nextInterval(int, int elapsed)
+ {
+ if (!isValid())
+diff --git a/src/irc/ircqueue.h b/src/irc/ircqueue.h
+index 3f7f0c8..7a91776 100644
+--- a/src/irc/ircqueue.h
b/src/irc/ircqueue.h
+@@ -19,6 +19,7 @@
+ #include
+ #include
+ #include
++#include
+
+ class QTimer;
+ class Server;
+@@ -34,29 +35,24 @@ class Server;
+ */
+ struct IRCMessage
+ {
+-IRCMessage() : t(QTime::currentTime()) //,
codec(QTextCodec::codecForName("utf8"))
+-{} ///< this constructor required for QValueList, do not use
+-
+ /**
+ Make a new IRCMessage with timestamp of QTime::currentTime().
+
+ Note the constructor takes a QString, not a const QString& or a
QString *. If you want to modify the
+ contained text, put it back with setText.
+ */
+-IRCMessage(QString i) : s(i), t(QTime::currentTime()) //,
codec(QTextCodec::codecForName("utf8"))
+-{}
++IRCMessage(const QString &str);
+
+-QString text() { return s; }
+-int age() { return t.elapsed(); }
+-QTime time() { return t; }
+-void setText(QString text) { s=text; }
++QString text() const { return s; }
++int age() const { return t.elapsed(); } // in milliseconds
++void setText(const QString &text) { s=text; }
+ private:
+ QString s;
+-QTime t;
++QElapsedTimer t;
+
+ //FIXME wire this up
+ //QTextCodec* codec;
+-//operator const char * () const { return codec->fromUnicode(text()); }
++//operator QByteArray () const { return codec->fromUnicode(text()); }
+
+ };
+
+--
+cgit v1.1
+
diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild
b/net-irc/konversation/konversation-1.7.5-r2.ebuild
new file mode 100644
index 000..f43ed032dde
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://konversation.kde.org
+https://kde.org/applications/internet/org.kde.konversation";
+SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+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/kemoticons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-framewor
[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: b3474b35d60531d3c9d3174801b4b63a6e5a1f81
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Apr 17 19:53:14 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 17 20:58:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3474b35
net-irc/konversation: Drop kde-frameworks/kemoticons dependency
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../konversation-1.7.5-unused-kemoticons.patch | 112 +
net-irc/konversation/konversation-1.7.5-r2.ebuild | 2 +-
2 files changed, 113 insertions(+), 1 deletion(-)
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 000..d856a17215a
--- /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 "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/konversation-1.7.5-r2.ebuild
b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index cb485212136..8c3b601c6cc 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -34,7 +34,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
@@ -65,6 +64,7 @@ PATCHES=(
"${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
# git master
"${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
+ "${FILESDIR}"/${P}-unused-kemoticons.patch
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/files/, net-irc/konversation/
commit: 89b6d2a5c629db597c183dd7b0a7900c8c3e7c77
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jul 4 19:04:48 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jul 6 06:33:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b6d2a5
net-irc/konversation: Drop old
Package-Manager: Portage-2.3.41, Repoman-2.3.9
net-irc/konversation/Manifest | 1 -
.../files/konversation-1.7.4-qt-5.11.patch | 27
net-irc/konversation/konversation-1.7.4-r1.ebuild | 73 --
3 files changed, 101 deletions(-)
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 3a522b3bd17..616a869958e 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,2 +1 @@
-DIST konversation-1.7.4.tar.xz 3737732 BLAKE2B
585ce998bba94fe928c40c41e360d2dbdf5b5f2be586f8dcbf543c4e4c9a6ff8df428c325d638e21c0b54ae2d82875d2cc53e38f8abb01827428652b138ff600
SHA512
8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a
DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B
92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a
SHA512
001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
diff --git a/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
b/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
deleted file mode 100644
index 46508bf20a2..000
--- a/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5740a0fdb6805c2e26dce20555a946da8485fe50 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Mon, 19 Mar 2018 17:13:30 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing QTabWidget)
-
-Reviewers: #konversation
-
-Differential Revision: https://phabricator.kde.org/D11490
- src/dcc/transferdetailedinfopanel.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/dcc/transferdetailedinfopanel.h
b/src/dcc/transferdetailedinfopanel.h
-index e8debbc0..0e7391de 100644
a/src/dcc/transferdetailedinfopanel.h
-+++ b/src/dcc/transferdetailedinfopanel.h
-@@ -16,6 +16,7 @@
- #include "ui_transferdetailedinfopanelui.h"
- #include "ui_transferdetailedtimeinfopanelui.h"
-
-+#include
-
- class QTimer;
-
---
-2.16.2
-
diff --git a/net-irc/konversation/konversation-1.7.4-r1.ebuild
b/net-irc/konversation/konversation-1.7.4-r1.ebuild
deleted file mode 100644
index d16bd9092d1..000
--- a/net-irc/konversation/konversation-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A user friendly IRC Client"
-HOMEPAGE="https://www.kde.org/applications/internet/konversation/
https://konversation.kde.org";
-SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+crypt"
-
-DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kemoticons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kidletime)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- media-libs/phonon[qt5(+)]
- sys-devel/gettext
- crypt? ( app-crypt/qca:2[qt5(+)] )
-"
-RDEPEND="${DEPEND}
- !net-irc/konversation:4
- crypt? ( app-crypt/qca:2[ssl] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package crypt Qca-qt5)
- )
-
- kde5_src_configure
-}
-
-src_install() {
- kde5_src_install
-
- # Bug 616162
- insinto /etc/xdg
- doins "${FILESDIR}"/konversationrc
-}
