git: 921530884fe6 - main - net-im/libquotient: update to 0.8.0, latest upstream

From: Adriaan de Groot <adridg_at_FreeBSD.org>
Date: Mon, 17 Jul 2023 14:39:46 UTC
The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=921530884fe6339528837c7e60a312fc5d9e1804

commit 921530884fe6339528837c7e60a312fc5d9e1804
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2023-07-04 19:48:18 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2023-07-17 14:39:44 +0000

    net-im/libquotient: update to 0.8.0, latest upstream
    
    Extensive release notes at
            https://github.com/quotient-im/libQuotient/releases/tag/0.8.0
---
 net-im/libquotient/Makefile                         | 21 +++++++++++++--------
 net-im/libquotient/distinfo                         |  6 +++---
 .../files/patch-lib_qt__connection__util.h          |  4 ++--
 net-im/libquotient/pkg-plist                        |  6 +++++-
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/net-im/libquotient/Makefile b/net-im/libquotient/Makefile
index 391de8c11914..b749b8c89d15 100644
--- a/net-im/libquotient/Makefile
+++ b/net-im/libquotient/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libquotient
-DISTVERSION=	0.7.1
-PORTREVISION=	2
+DISTVERSION=	0.8.0
 CATEGORIES=	net-im
 
 MAINTAINER=	adridg@FreeBSD.org
@@ -10,9 +9,10 @@ WWW=		https://github.com/quotient-im/libQuotient
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain@qt5
+LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain@qt5 \
+		libolm.so:security/olm
 
-USES=		cmake qt:5 tar:xz
+USES=		cmake compiler:c++20-lang qt:5 tar:xz
 USE_QT=		concurrent core gui multimedia network \
 		buildtools:build qmake:build testlib:build
 
@@ -22,12 +22,17 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	quotient-im
 GH_PROJECT=	libQuotient
 
-CMAKE_ARGS=	-DQuotient_INSTALL_TESTS=OFF
+CMAKE_OFF=	Quotient_INSTALL_TESTS
+CMAKE_ON=	Quotient_ENABLE_E2EE
+
+.include <bsd.port.options.mk>
 
 # Work around compiler bug, see pr: 272285
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
 USES+=		llvm
-CC=		${LLVM_PREFIX}/bin/clang
-CPP=		${LLVM_PREFIX}/bin/clang-cpp
-CXX=		${LLVM_PREFIX}/bin/clang++
+CC=		clang${LLVM_VERSION}
+CXX=		clang++${LLVM_VERSION}
+CPP=		clang-cpp${LLVM_VERSION}
+.endif
 
 .include <bsd.port.mk>
diff --git a/net-im/libquotient/distinfo b/net-im/libquotient/distinfo
index 44d79884ee12..0879ae4193f4 100644
--- a/net-im/libquotient/distinfo
+++ b/net-im/libquotient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674316637
-SHA256 (quotient-im-libQuotient-0.7.1_GH0.tar.gz) = 48b15c666528405219ff0be8f0f336405c64deb1719115af75ef099cb3f86555
-SIZE (quotient-im-libQuotient-0.7.1_GH0.tar.gz) = 667590
+TIMESTAMP = 1688499360
+SHA256 (quotient-im-libQuotient-0.8.0_GH0.tar.gz) = 40d84c2a1ed8c57605836dd175aabd069aed33c77b6bd841391631607b8c3a76
+SIZE (quotient-im-libQuotient-0.8.0_GH0.tar.gz) = 725645
diff --git a/net-im/libquotient/files/patch-lib_qt__connection__util.h b/net-im/libquotient/files/patch-lib_qt__connection__util.h
index a1ee6b2cbc57..0c4499ceca0e 100644
--- a/net-im/libquotient/files/patch-lib_qt__connection__util.h
+++ b/net-im/libquotient/files/patch-lib_qt__connection__util.h
@@ -27,8 +27,8 @@ In file included from /usr/include/c++/v1/__functional/bind_front.h:14:
 
 [1] https://pkg-status.freebsd.org/beefy2/data/124amd64-quarterly/8898bf465b47/logs/neochat-23.04.2.log
 
---- lib/qt_connection_util.h
-+++ lib/qt_connection_util.h
+--- Quotient/qt_connection_util.h
++++ Quotient/qt_connection_util.h
 @@ -3,6 +3,8 @@
  
  #pragma once
diff --git a/net-im/libquotient/pkg-plist b/net-im/libquotient/pkg-plist
index 69932899c66d..1d2f62c523c6 100644
--- a/net-im/libquotient/pkg-plist
+++ b/net-im/libquotient/pkg-plist
@@ -3,8 +3,10 @@ include/Quotient/application-service/definitions/location.h
 include/Quotient/application-service/definitions/protocol.h
 include/Quotient/application-service/definitions/user.h
 include/Quotient/avatar.h
+include/Quotient/connection_p.h
 include/Quotient/connection.h
 include/Quotient/connectiondata.h
+include/Quotient/connectionencryptiondata_p.h
 include/Quotient/converters.h
 include/Quotient/csapi/account-data.h
 include/Quotient/csapi/admin.h
@@ -47,6 +49,7 @@ include/Quotient/csapi/knocking.h
 include/Quotient/csapi/leaving.h
 include/Quotient/csapi/list_joined_rooms.h
 include/Quotient/csapi/list_public_rooms.h
+include/Quotient/csapi/login_token.h
 include/Quotient/csapi/login.h
 include/Quotient/csapi/logout.h
 include/Quotient/csapi/message_pagination.h
@@ -65,6 +68,7 @@ include/Quotient/csapi/registration.h
 include/Quotient/csapi/registration_tokens.h
 include/Quotient/csapi/relations.h
 include/Quotient/csapi/report_content.h
+include/Quotient/csapi/room_event_by_timestamp.h
 include/Quotient/csapi/room_send.h
 include/Quotient/csapi/room_state.h
 include/Quotient/csapi/room_upgrades.h
@@ -131,7 +135,7 @@ include/Quotient/jobs/mediathumbnailjob.h
 include/Quotient/jobs/requestdata.h
 include/Quotient/jobs/syncjob.h
 include/Quotient/keyverificationsession.h
-include/Quotient/logging.h
+include/Quotient/logging_categories_p.h
 include/Quotient/mxcreply.h
 include/Quotient/networkaccessmanager.h
 include/Quotient/networksettings.h