public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2017-04-20 23:45 Maciej Mrozowski
  0 siblings, 0 replies; 10+ messages in thread
From: Maciej Mrozowski @ 2017-04-20 23:45 UTC (permalink / raw
  To: gentoo-commits

commit:     1fe3e159570d1fc27db5086b084b1dae4860fac2
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 23:45:26 2017 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 23:45:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe3e159

net-irc/konversation: Add Gentoo support channels to default channel list, bug 616162

Package-Manager: Portage-2.3.3, Repoman-2.3.2

 net-irc/konversation/files/konversationrc      | 24 ++++++++++++++++++++++++
 net-irc/konversation/konversation-1.6.2.ebuild | 10 +++++++++-
 net-irc/konversation/konversation-1.7.ebuild   |  8 ++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/net-irc/konversation/files/konversationrc b/net-irc/konversation/files/konversationrc
new file mode 100644
index 00000000000..932374b6bf4
--- /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-1.6.2.ebuild b/net-irc/konversation/konversation-1.6.2.ebuild
index 8eaa85aa7bc..2ce37c41475 100644
--- a/net-irc/konversation/konversation-1.6.2.ebuild
+++ b/net-irc/konversation/konversation-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,3 +63,11 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_install() {
+	kde5_src_install
+
+	# Bug 616162
+	insinto /etc/xdg
+	doins "${FILESDIR}"/konversationrc
+}

diff --git a/net-irc/konversation/konversation-1.7.ebuild b/net-irc/konversation/konversation-1.7.ebuild
index 41abe5502ae..e41f158e7e7 100644
--- a/net-irc/konversation/konversation-1.7.ebuild
+++ b/net-irc/konversation/konversation-1.7.ebuild
@@ -63,3 +63,11 @@ src_configure() {
 
 	kde5_src_configure
 }
+
+src_install() {
+	kde5_src_install
+
+	# Bug 616162
+	insinto /etc/xdg
+	doins "${FILESDIR}"/konversationrc
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2017-10-12 21:17 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2017-10-12 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     f5d15d8e9a88ae315fb2eef855d1d6461f74d01b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 19:44:22 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 21:17:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d15d8e

net-irc/konversation: Fix crash on extended joins

Package release cycle is slow.

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 .../files/konversation-1.7.2-extjoin-crash.patch   | 47 +++++++++++++
 .../files/konversation-1.7.2-focus.patch           | 25 +++++++
 .../files/konversation-1.7.2-memleak.patch         | 33 ++++++++++
 net-irc/konversation/konversation-1.7.2-r1.ebuild  | 77 ++++++++++++++++++++++
 4 files changed, 182 insertions(+)

diff --git a/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch b/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch
new file mode 100644
index 00000000000..97fc4c1494c
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch
@@ -0,0 +1,47 @@
+From 783dc0f595ecf90e37225a57da0ffa2c030a470d Mon Sep 17 00:00:00 2001
+From: Peter Simonsson <peter.simonsson@gmail.com>
+Date: Sat, 10 Jun 2017 20:41:50 +0200
+Subject: Fix crash in join handling in inputfilter
+
+Make sure to check size of parameter list for extended join.
+
+BUG:378854
+---
+ src/irc/inputfilter.cpp | 19 ++++++-------------
+ 1 file changed, 6 insertions(+), 13 deletions(-)
+
+diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
+index 53f3b2c..f273d30 100644
+--- a/src/irc/inputfilter.cpp
++++ b/src/irc/inputfilter.cpp
+@@ -575,21 +575,14 @@ void InputFilter::parseClientCommand(const QString &prefix, const QString &comma
+         QString account;
+         QString realName;
+ 
+-        if (!m_server->hasExtendedJoin())
+-        {
+-            channelName = trailing;
+-            // Sometimes JOIN comes without ":" in front of the channel name
+-        }
+-        else
++        channelName = parameterList[0];
++
++        if (m_server->hasExtendedJoin() && plHas(3))
+         {
+-            channelName = parameterList[0];
+-            account = parameterList[1];
+-            realName = parameterList[2];
++            if (parameterList[1] != "*")
++                account = parameterList[1];
+ 
+-            if (account == "*")
+-            {
+-                account = QString();
+-            }
++            realName = parameterList[2];
+         }
+ 
+         // Did we join the channel, or was it someone else?
+-- 
+cgit v0.11.2
+

diff --git a/net-irc/konversation/files/konversation-1.7.2-focus.patch b/net-irc/konversation/files/konversation-1.7.2-focus.patch
new file mode 100644
index 00000000000..b42bed488f3
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.2-focus.patch
@@ -0,0 +1,25 @@
+From 3263b47db2d0aab78d6a6fbc99682ac9b5ef2f2e Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Wed, 21 Jun 2017 06:36:26 +0900
+Subject: Don't commit on focus loss.
+
+---
+ 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 a431c80..a5c313e 100644
+--- a/src/irc/channel.cpp
++++ b/src/irc/channel.cpp
+@@ -292,7 +292,7 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent)
+     connect(nicknameCombobox,SIGNAL (activated(int)),this,SLOT(nicknameComboboxChanged()));
+ 
+     if(nicknameCombobox->lineEdit())
+-        connect(nicknameCombobox->lineEdit(), SIGNAL (editingFinished()),this,SLOT(nicknameComboboxChanged()));
++        connect(nicknameCombobox->lineEdit(), SIGNAL (returnPressed()),this,SLOT(nicknameComboboxChanged()));
+ 
+ 
+     connect(&userhostTimer,SIGNAL (timeout()),this,SLOT (autoUserhost()));
+-- 
+cgit v0.11.2
+

diff --git a/net-irc/konversation/files/konversation-1.7.2-memleak.patch b/net-irc/konversation/files/konversation-1.7.2-memleak.patch
new file mode 100644
index 00000000000..c079809f0c6
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.2-memleak.patch
@@ -0,0 +1,33 @@
+From cb2c91f06bc9247520474372d163bd0520f4db42 Mon Sep 17 00:00:00 2001
+From: Gun Park <mujjingun@gmail.com>
+Date: Mon, 10 Jul 2017 16:59:28 +0900
+Subject: Fix memory leak
+
+Reviewers: hein
+
+Reviewed By: hein
+
+Differential Revision: https://phabricator.kde.org/D6580
+---
+ src/viewer/viewcontainer.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp
+index 31ff633..94d498e 100644
+--- a/src/viewer/viewcontainer.cpp
++++ b/src/viewer/viewcontainer.cpp
+@@ -2786,9 +2786,8 @@ void ViewContainer::showJoinChannelDialog()
+     if (dlg->exec() == QDialog::Accepted)
+     {
+         Server *server = Application::instance()->getConnectionManager()->getServerByConnectionId(dlg->connectionId());
+-        if (!server)
+-          return;
+-        server->sendJoinCommand(dlg->channel(), dlg->password());
++        if (server)
++            server->sendJoinCommand(dlg->channel(), dlg->password());
+     }
+     delete dlg;
+ }
+-- 
+cgit v0.11.2
+

diff --git a/net-irc/konversation/konversation-1.7.2-r1.ebuild b/net-irc/konversation/konversation-1.7.2-r1.ebuild
new file mode 100644
index 00000000000..91f420e6b1d
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 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}-extjoin-crash.patch"
+	"${FILESDIR}/${P}-memleak.patch"
+	"${FILESDIR}/${P}-focus.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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2017-11-19  6:14 Michael Palimaka
  0 siblings, 0 replies; 10+ messages in thread
