gentoo auto-resync : 31:07:2023 - 16:45:16

4 files changed, 151 insertions, 1 deletions

diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index a6985905dd32..a196d5bd2701 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,5 +1,7 @@
+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.2.tar.xz 565584 BLAKE2B 7e72214d7bfdb0a30e767ce91116fae71f341c37ef7f830f071a7303e25e35107d2f8c481f05373a8493d06c94c34a4f2d88dc424f3143144e41d8418b9be671 SHA512 f02e1cee3f71211f6dbf319ce983002046af27d08a6a82a41678384f68e5f0602fb18b30cad925deae7f6a0b352e4000e497f800020a89d5331f85557c9abf06
 DIST neochat-23.04.3.tar.xz 570776 BLAKE2B 7d5a9d724ecefc6f64a18629b24c80ef16f1e650ef3e8ae793590c44865d057d6f2905c199337dccf53c551fb4e00a8322238060731e2a3433e5e9e146acef67 SHA512 9e453c3bab98a45fe1d1d7139b574ff25e6d7a78749b38966eec17fa67ff366eea955aa82cde0743135c8ac35ca218a761abced055743545db760d67849e3a96
 EBUILD neochat-23.04.2.ebuild 1469 BLAKE2B 1639bcb3895f97536c8c25e3b6784ff2165e8766f16a11c6b750210a7a0a3f56b7e94f7725d2943cd8dff258642d75249e32577558d92ad271ffd42451ee499b SHA512 255a85ad5bb5d73a4fb9b9cfa13e03e4379baec3b74c62ac0084704cfe8f6336102ad9ba972588aac996783f99f2553f2faecdd83dee2c495f63a02013da0473
-EBUILD neochat-23.04.3.ebuild 1472 BLAKE2B cbbfcc6e9c94ff5afefbbd93db9a045165a0952cfe71432bca66df93a97219a8402cf1d0997b68ea9c18ee4efbd106a4d3d10d2255686feef9d11de1a1178087 SHA512 4243ba43aef28855100b6fd7328d293a68a507c00d9a215d3b85b11480587fd095a73e1037bafa333f3f0c433f422f041e4db412315abb9258cce9b386f2afe6
+EBUILD neochat-23.04.3.ebuild 1532 BLAKE2B 971643303a7cbbbe127cbaed3466be8f97839a5b5ca50195d289f3abdc7b7f4a056a936210221cfa001d89005c83313d166eb328c71530bd8f912c2cd909f124 SHA512 afe92fd3d578c51185a1ecbcc4e2b2971af7682c2a6484c1d0c7d4b2dcd60f8af4b91a34189359a8bd57036f9a0073228e717ac73ca4cf19d2ca456c44b74d2f
 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
new file mode 100644
index 000000000000..9e4aaa3b19df
--- /dev/null
+++ b/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-1.patch
@@ -0,0 +1,91 @@
+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
new file mode 100644
index 000000000000..2bd85146b28f
--- /dev/null
+++ b/net-im/neochat/files/neochat-23.04.3-libquotient-0.8-2.patch
@@ -0,0 +1,55 @@
+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.ebuild b/net-im/neochat/neochat-23.04.3.ebuild
index 77b0c006b60c..09f09da36393 100644
--- a/net-im/neochat/neochat-23.04.3.ebuild
+++ b/net-im/neochat/neochat-23.04.3.ebuild
@@ -49,3 +49,5 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/purpose-${KFMIN}:5
 "
 BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-libquotient-0.8-{1,2}.patch )