From nobody Mon Oct 28 23:08:51 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xcpwg4mLzz5btw4; Mon, 28 Oct 2024 23:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xcpwg4CRSz585b; Mon, 28 Oct 2024 23:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730156931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CteOCxJ87iPyKysJ1YblCdxqV4NrwTkvYw38mi9T28s=; b=yTfcUpQW6Mm8geSP3iTz/ms8Rl2z9oceO/3RnrS7hiXCqUvrNSFrA2y87WQ4zNCFB8d6Nm k1fzmnqwQNxxyLTzK1aLBtXbZyzJdfYiSIjKzGsViIhbdATjww6QJ8Js6VES4L3mNrZq7a TGCCoEGjpquYDidTgKMW0ERRMdVEEWhbpXykddPSH7+eM+LaezR6VNaznyrCc4hMwGIovv RslrXEtCBxZ/Guhczux8C2RbfCPMPpCpRNm+ES6qwLYtkzr53MGel/9Hi6fdN51oGE6OcH AFYqnWIHdnx+xfqatTIUQX8eU0EJK1lkm64lwMkk4LPguzoQtxs4Jojb1kqLpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730156931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CteOCxJ87iPyKysJ1YblCdxqV4NrwTkvYw38mi9T28s=; b=aGESvvktj4IwMe2we9jZ82J/thT/+RhlClTM7FrwbwXMhj1lB7ACfiXv8dXUP4sl+EBIzT FTiwDgUfnzQCtk9S0skvpEAS9Z2kyRg4lR7wE8LrJaYYs7U5cemdMGY/Ss6JCZAEc91b48 BoRxuCT/EGA3BYCg5Cx1fODsqyAm3F3QfA1E5nziAF6ZhGIJHUSns0eLxiG0hCsq9o4dh6 sF4DFcjMMyEWzDbJR3NPiTPiUKZbVNTPhbMZkPiV5tbM7LWjocgihaGWPjxasFyL26pb3M L/EvM0g7kI5WOWTo8g7fkH/vG+DteymFsAr3QvHQwyRXY95aKQW/9oo7V7GI8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730156931; a=rsa-sha256; cv=none; b=Dz5i2WhXg+FOxM5F26KZPmRM2rX648USHIRrxOzILhLa+pQZE/Eu75bLbaZYxI99ww4yHt H3IIo7OXXQnD2B0nT49zlURUMT5t834PLpBin/zCxhCuBy+aclumY3dRobi9m0/hftIY7v t50rT8PGr8NCIuLZySE2Lq1jlNwGvp6e4Rju2LU0MtXBWGzAm8n1Xz/E/vLPi197uE9bed lfShhI+JaT6HxY9i71aBPQjFCu5GZRWv7sEYUKRpsk8IK7LAU4q7a+vAHD/UeRWL3fm005 Id+J25h910VD2+IacgAYIqJ22k1z7EHhEc+EmP008Vib9NIrpvqLL4Q3wEHyVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xcpwg3hCNzxyr; Mon, 28 Oct 2024 23:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49SN8pqU025852; Mon, 28 Oct 2024 23:08:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49SN8pnV025849; Mon, 28 Oct 2024 23:08:51 GMT (envelope-from git) Date: Mon, 28 Oct 2024 23:08:51 GMT Message-Id: <202410282308.49SN8pnV025849@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: bdf47fea8cca - main - net-im/nheko: update to 0.12.0, latest upstream List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdf47fea8ccaa3304ec82cf8cf7242d1e5390610 Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=bdf47fea8ccaa3304ec82cf8cf7242d1e5390610 commit bdf47fea8ccaa3304ec82cf8cf7242d1e5390610 Author: Adriaan de Groot AuthorDate: 2024-10-28 23:05:51 +0000 Commit: Adriaan de Groot CommitDate: 2024-10-28 23:08:49 +0000 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 | 3 +- net-im/mtxclient/distinfo | 6 +- net-im/mtxclient/pkg-plist | 6 +- net-im/nheko/Makefile | 21 +++---- net-im/nheko/distinfo | 6 +- net-im/nheko/files/patch-libfmt | 71 ---------------------- .../nheko/files/patch-src_notifications_Manager.h | 12 ---- 7 files changed, 22 insertions(+), 103 deletions(-) diff --git a/net-im/mtxclient/Makefile b/net-im/mtxclient/Makefile index 31046da6deb9..1b09030c42c7 100644 --- a/net-im/mtxclient/Makefile +++ b/net-im/mtxclient/Makefile @@ -1,7 +1,6 @@ PORTNAME= mtxclient DISTVERSIONPREFIX= v -DISTVERSION= 0.9.2 -PORTREVISION= 5 +DISTVERSION= 0.10.0 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org diff --git a/net-im/mtxclient/distinfo b/net-im/mtxclient/distinfo index d0fdd65aaf6a..65b7c8601815 100644 --- a/net-im/mtxclient/distinfo +++ b/net-im/mtxclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677275035 -SHA256 (Nheko-Reborn-mtxclient-v0.9.2_GH0.tar.gz) = f55827fdba226c6fc409cf000c72b13cc6d069ec1300283a7239aa19c90c5f56 -SIZE (Nheko-Reborn-mtxclient-v0.9.2_GH0.tar.gz) = 623481 +TIMESTAMP = 1729973255 +SHA256 (Nheko-Reborn-mtxclient-v0.10.0_GH0.tar.gz) = 9502e0a999d2873172d50bb80371c061266126c7d4db8e44447eb70c977b0230 +SIZE (Nheko-Reborn-mtxclient-v0.10.0_GH0.tar.gz) = 633765 diff --git a/net-im/mtxclient/pkg-plist b/net-im/mtxclient/pkg-plist index 5bbad974dc2f..1a7f4d4f42fa 100644 --- a/net-im/mtxclient/pkg-plist +++ b/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 diff --git a/net-im/nheko/Makefile b/net-im/nheko/Makefile index 0dda2990472b..d0588df2b23f 100644 --- a/net-im/nheko/Makefile +++ b/net-im/nheko/Makefile @@ -1,7 +1,6 @@ PORTNAME= nheko DISTVERSIONPREFIX= v -DISTVERSION= 0.11.3 -PORTREVISION= 5 +DISTVERSION= 0.12.0 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 \ - libspdlog.so:devel/spdlog + libqt6keychain.so:security/qtkeychain@qt6 -USES= cmake compiler:c++17-lang desktop-file-utils \ - localbase:ldflags pkgconfig qt:5 ssl tar:xz -USE_QT= concurrent core dbus declarative gui multimedia network \ - quickcontrols2 svg widgets \ - graphicaleffects:run \ - buildtools:build linguist:build qmake:build +USES= cmake compiler:c++20-lang desktop-file-utils \ + localbase:ldflags pkgconfig qt:6 ssl tar:xz +USE_QT= base declarative multimedia \ + svg \ + tools:build translations: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++ diff --git a/net-im/nheko/distinfo b/net-im/nheko/distinfo index e1696c765077..23d8f39f196c 100644 --- a/net-im/nheko/distinfo +++ b/net-im/nheko/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1678131554 -SHA256 (Nheko-Reborn-nheko-v0.11.3_GH0.tar.gz) = f285156884a3a0c6870f3fba89c13d1fd70c8727bd179d8310b13819f8a63a37 -SIZE (Nheko-Reborn-nheko-v0.11.3_GH0.tar.gz) = 1780179 +TIMESTAMP = 1729969462 +SHA256 (Nheko-Reborn-nheko-v0.12.0_GH0.tar.gz) = a3a7578bd9386a0b9a4188fa1296fdddb7df0f846c39728b80a998f9d06f36d1 +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 diff --git a/net-im/nheko/files/patch-libfmt b/net-im/nheko/files/patch-libfmt deleted file mode 100644 index 3b6e5fe2c0aa..000000000000 --- a/net-im/nheko/files/patch-libfmt +++ /dev/null @@ -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(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()); - 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(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 so - this, - [mediaPlayer](QMediaPlayer::Error error) { - nhlog::ui()->debug("Media player error {} and errorStr {}", -- error, -+ static_cast(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(status), static_cast(mediaPlayer->error())); - }); - connect(mediaPlayer, - qOverload(&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(&MxcMediaProxy::error), - [this](QMediaPlayer::Error error) { - nhlog::ui()->info("Media player error {} and errorStr {}", -- error, -+ static_cast(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(status), static_cast(this->error())); - }); - connect(this, - qOverload(&MxcMediaProxy::metaDataChanged), diff --git a/net-im/nheko/files/patch-src_notifications_Manager.h b/net-im/nheko/files/patch-src_notifications_Manager.h deleted file mode 100644 index fcb2b875f358..000000000000 --- a/net-im/nheko/files/patch-src_notifications_Manager.h +++ /dev/null @@ -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;