From: Michael Palimaka @ 2017-11-19  6:14 UTC (permalink / raw
  To: gentoo-commits

commit:     36d5d1ee683c56a9fb9d18be0e885c3e849d5d57
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 06:13:01 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 06:14:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d5d1ee

net-irc/konversation: remove vulnerable

Bug: https://bugs.gentoo.org/637112
Package-Manager: Portage-2.3.8, Repoman-2.3.4

 net-irc/konversation/Manifest                      |  1 -
 .../files/konversation-1.7.2-extjoin-crash.patch   | 47 -------------
 .../files/konversation-1.7.2-focus.patch           | 25 -------
 .../files/konversation-1.7.2-memleak.patch         | 33 ----------
 net-irc/konversation/konversation-1.7.2-r1.ebuild  | 77 ----------------------
 net-irc/konversation/konversation-1.7.2.ebuild     | 71 --------------------
 6 files changed, 254 deletions(-)

diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 5b151cdd334..6d101b693d0 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,2 +1 @@
-DIST konversation-1.7.2.tar.xz 3736968 SHA256 5ff96e84cee4e1eefc404a31d778067ea50dddd8a6c848911fac70bd52812618 SHA512 91523043afd7d7698c8166256d3eba225d8ff1ba44cad6811b00bf0004b765ce1ed618e900c8cafa7b395217b3fa3703db62a79b0a491bcef6c0bb65037add06 WHIRLPOOL 842fac84013a6915b5acad2c7ee8abab794c01722628fb4cbd7a3c462229fadf1c88b340fd094efadb1ac62e2c1838de80a26114bff0c98064c9f57e87974860
 DIST konversation-1.7.4.tar.xz 3737732 SHA256 17ef5b7fe816cf52aaaba9ba1b6de69412675353df4217fc889a07ca1c919978 SHA512 8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a WHIRLPOOL 3ebe17b0bb9d2a2bdc80336d47ff7b45c9da29446095ca2b66eeea534e22d0766d16edd8da83a8520b8774a6f86cb020f6549b6d225f70062f9d876b1776c1c0

diff --git a/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch b/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch
deleted file mode 100644
index 97fc4c1494c..00000000000
--- a/net-irc/konversation/files/konversation-1.7.2-extjoin-crash.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 783dc0f595ecf90e37225a57da0ffa2c030a470d Mon Sep 17 00:00:00 2001
-From: Peter Simonsson <peter.simonsson@gmail.com>
-Date: Sat, 10 Jun 2017 20:41:50 +0200
-Subject: Fix crash in join handling in inputfilter
-
-Make sure to check size of parameter list for extended join.
-
-BUG:378854
----
- src/irc/inputfilter.cpp | 19 ++++++-------------
- 1 file changed, 6 insertions(+), 13 deletions(-)
-
-diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
-index 53f3b2c..f273d30 100644
---- a/src/irc/inputfilter.cpp
-+++ b/src/irc/inputfilter.cpp
-@@ -575,21 +575,14 @@ void InputFilter::parseClientCommand(const QString &prefix, const QString &comma
-         QString account;
-         QString realName;
- 
--        if (!m_server->hasExtendedJoin())
--        {
--            channelName = trailing;
--            // Sometimes JOIN comes without ":" in front of the channel name
--        }
--        else
-+        channelName = parameterList[0];
-+
-+        if (m_server->hasExtendedJoin() && plHas(3))
-         {
--            channelName = parameterList[0];
--            account = parameterList[1];
--            realName = parameterList[2];
-+            if (parameterList[1] != "*")
-+                account = parameterList[1];
- 
--            if (account == "*")
--            {
--                account = QString();
--            }
-+            realName = parameterList[2];
-         }
- 
-         // Did we join the channel, or was it someone else?
--- 
-cgit v0.11.2
-

diff --git a/net-irc/konversation/files/konversation-1.7.2-focus.patch b/net-irc/konversation/files/konversation-1.7.2-focus.patch
deleted file mode 100644
index b42bed488f3..00000000000
--- a/net-irc/konversation/files/konversation-1.7.2-focus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3263b47db2d0aab78d6a6fbc99682ac9b5ef2f2e Mon Sep 17 00:00:00 2001
-From: Eike Hein <hein@kde.org>
-Date: Wed, 21 Jun 2017 06:36:26 +0900
-Subject: Don't commit on focus loss.
-
----
- 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 a431c80..a5c313e 100644
---- a/src/irc/channel.cpp
-+++ b/src/irc/channel.cpp
-@@ -292,7 +292,7 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent)
-     connect(nicknameCombobox,SIGNAL (activated(int)),this,SLOT(nicknameComboboxChanged()));
- 
-     if(nicknameCombobox->lineEdit())
--        connect(nicknameCombobox->lineEdit(), SIGNAL (editingFinished()),this,SLOT(nicknameComboboxChanged()));
-+        connect(nicknameCombobox->lineEdit(), SIGNAL (returnPressed()),this,SLOT(nicknameComboboxChanged()));
- 
- 
-     connect(&userhostTimer,SIGNAL (timeout()),this,SLOT (autoUserhost()));
--- 
-cgit v0.11.2
-

diff --git a/net-irc/konversation/files/konversation-1.7.2-memleak.patch b/net-irc/konversation/files/konversation-1.7.2-memleak.patch
deleted file mode 100644
index c079809f0c6..00000000000
--- a/net-irc/konversation/files/konversation-1.7.2-memleak.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cb2c91f06bc9247520474372d163bd0520f4db42 Mon Sep 17 00:00:00 2001
-From: Gun Park <mujjingun@gmail.com>
-Date: Mon, 10 Jul 2017 16:59:28 +0900
-Subject: Fix memory leak
-
-Reviewers: hein
-
-Reviewed By: hein
-
-Differential Revision: https://phabricator.kde.org/D6580
----
- src/viewer/viewcontainer.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp
-index 31ff633..94d498e 100644
---- a/src/viewer/viewcontainer.cpp
-+++ b/src/viewer/viewcontainer.cpp
-@@ -2786,9 +2786,8 @@ void ViewContainer::showJoinChannelDialog()
-     if (dlg->exec() == QDialog::Accepted)
-     {
-         Server *server = Application::instance()->getConnectionManager()->getServerByConnectionId(dlg->connectionId());
--        if (!server)
--          return;
--        server->sendJoinCommand(dlg->channel(), dlg->password());
-+        if (server)
-+            server->sendJoinCommand(dlg->channel(), dlg->password());
-     }
-     delete dlg;
- }
--- 
-cgit v0.11.2
-

