From nobody Mon Jul 17 14:39:46 2023 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 4R4Pqk4WhFz4mtkT; Mon, 17 Jul 2023 14:39:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Pqk40m5z3Jdj; Mon, 17 Jul 2023 14:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689604786; 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=uF8kfBmub8VQ/Uhy1B79gH6MX44FsZK9JdmA0eUCyAY=; b=kiyO9YaHRRI/nMbzH3iTnE/AIvQ9FfAvahZt0kherd0aoc6dDs+di7LD7bWpAoFleWqURZ XdA+gFh7bVZrM6uGUnsAcLtbtPu8q50usJiNUu4m/6zdQKZr2sPar12i5e0SNusO2aeSHq nGynqgnzRSSONVYvsURvLJe2ft+l73ZyOOfHK5Za7UM7F9GLBGi0O43s28IfipJPH4D5Ik m23wFbkC15kBu1hKox4r0BuDxZ3mV0Y+FfBeL3nF7Fsu4ODWO2FFTXauTS7HqWE0w8NQoZ 2ReBxuzADcgVbIxwnF15S3IEeboUqkXuGwdaq0y0DjVAr9nC8H5twkNbOYhIzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689604786; 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=uF8kfBmub8VQ/Uhy1B79gH6MX44FsZK9JdmA0eUCyAY=; b=F5jNRiTO7Myj5L7JolTrVu1dilP/EEmpcdaUhP+B6BGvzveCHHvNE8a1YHX2ldSj2d6p/T yyGbrlE45jNT4cUJ1dPXZxm56bx7zD/my2Mp/agql8pVtkB82mw7Gfv9+2mBQvmL1njVN0 u+2ah2avfhd8X1l3VKdqv1wy8zzGX2vvR3/4EShmmnYsZHJ0InNpcasqQPf+EEzlNgNQ6+ WFHZxoWjBXQUVObGV2sPnuG2cHxuHco/AKFXIIDBw5OrSUynKX09By5y8tCKjf1n2uKN0S zgbqJhoNO9L/8iXPPT8U01jDTrfdAU8HeGHwgfAhYTSLOy0ikGyQSCLXujBv4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689604786; a=rsa-sha256; cv=none; b=Wz2x1Do7a67cY8HxbCmTKCMMY5g6Egf63oPjQSFnaY2gooZsW9VFX1vxvs+BRWL7Ny5YHK mujhOEpU1SjY5uNxqOvjKEZ+n7MwBijtPbACPK/S6gOsjso6EAwnPDR9FwumbWcd2odJ0C tpigGqrGTieNzY6wj1X2EiJq3q3etOeBQYru4UClfiMuwUe+ake1pmiiQJdwVozE7EAfFx +v0ZcsG2UL/wiDXiaYkatdQNrFOwbW7D37nb8KJSGy4agSMCtO7lWf9JrnnB6UOnWSjB+3 r9ef9r4bht8zciDDWD4XkJtml7KTWzPjKCwtRy5kSKUiV1z7U5ztDk+1gQUB5w== 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 4R4Pqk2Sq9zSFc; Mon, 17 Jul 2023 14:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HEdkUA063988; Mon, 17 Jul 2023 14:39:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HEdkn3063987; Mon, 17 Jul 2023 14:39:46 GMT (envelope-from git) Date: Mon, 17 Jul 2023 14:39:46 GMT Message-Id: <202307171439.36HEdkn3063987@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: 921530884fe6 - main - net-im/libquotient: update to 0.8.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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 921530884fe6339528837c7e60a312fc5d9e1804 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=921530884fe6339528837c7e60a312fc5d9e1804 commit 921530884fe6339528837c7e60a312fc5d9e1804 Author: Adriaan de Groot AuthorDate: 2023-07-04 19:48:18 +0000 Commit: Adriaan de Groot 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 # 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 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