net-im/nheko: update to 0.12.0, latest upstream

Also update dependency library net-im/mtxclient, of
which nheko is the only consumer.

Release notes at
	https://nheko.im/nheko-reborn/nheko/-/tags/v0.12.0
Which is a long list. Major build change is using Qt6.

net-im/mtxclient/Makefile

@@ -1,7 +1,6 @@
 PORTNAME=		mtxclient
 DISTVERSIONPREFIX=	v
-DISTVERSION=		0.9.2
+DISTVERSION=		0.10.0
-PORTREVISION=	5
 CATEGORIES=		net-im
 
 MAINTAINER=	adridg@FreeBSD.org

net-im/mtxclient/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1677275035
+TIMESTAMP = 1729973255
-SHA256 (Nheko-Reborn-mtxclient-v0.9.2_GH0.tar.gz) = f55827fdba226c6fc409cf000c72b13cc6d069ec1300283a7239aa19c90c5f56
+SHA256 (Nheko-Reborn-mtxclient-v0.10.0_GH0.tar.gz) = 9502e0a999d2873172d50bb80371c061266126c7d4db8e44447eb70c977b0230
-SIZE (Nheko-Reborn-mtxclient-v0.9.2_GH0.tar.gz) = 623481
+SIZE (Nheko-Reborn-mtxclient-v0.10.0_GH0.tar.gz) = 633765

net-im/mtxclient/pkg-plist

@@ -4,6 +4,7 @@ include/mtx/errors.hpp
 include/mtx/events.hpp
 include/mtx/events/account_data/direct.hpp
 include/mtx/events/account_data/fully_read.hpp
+include/mtx/events/account_data/ignored_users.hpp
 include/mtx/events/aliases.hpp
 include/mtx/events/avatar.hpp
 include/mtx/events/canonical_alias.hpp
@@ -20,16 +21,18 @@ include/mtx/events/history_visibility.hpp
 include/mtx/events/join_rules.hpp
 include/mtx/events/member.hpp
 include/mtx/events/messages/audio.hpp
-include/mtx/events/messages/confetti.hpp
+include/mtx/events/messages/elementeffect.hpp
 include/mtx/events/messages/emote.hpp
 include/mtx/events/messages/file.hpp
 include/mtx/events/messages/image.hpp
 include/mtx/events/messages/location.hpp
 include/mtx/events/messages/notice.hpp
 include/mtx/events/messages/text.hpp
+include/mtx/events/messages/unknown.hpp
 include/mtx/events/messages/video.hpp
 include/mtx/events/mscs/image_packs.hpp
 include/mtx/events/name.hpp
+include/mtx/events/nheko_extensions/event_expiry.hpp
 include/mtx/events/nheko_extensions/hidden_events.hpp
 include/mtx/events/pinned_events.hpp
 include/mtx/events/policy_rules.hpp
@@ -37,6 +40,7 @@ include/mtx/events/power_levels.hpp
 include/mtx/events/presence.hpp
 include/mtx/events/reaction.hpp
 include/mtx/events/redaction.hpp
+include/mtx/events/server_acl.hpp
 include/mtx/events/spaces.hpp
 include/mtx/events/tag.hpp
 include/mtx/events/tombstone.hpp

net-im/nheko/Makefile

@@ -1,7 +1,6 @@
 PORTNAME=	nheko
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.11.3
+DISTVERSION=	0.12.0
-PORTREVISION=	5
 CATEGORIES=	net-im
 
 MAINTAINER=	adridg@FreeBSD.org
@@ -18,19 +17,19 @@ BUILD_DEPENDS=	nlohmann-json>=3:devel/nlohmann-json \
 LIB_DEPENDS=	\
 		libcmark.so:textproc/cmark \
 		libcoeurl.so:ftp/coeurl \
+		libkdsingleapplication-qt6.so:devel/kdsingleapplication \
 		libfmt.so:devel/libfmt \
+		libspdlog.so:devel/spdlog \
 		liblmdb.so:databases/lmdb \
 		libmatrix_client.so:net-im/mtxclient \
 		libolm.so:security/olm \
-		libqt5keychain.so:security/qtkeychain@qt5 \
+		libqt6keychain.so:security/qtkeychain@qt6
-		libspdlog.so:devel/spdlog
 
-USES=		cmake compiler:c++17-lang desktop-file-utils \
+USES=		cmake compiler:c++20-lang desktop-file-utils \
-		localbase:ldflags pkgconfig qt:5 ssl tar:xz
+		localbase:ldflags pkgconfig qt:6 ssl tar:xz
-USE_QT=		concurrent core dbus declarative gui multimedia network \
+USE_QT=		base declarative multimedia \
-		quickcontrols2 svg widgets \
+		svg \
-		graphicaleffects:run \
+		tools:build translations:build
-		buildtools:build linguist:build qmake:build
 
 OPTIONS_DEFINE=	VOIP
 OPTIONS_DEFAULT=
@@ -38,7 +37,7 @@ OPTIONS_DEFAULT=
 VOIP_DESC=	Enable VOIP calls (experimental)
 VOIP_CMAKE_BOOL=	VOIP
 VOIP_USES=	gstreamer gettext-runtime xorg gnome
-VOIP_USE=	gstreamer=bad,dtls,srtp xorg=xcb gnome=glib20
+VOIP_USE=	gstreamer=bad,dtls,srtp,webrtc xorg=xcb gnome=glib20
 VOIP_LIB_DEPENDS=	libnice.so:net-im/libnice
 
 # There is one external dependency: lmdb++