diff --git a/net-irc/konversation/konversation-1.7.2-r1.ebuild b/net-irc/konversation/konversation-1.7.2-r1.ebuild
deleted file mode 100644
index 3831ca13839..00000000000
--- a/net-irc/konversation/konversation-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 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}-extjoin-crash.patch"
-	"${FILESDIR}/${P}-memleak.patch"
-	"${FILESDIR}/${P}-focus.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
-}

diff --git a/net-irc/konversation/konversation-1.7.2.ebuild b/net-irc/konversation/konversation-1.7.2.ebuild
deleted file mode 100644
index bedb2f5c384..00000000000
--- a/net-irc/konversation/konversation-1.7.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 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] )
-"
-
-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
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2018-03-19 17:16 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2018-03-19 17:16 UTC (permalink / raw
  To: gentoo-commits

commit:     c6025e149e391ba136c3ce88b89f44749c569c21
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 16:40:20 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 17:15:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6025e14

net-irc/konversation: Fix build with Qt 5.11

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/konversation-1.7.4-qt-5.11.patch         | 27 ++++++++++++++++++++++
 net-irc/konversation/konversation-1.7.4.ebuild     |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)

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
new file mode 100644
index 00000000000..46508bf20a2
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
@@ -0,0 +1,27 @@
+From 5740a0fdb6805c2e26dce20555a946da8485fe50 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+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 <QTabWidget>
+ 
+ class QTimer;
+ 
+-- 
+2.16.2
+

