From 54d0ccbac3b6fbd01dcd252ea006d4e9e62f8e6e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Dec 2023 01:53:29 +0000 Subject: gentoo auto-resync : 20:12:2023 - 01:53:29 --- net-im/Manifest.gz | Bin 9389 -> 9389 bytes net-im/neochat/Manifest | 4 - .../files/neochat-23.04.3-libquotient-0.8-1.patch | 91 --------------------- .../files/neochat-23.04.3-libquotient-0.8-2.patch | 55 ------------- net-im/neochat/neochat-23.04.3-r1.ebuild | 53 ------------ net-im/tokodon/Manifest | 2 - net-im/tokodon/tokodon-23.04.3.ebuild | 43 ---------- 7 files changed, 248 deletions(-) delete mode 100644 net-im/neochat/files/neochat-23.04.3-libquotient-0.8-1.patch delete mode 100644 net-im/neochat/files/neochat-23.04.3-libquotient-0.8-2.patch delete mode 100644 net-im/neochat/neochat-23.04.3-r1.ebuild delete mode 100644 net-im/tokodon/tokodon-23.04.3.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index 099420e4ad52..3cb303ac2be3 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest index fc4ee8742cdd..c8c37af8b6f4 100644 --- a/net-im/neochat/Manifest +++ b/net-im/neochat/Manifest @@ -1,9 +1,5 @@ -AUX neochat-23.04.3-libquotient-0.8-1.patch 3020 BLAKE2B 771182badd477921021536bee9b288939f582f4a6f8de42a3bc1758554095c3acf70044aec77966af60e0fb531fda926e69d9432a474973dceb641c8c0317486 SHA512 d45e039402830ac06574008c43286b01f33c0330e7e5d7e839752e35b58fbf274593faa2df8e33cbfccc2775db0f52613bc8ee24e591a486e4f45ba9c9692c28 -AUX neochat-23.04.3-libquotient-0.8-2.patch 1869 BLAKE2B 65494927c84aef3883ebd24181519fe78d7c6781fa90b3f412982d809d67cb59d41d66a50fadf07e8b3c232bcfbc7884d8ee07d3bf0880a97d19a38d0a36c0b9 SHA512 9b155483cb61552bdf8d91ddf3fab64016a4001bcf610d374b8c4dba7f9262c790a59871abe3c0b1a607d99eb662cc3a46d626242da3c52b067255fa44cba113 -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 -EBUILD neochat-23.04.3-r1.ebuild 1528 BLAKE2B f5b54f63db8ca6409d598b9d9141eea27fb23880c56391ea7caf9c4341b6906b145a1ed891bf95bba70e0fdb31e7fee280362c4b2864fff5edc72b7f0e556ba9 SHA512 802ea8378aa1f91c778f0df8570b87186b78781b2c1a7e46eaec3ac3815ebf543bdd45787cc08f6e4692148740628bad795052e517e19b2c4772fdd904108241 EBUILD neochat-23.08.3-r2.ebuild 1602 BLAKE2B 8276bb5c96b9acb0c1252bd8f94a7748dd43e1c3094b2743841f8413c1de25cc60deaf1ae10880be7c437eca544c50dbd93cf36c8859d08a0947774b64a0a791 SHA512 73ab67aaa37be38ba67d78d5477f96758ab7c0be7f7d0f234f95436bd94f7a0f521719e0414f592c4ac367b549f25dd925cc2f18a1a4b32f6a90f3159a7c8f06 EBUILD neochat-23.08.4.ebuild 1605 BLAKE2B 73339c95fc0c98c584bd4796fc0224ee4a7f74d6c2559b54d12b9106274a59ece610ed3ed959225e26148ff34cb5effbaaa714f9bfcfea30a0afd4ca9ecd29c8 SHA512 87666e061af9b487a3d748bdb2dd7e253aa53d7647a5f260020578333da2361a8e58c5f46db94a4bee4c3035f13e3e610abd258fff61e9f6a15263587b6ba7a2 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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 -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 -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 -