net-im/nheko/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1678131554
+TIMESTAMP = 1729969462
-SHA256 (Nheko-Reborn-nheko-v0.11.3_GH0.tar.gz) = f285156884a3a0c6870f3fba89c13d1fd70c8727bd179d8310b13819f8a63a37
+SHA256 (Nheko-Reborn-nheko-v0.12.0_GH0.tar.gz) = a3a7578bd9386a0b9a4188fa1296fdddb7df0f846c39728b80a998f9d06f36d1
-SIZE (Nheko-Reborn-nheko-v0.11.3_GH0.tar.gz) = 1780179
+SIZE (Nheko-Reborn-nheko-v0.12.0_GH0.tar.gz) = 2094339
 SHA256 (hoytech-lmdbxx-029fb681213af3020f5e3a86045445552bd024c5_GH0.tar.gz) = f1d048d7ec720667a3ea091ed44f06eb79171e77d646a59dac45b9e5ff75f33b
 SIZE (hoytech-lmdbxx-029fb681213af3020f5e3a86045445552bd024c5_GH0.tar.gz) = 52468

net-im/nheko/files/patch-libfmt

@@ -1,71 +0,0 @@
-Obtained from:	https://nheko.im/nheko-reborn/nheko/-/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0
-		https://nheko.im/nheko-reborn/nheko/-/commit/871e403f6799df48cfbbe08eba56d473a0c34216
-
---- src/Cache.cpp.orig	2023-02-22 23:50:45 UTC
-+++ src/Cache.cpp
-@@ -438,7 +438,7 @@ Cache::loadSecretsFromStore(
-                 if (job->error() && job->error() != QKeychain::Error::EntryNotFound) {
-                     nhlog::db()->error("Restoring secret '{}' failed ({}): {}",
-                                        name.toStdString(),
--                                       job->error(),
-+                                       static_cast<int>(job->error()),
-                                        job->errorString().toStdString());
- 
-                     fatalSecretError();
---- src/ChatPage.cpp.orig	2023-02-22 23:50:45 UTC
-+++ src/ChatPage.cpp
-@@ -1248,7 +1248,7 @@ ChatPage::getBackupVersion()
-                       nhlog::crypto()->info("Our backup key {} does not match the one "
-                                             "used in the online backup {}",
-                                             pubkey,
--                                            auth_data["public_key"]);
-+                                            auth_data["public_key"].get<std::string>());
-                       cache::client()->deleteBackupVersion();
-                       return;
-                   }
---- src/encryption/DeviceVerificationFlow.cpp.orig	2023-02-22 23:50:45 UTC
-+++ src/encryption/DeviceVerificationFlow.cpp
-@@ -39,7 +39,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject
-   , deviceIds(std::move(deviceIds_))
-   , model_(model)
- {
--    nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", flow_type, (void *)this);
-+    nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", static_cast<int>(flow_type), (void *)this);
-     if (deviceIds.size() == 1)
-         deviceId = deviceIds.front();
- 
---- src/timeline/InputBar.cpp.orig	2023-02-22 23:50:45 UTC
-+++ src/timeline/InputBar.cpp
-@@ -948,14 +948,14 @@ MediaUpload::MediaUpload(std::unique_ptr<QIODevice> so
-                 this,
-                 [mediaPlayer](QMediaPlayer::Error error) {
-                     nhlog::ui()->debug("Media player error {} and errorStr {}",
--                                       error,
-+                                       static_cast<int>(error),
-                                        mediaPlayer->errorString().toStdString());
-                 });
-         connect(mediaPlayer,
-                 &QMediaPlayer::mediaStatusChanged,
-                 [mediaPlayer](QMediaPlayer::MediaStatus status) {
-                     nhlog::ui()->debug(
--                      "Media player status {} and error {}", status, mediaPlayer->error());
-+                      "Media player status {} and error {}", static_cast<int>(status), static_cast<int>(mediaPlayer->error()));
-                 });
-         connect(mediaPlayer,
-                 qOverload<const QString &, const QVariant &>(&QMediaPlayer::metaDataChanged),
---- src/ui/MxcMediaProxy.cpp.orig	2023-02-22 23:50:45 UTC
-+++ src/ui/MxcMediaProxy.cpp
-@@ -37,11 +37,11 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent)
-             qOverload<QMediaPlayer::Error>(&MxcMediaProxy::error),
-             [this](QMediaPlayer::Error error) {
-                 nhlog::ui()->info("Media player error {} and errorStr {}",
--                                  error,
-+                                  static_cast<int>(error),
-                                   this->errorString().toStdString());
-             });
-     connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) {
--        nhlog::ui()->info("Media player status {} and error {}", status, this->error());
-+        nhlog::ui()->info("Media player status {} and error {}", static_cast<int>(status), static_cast<int>(this->error()));
-     });
-     connect(this,
-             qOverload<const QString &, const QVariant &>(&MxcMediaProxy::metaDataChanged),

net-im/nheko/files/patch-src_notifications_Manager.h

@@ -1,12 +0,0 @@
---- src/notifications/Manager.h.orig	2023-02-24 22:16:17 UTC
-+++ src/notifications/Manager.h
-@@ -55,9 +55,7 @@ public slots:
- #if defined(NHEKO_DBUS_SYS)
- public:
-     void closeNotifications(QString roomId);
--#if defined(Q_OS_LINUX)
-     void closeAllNotifications();
--#endif
- 
- private:
-     QDBusInterface dbus;