diff --git a/net-irc/konversation/konversation-1.7.4.ebuild b/net-irc/konversation/konversation-1.7.4.ebuild
index bedb2f5c384..e86de80e985 100644
--- a/net-irc/konversation/konversation-1.7.4.ebuild
+++ b/net-irc/konversation/konversation-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,6 +54,8 @@ RDEPEND="${DEPEND}
 	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)


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2019-08-11 10:37 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-08-11 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     348a173ce9ef47821c1a26cafed5fc4277e3d019
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 10:33:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 10:33:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348a173c

net-irc/konversation: Fix missing header with Frameworks 5.61, EAPI-7

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../konversation-1.7.5-fix-regex-for-cap-ack.patch | 25 ++++++++
 .../files/konversation-1.7.5-missing-header.patch  | 23 +++++++
 net-irc/konversation/konversation-1.7.5-r1.ebuild  | 75 ++++++++++++++++++++++
 3 files changed, 123 insertions(+)

diff --git a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
new file mode 100644
index 00000000000..f351dd00134
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
@@ -0,0 +1,25 @@
+From 6d896b4efc93c18246ce4db7c788929b0ce75559 Mon Sep 17 00:00:00 2001
+From: Peter Simonsson <peter.simonsson@gmail.com>
+Date: Sun, 23 Sep 2018 08:29:43 +0200
+Subject: Fix regex for cap ack
+
+Seems to have worked despite being broken
+---
+ src/irc/inputfilter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
+index fbd268b..45d4f88 100644
+--- a/src/irc/inputfilter.cpp
++++ b/src/irc/inputfilter.cpp
+@@ -795,7 +795,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma
+ 
+                 foreach(const QString& capability, capabilities)
+                 {
+-                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9"), Qt::CaseInsensitive));
++                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9]"), Qt::CaseInsensitive));
+                     QString modifierString = capability.left(nameStart);
+                     QString name = capability.mid(nameStart);
+ 
+-- 
+cgit v1.1

