summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-12-19 20:50:41 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2023-12-19 21:44:23 +0100
commitfcd9ea5362ab55c94cb2355eb3885750222de8c4 (patch)
treed514dd69057d4987a1d66bbe53b74198ef1b337d /net-im
parentkde-misc/kio-gdrive: drop 23.04.3 (diff)
downloadgentoo-fcd9ea5362ab55c94cb2355eb3885750222de8c4.tar.gz
gentoo-fcd9ea5362ab55c94cb2355eb3885750222de8c4.tar.bz2
gentoo-fcd9ea5362ab55c94cb2355eb3885750222de8c4.zip
net-im/neochat: drop 23.04.3-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-im')
-rw-r--r--net-im/neochat/Manifest1
-rw-r--r--net-im/neochat/files/neochat-23.04.3-libquotient-0.8-1.patch91
-rw-r--r--net-im/neochat/files/neochat-23.04.3-libquotient-0.8-2.patch55
-rw-r--r--net-im/neochat/neochat-23.04.3-r1.ebuild53
4 files changed, 0 insertions, 200 deletions
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index 880794973898..cff680b84883 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,3 +1,2 @@
-DIST neochat-23.04.3.tar.xz 570776 BLAKE2B 7d5a9d724ecefc6f64a18629b24c80ef16f1e650ef3e8ae793590c44865d057d6f2905c199337dccf53c551fb4e00a8322238060731e2a3433e5e9e146acef67 SHA512 9e453c3bab98a45fe1d1d7139b574ff25e6d7a78749b38966eec17fa67ff366eea955aa82cde0743135c8ac35ca218a761abced055743545db760d67849e3a96
DIST neochat-23.08.3.tar.xz 783024 BLAKE2B f37ed6acb2775a54e51f71dc36488d0fc6d3cf7a85e498d7cb5369785ae5b7ea89bc0492207c28a7e2d6266b5305d1402f6e2fae6d0eae49563820fda908bce1 SHA512 02bbfb982b3ca159948789b4d3734a24d0fa8957b81bfbacc6517dbed9aee630d793a98e1d0668a0b657c968e9f16a2d11759ce56fcc5cf77ad76aef2105d233
DIST neochat-23.08.4.tar.xz 784304 BLAKE2B fcb150031bb988013a6eff5b2b2a3ace03315ec60f5e4ad447d254fc6ff118ba35685a61833fd06e740006f298abfa1d7646414ec60c7984d3e3bcca6f239a48 SHA512 c7a112b9ae1d0cf71cd1cf5f0caea623d4e40db5905c1c58e10e9f9911f92912529103c2d8408dceecdd29246f39d21dc247a0a0b9f2419ece5e27948443c7e6
diff --git a/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-1.patch b/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-1.patch
deleted file mode 100644
index 9e4aaa3b19df..000000000000
--- a/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-1.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From a94f46f90462dce1f817e9f28d24dad454e0dfb4 Mon Sep 17 00:00:00 2001
-From: Tobias Fella <fella@posteo.de>
-Date: Fri, 26 May 2023 17:47:26 +0200
-Subject: [PATCH] Fix build against libQuotient 0.8
-
----
- src/controller.cpp | 24 ++++++++++++++++++++----
- src/login.cpp | 4 ++++
- 2 files changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/src/controller.cpp b/src/controller.cpp
-index dd38ede9b..3835e312b 100644
---- a/src/controller.cpp
-+++ b/src/controller.cpp
-@@ -109,18 +109,22 @@ Controller::Controller(QObject *parent)
- }
- #endif
-
-+#ifdef QUOTIENT_07
-+ connect(&Accounts, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
-+#else
- connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
-+#endif
-
- #ifdef QUOTIENT_07
- static int oldAccountCount = 0;
-- connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, [=]() {
-- if (AccountRegistry::instance().size() > oldAccountCount) {
-- auto connection = AccountRegistry::instance().accounts()[AccountRegistry::instance().size() - 1];
-+ connect(&Accounts, &AccountRegistry::accountCountChanged, this, [=]() {
-+ if (Accounts.size() > oldAccountCount) {
-+ auto connection = Accounts.accounts()[Accounts.size() - 1];
- connect(connection, &Connection::syncDone, this, [=]() {
- handleNotifications(connection);
- });
- }
-- oldAccountCount = AccountRegistry::instance().size();
-+ oldAccountCount = Accounts.size();
- });
- #endif
- }
-@@ -228,10 +232,18 @@ void Controller::logout(Connection *conn, bool serverSideLogout)
- job.start();
- loop.exec();
-
-+#ifdef QUOTIENT_07
-+ if (Accounts.count() > 1) {
-+#else
- if (AccountRegistry::instance().count() > 1) {
-+#endif
- // Only set the connection if the the account being logged out is currently active
- if (conn == activeConnection()) {
-+#ifdef QUOTIENT_07
-+ setActiveConnection(Accounts.accounts()[0]);
-+#else
- setActiveConnection(AccountRegistry::instance().accounts()[0]);
-+#endif
- }
- } else {
- setActiveConnection(nullptr);
-@@ -495,7 +507,11 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b
-
- int Controller::accountCount() const
- {
-+#ifdef QUOTIENT_07
-+ return Accounts.count();
-+#else
- return AccountRegistry::instance().count();
-+#endif
- }
-
- void Controller::setQuitOnLastWindowClosed()
-diff --git a/src/login.cpp b/src/login.cpp
-index 1121875f9..8b937abaa 100644
---- a/src/login.cpp
-+++ b/src/login.cpp
-@@ -43,7 +43,11 @@ void Login::init()
- return;
- }
-
-+#ifdef QUOTIENT_07
-+ m_isLoggedIn = Accounts.isLoggedIn(m_matrixId);
-+#else
- m_isLoggedIn = AccountRegistry::instance().isLoggedIn(m_matrixId);
-+#endif
- Q_EMIT isLoggedInChanged();
- if (m_isLoggedIn) {
- return;
---
-GitLab
-
diff --git a/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-2.patch b/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-2.patch
deleted file mode 100644
index 2bd85146b28f..000000000000
--- a/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8f4e5a41c58986b68406251051c26beb059dd9ce Mon Sep 17 00:00:00 2001
-From: Tobias Fella <fella@posteo.de>
-Date: Sun, 28 May 2023 11:22:40 +0200
-Subject: [PATCH] Drop reset*Count invocations
-
-Still coming from Spectral, where they were taken from Quaternion, where they were dropped because they don't work as expected.
-Also, soon to be removed from libQuotient itself.
----
- src/neochatroom.cpp | 10 ----------
- src/neochatroom.h | 1 -
- 2 files changed, 11 deletions(-)
-
-diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
-index a98b6cdbe..101c0fc50 100644
---- a/src/neochatroom.cpp
-+++ b/src/neochatroom.cpp
-@@ -66,8 +66,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
- : Room(connection, std::move(roomId), joinState)
- {
- connect(connection, &Connection::accountDataChanged, this, &NeoChatRoom::updatePushNotificationState);
-- connect(this, &NeoChatRoom::notificationCountChanged, this, &NeoChatRoom::countChanged);
-- connect(this, &NeoChatRoom::highlightCountChanged, this, &NeoChatRoom::countChanged);
- connect(this, &Room::fileTransferCompleted, this, [this] {
- setFileUploadingProgress(0);
- setHasFileUploading(false);
-@@ -410,14 +408,6 @@ void NeoChatRoom::onRedaction(const RoomEvent &prevEvent, const RoomEvent & /*af
- }
- }
-
--void NeoChatRoom::countChanged()
--{
-- if (displayed() && !hasUnreadMessages()) {
-- resetNotificationCount();
-- resetHighlightCount();
-- }
--}
--
- QDateTime NeoChatRoom::lastActiveTime()
- {
- if (timelineSize() == 0) {
-diff --git a/src/neochatroom.h b/src/neochatroom.h
-index d0795f383..6125cfa96 100644
---- a/src/neochatroom.h
-+++ b/src/neochatroom.h
-@@ -866,7 +866,6 @@ private:
- #endif
-
- private Q_SLOTS:
-- void countChanged();
- void updatePushNotificationState(QString type);
-
- void cacheLastEvent();
---
-GitLab
-
diff --git a/net-im/neochat/neochat-23.04.3-r1.ebuild b/net-im/neochat/neochat-23.04.3-r1.ebuild
deleted file mode 100644
index a76cc93cc5dc..000000000000
--- a/net-im/neochat/neochat-23.04.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Client for Matrix, the decentralized communication protocol"
-HOMEPAGE="https://apps.kde.org/neochat/"
-
-LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-DEPEND="
- app-text/cmark:=
- >=dev-libs/kirigami-addons-0.7.2:5
- dev-libs/qcoro5
- dev-libs/qtkeychain:=[qt5(+)]
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtmultimedia-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
- >=kde-frameworks/knotifications-${KFMIN}:5[qml]
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5[qml]
- media-libs/kquickimageeditor:5
- <net-libs/libquotient-0.8:=
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtmultimedia-${QTMIN}:5[qml]
- >=kde-frameworks/purpose-${KFMIN}:5
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-libquotient-0.8-{1,2}.patch )