diff --git a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
new file mode 100644
index 00000000000..1ff14b81ec5
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
@@ -0,0 +1,23 @@
+From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:14:32 +0200
+Subject: Fix build with Qt 5.13
+
+---
+ src/irc/outputfilter.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
+index f9e6253..45d11fb 100644
+--- a/src/irc/outputfilter.cpp
++++ b/src/irc/outputfilter.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <QStringList>
+ #include <QFile>
++#include <QMetaMethod>
+ #include <QRegExp>
+ #include <QTextCodec>
+ #include <QByteArray>
+-- 
+cgit v1.1

diff --git a/net-irc/konversation/konversation-1.7.5-r1.ebuild b/net-irc/konversation/konversation-1.7.5-r1.ebuild
new file mode 100644
index 00000000000..6232ab88eb8
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.5-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://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"
+
+BDEPEND="sys-devel/gettext"
+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(+)]
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+"
+RDEPEND="${DEPEND}
+	crypt? ( app-crypt/qca:2[ssl] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch
+	"${FILESDIR}"/${P}-missing-header.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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2020-04-17 20:59 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-04-17 20:59 UTC (permalink / raw
  To: gentoo-commits

commit:     781ea43563979f3c99fb00cedd6063448fbe45dd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 19:40:50 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 20:58:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781ea435

net-irc/konversation: Adapt to >=kde-frameworks/kbookmarks-5.69

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../konversation-1.7.5-kf5bookmarks-5.69.patch     | 51 ++++++++++++++++++++++
 net-irc/konversation/konversation-1.7.5-r2.ebuild  |  4 +-
 2 files changed, 54 insertions(+), 1 deletion(-)

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 00000000000..2c36f69aa99
--- /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 <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.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index 9940dae7237..cb485212136 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5=
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -63,6 +63,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-missing-header.patch
 	"${FILESDIR}"/${P}-QElapsedTimer.patch
 	"${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
+	# git master
+	"${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2020-04-17 20:59 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-04-17 20:59 UTC (permalink / raw
  To: gentoo-commits

commit:     cb4fb669b8ae79ade04cf3d8de395277a17cf309
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 19:42:14 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 20:58:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4fb669

net-irc/konversation: Port away from deprecated KWindowSystem API

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../konversation-1.7.5-kf5windowsystem-5.63.patch  | 37 ++++++++++++++++++++++
 net-irc/konversation/konversation-1.7.5-r2.ebuild  |  3 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
new file mode 100644
index 00000000000..cf93b3b66de
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
@@ -0,0 +1,37 @@
+From 4295aba5c02533040723d140e062aebd231b3f18 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Thu, 28 Nov 2019 12:56:34 +0100
+Subject: Port away from deprecated KWindowSystem API (with ifdefs)
+
+---
+ src/application.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/application.cpp b/src/application.cpp
+index 4667c24..538624b 100644
+--- a/src/application.cpp
++++ b/src/application.cpp
+@@ -50,6 +50,7 @@
+ #include <KTextEdit>
+ #include <KSharedConfig>
+ #include <KStartupInfo>
++#include <kwindowsystem_version.h>
+ 
+ using namespace Konversation;
+ 
+@@ -1392,7 +1393,12 @@ void Application::handleActivate(const QStringList& arguments)
+ 
+     newInstance(m_commandLineParser);
+ 
++#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 62, 0)
+     KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
++#else
++    mainWindow->setAttribute(Qt::WA_NativeWindow, true);
++    KStartupInfo::setNewStartupId(mainWindow->windowHandle(), KStartupInfo::startupId());
++#endif
+     mainWindow->show();
+     mainWindow->raise();
+ }
+-- 
+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 f43ed032dde..9940dae7237 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
+KFMIN=5.63.0
 QTMIN=5.12.3
 inherit ecm kde.org
 
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch
 	"${FILESDIR}"/${P}-missing-header.patch
 	"${FILESDIR}"/${P}-QElapsedTimer.patch
+	"${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2020-09-28 21:33 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-09-28 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     7d287acbec9be742598ca45279c52b80e471da00
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 16:41:06 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 21:28:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d287acb

net-irc/konversation: 1.7.6 version bump

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-irc/konversation/Manifest                      |   1 +
 .../files/konversation-1.7.6-no-kiconthemes.patch  | 347 +++++++++++++++++++++
 net-irc/konversation/konversation-1.7.6.ebuild     |  78 +++++
 3 files changed, 426 insertions(+)

diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 616a869958e..9d91dc104c2 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1 +1,2 @@
 DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
+DIST konversation-1.7.6.tar.xz 3354800 BLAKE2B cad571f5d55e030de0d8610417d7c2473f9d3f0b81cfc2c8f730324d73ef0eee17e2f11a6d5714ff541170fa3eab6f4eaa3ecde117a65e9af143e13c1e8afd66 SHA512 69c4b67a186f4242c74e2027d1faca6be7a30719287b960888751a5522da5abe24c6ada076bb097233cf0254c5cff12cc70c9a7a85875f80c0eb1637c6de6613

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
new file mode 100644
index 00000000000..f631a949348
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
@@ -0,0 +1,347 @@
+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.6.ebuild b/net-irc/konversation/konversation-1.7.6.ebuild
new file mode 100644
index 00000000000..f088c5bfd39
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.70.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://konversation.kde.org"
+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/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}
+	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
+"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}"/${PN}-1.7.5-kf5bookmarks-5.69.patch
+	"${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch
+	"${FILESDIR}"/${P}-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] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2020-11-01 20:03 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-11-01 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     e086ff1665ebeda400b3ad4b984092438a55fff6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 19:59:15 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 20:03:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e086ff16

net-irc/konversation: Drop another unused DEPEND

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/konversation-1.7.7-no-solid.patch        | 38 ++++++++++
 net-irc/konversation/konversation-1.7.7-r1.ebuild  | 82 ++++++++++++++++++++++
 2 files changed, 120 insertions(+)

diff --git a/net-irc/konversation/files/konversation-1.7.7-no-solid.patch b/net-irc/konversation/files/konversation-1.7.7-no-solid.patch
new file mode 100644
index 00000000000..53ea4a3d7a1
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.7-no-solid.patch
@@ -0,0 +1,38 @@
+From 3d8a425ef426019c49abea20baa58461900c731d Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Thu, 29 Oct 2020 13:15:22 +0100
+Subject: [PATCH] Remove unused explicit dep on and linkage of Solid
+
+(still pulled in via public dep of KIOFileWidgets, but not used by us)
+---
+ CMakeLists.txt     | 1 -
+ src/CMakeLists.txt | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72ec982d..bcd101e1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+     NotifyConfig
+     KIO
+     Parts
+-    Solid
+     Wallet
+     WidgetsAddons
+     GlobalAccel
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 460325f1..680053e2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -244,7 +244,6 @@ target_link_libraries(konversation
+     KF5::KIOFileWidgets
+     KF5::KIOWidgets
+     KF5::Parts
+-    KF5::Solid
+     KF5::Wallet
+     KF5::WidgetsAddons
+     KF5::GlobalAccel
+-- 
+GitLab
+

diff --git a/net-irc/konversation/konversation-1.7.7-r1.ebuild b/net-irc/konversation/konversation-1.7.7-r1.ebuild
new file mode 100644
index 00000000000..c854ef903fe
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.7-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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
+	"${FILESDIR}"/${P}-no-solid.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] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/
@ 2024-03-07  8:55 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2024-03-07  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     2258bf7ecaeafe1a2b025c4a34802c606cfd38a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 08:34:52 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 08:48:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2258bf7e

net-irc/konversation: Delay tray setup until mainwindow state restored

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=482622
Upstream commit b7a551d6fd07c901d81b25f46f0782a9846c7c23

Add new dependency
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=349675
Upstream commit b7a551d6fd07c901d81b25f46f0782a9846c7c23

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../konversation-24.02.0-delay-tray-setup.patch    | 36 +++++++++++
 .../konversation/konversation-24.02.0-r1.ebuild    | 74 ++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/net-irc/konversation/files/konversation-24.02.0-delay-tray-setup.patch b/net-irc/konversation/files/konversation-24.02.0-delay-tray-setup.patch
new file mode 100644
index 000000000000..fd8f438cc01b
--- /dev/null
+++ b/net-irc/konversation/files/konversation-24.02.0-delay-tray-setup.patch
@@ -0,0 +1,36 @@
+From 1d554cb2c29e57bfd58b9aed7643dcb60fbf8659 Mon Sep 17 00:00:00 2001
+From: Eli MacKenzie <argonel@gmail.com>
+Date: Sun, 3 Mar 2024 17:33:42 -0500
+Subject: [PATCH] Delay tray setup until mainwindow state restored
+
+Otherwise the the KSNI appears to lose track of the main window.
+
+BUG: 482316
+---
+ src/mainwindow.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index c1a029b5a..6faf7d90c 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -571,13 +571,13 @@ MainWindow::MainWindow() : KXmlGuiWindow(nullptr)
+     new KonviBookmarkHandler(menu, this);
+     actionCollection()->addAction(QStringLiteral("bookmarks") , action);
+ 
+-    // decide whether to show the tray icon or not
+-    updateTrayIcon();
+-
+     createGUI();
+ 
+     setAutoSaveSettings();
+ 
++    // decide whether to show the tray icon or not
++    updateTrayIcon();
++
+     // Apply menubar show/hide pref
+     m_showMenuBarAction->setChecked(Preferences::self()->showMenuBar());
+     toggleMenubar(true);
+-- 
+GitLab
+

diff --git a/net-irc/konversation/konversation-24.02.0-r1.ebuild b/net-irc/konversation/konversation-24.02.0-r1.ebuild
new file mode 100644
index 000000000000..f6945fca8ab9
--- /dev/null
+++ b/net-irc/konversation/konversation-24.02.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="+crypt"
+
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
+	>=dev-qt/qttools-${QTMIN}:6[qdbus]
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kidletime-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	crypt? ( >=app-crypt/qca-2.3.7:2[qt6] )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:6
+	crypt? ( >=app-crypt/qca-2.3.7:2[qt6,ssl] )
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-delay-tray-setup.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package crypt Qca-qt6)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# Bug 616162
+	insinto /etc/xdg
+	doins "${FILESDIR}"/konversationrc
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-03-07  8:55 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-28 21:33 [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-03-07  8:55 Andreas Sturmlechner
2020-11-01 20:03 Andreas Sturmlechner
2020-04-17 20:59 Andreas Sturmlechner
2020-04-17 20:59 Andreas Sturmlechner
2019-08-11 10:37 Andreas Sturmlechner
2018-03-19 17:16 Andreas Sturmlechner
2017-11-19  6:14 Michael Palimaka
2017-10-12 21:17 Andreas Sturmlechner
2017-04-20 23:45 Maciej Mrozowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox