diff --git a/net-im/qxmpp/Makefile b/net-im/qxmpp/Makefile index 359a1f7fd082..75c2e0cf4864 100644 --- a/net-im/qxmpp/Makefile +++ b/net-im/qxmpp/Makefile @@ -1,36 +1,48 @@ PORTNAME= qxmpp DISTVERSIONPREFIX= v -DISTVERSION= 1.5.6 +DISTVERSION= 1.6.0 CATEGORIES= net-im PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= XMPP client library based on Qt and C++ WWW= https://github.com/qxmpp-project/qxmpp/ -LICENSE= LGPL21 +LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt LIB_DEPENDS= libomemo-c.so:security/libomemo-c FLAVORS= qt5 qt6 FLAVOR?= qt5 -USES= cmake compiler:c++17-lang libtool pathfix pkgconfig qca qt:${FLAVOR:S/qt//} +USES= cmake compiler:c++17-lang pathfix pkgconfig qca \ + qt:${QT_VER} USE_GITHUB= yes GH_ACCOUNT= qxmpp-project +_USE_QT_qt5= core network xml \ + buildtools:build qmake:build +_USE_QT_qt6= base USE_QT= ${_USE_QT_${FLAVOR}} -CMAKE_ARGS= -DQT_VERSION_MAJOR=${FLAVOR:S/qt//} -CMAKE_ON= BUILD_OMEMO -_USE_QT_qt5= core gui network xml \ - buildtools:build qmake:build testlib:build -_USE_QT_qt6= base +CMAKE_ARGS= -DQT_VERSION_MAJOR=${QT_VER} +CMAKE_ON= BUILD_OMEMO +CMAKE_OFF= BUILD_EXAMPLES -_PLIST_QT5_qt5= -_PLIST_QT5_qt6= "@comment " +_PLIST_SUB_qt5= QT5_ONLY="" +_PLIST_SUB_qt6= QT5_ONLY="@comment " PLIST_SUB= VERSION=${PORTVERSION} \ - QT_VER=${FLAVOR:S/qt//} \ - QT5_ONLY=${_PLIST_QT5_${FLAVOR}} + QT_VER=${QT_VER} \ + ${_PLIST_SUB_${FLAVOR}} + +QT_VER= ${FLAVOR:S/qt//} + +OPTIONS_DEFINE= TEST + +_TEST_USE_QT_qt5= testlib:build +_TEST_USE_QT_qt6= # empty +TEST_USE_QT= ${_FLAVOR_USE_QT_${FLAVOR}} +TEST_CMAKE_BOOL= BUILD_TESTS +TEST_TEST_TARGET= test .include diff --git a/net-im/qxmpp/distinfo b/net-im/qxmpp/distinfo index 8ee22b82af1c..fca9c30aef06 100644 --- a/net-im/qxmpp/distinfo +++ b/net-im/qxmpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707144125 -SHA256 (qxmpp-project-qxmpp-v1.5.6_GH0.tar.gz) = 5af37cfbe878284e12babf4cd5f07109198e7e3dd3f1f78dc3eef351b6614a48 -SIZE (qxmpp-project-qxmpp-v1.5.6_GH0.tar.gz) = 607830 +TIMESTAMP = 1707602726 +SHA256 (qxmpp-project-qxmpp-v1.6.0_GH0.tar.gz) = af19b8644ff92f3b38d3e75b89ce4632501c102f17f32b09d7dcde0b27e1c16e +SIZE (qxmpp-project-qxmpp-v1.6.0_GH0.tar.gz) = 645985 diff --git a/net-im/qxmpp/pkg-plist b/net-im/qxmpp/pkg-plist index 391ba268980f..bd22915e52a7 100644 --- a/net-im/qxmpp/pkg-plist +++ b/net-im/qxmpp/pkg-plist @@ -1,153 +1,160 @@ include/QXmppQt%%QT_VER%%/Omemo/QXmppOmemoManager.h include/QXmppQt%%QT_VER%%/Omemo/QXmppOmemoMemoryStorage.h include/QXmppQt%%QT_VER%%/Omemo/QXmppOmemoStorage.h include/QXmppQt%%QT_VER%%/Omemo/qxmppomemo_export.h include/QXmppQt%%QT_VER%%/QXmppArchiveIq.h include/QXmppQt%%QT_VER%%/QXmppArchiveManager.h include/QXmppQt%%QT_VER%%/QXmppAtmManager.h include/QXmppQt%%QT_VER%%/QXmppAtmTrustMemoryStorage.h include/QXmppQt%%QT_VER%%/QXmppAtmTrustStorage.h include/QXmppQt%%QT_VER%%/QXmppAttentionManager.h include/QXmppQt%%QT_VER%%/QXmppBindIq.h include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryContentId.h include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryData.h include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryDataList.h include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryIq.h +include/QXmppQt%%QT_VER%%/QXmppBlockingManager.h include/QXmppQt%%QT_VER%%/QXmppBookmarkManager.h include/QXmppQt%%QT_VER%%/QXmppBookmarkSet.h include/QXmppQt%%QT_VER%%/QXmppByteStreamIq.h +include/QXmppQt%%QT_VER%%/QXmppCallInviteManager.h include/QXmppQt%%QT_VER%%/QXmppCarbonManager.h include/QXmppQt%%QT_VER%%/QXmppCarbonManagerV2.h include/QXmppQt%%QT_VER%%/QXmppClient.h include/QXmppQt%%QT_VER%%/QXmppClientExtension.h include/QXmppQt%%QT_VER%%/QXmppConfiguration.h include/QXmppQt%%QT_VER%%/QXmppDataForm.h include/QXmppQt%%QT_VER%%/QXmppDataFormBase.h include/QXmppQt%%QT_VER%%/QXmppDialback.h include/QXmppQt%%QT_VER%%/QXmppDiscoveryIq.h include/QXmppQt%%QT_VER%%/QXmppDiscoveryManager.h include/QXmppQt%%QT_VER%%/QXmppE2eeExtension.h include/QXmppQt%%QT_VER%%/QXmppE2eeMetadata.h include/QXmppQt%%QT_VER%%/QXmppElement.h include/QXmppQt%%QT_VER%%/QXmppEncryptedFileSharingProvider.h include/QXmppQt%%QT_VER%%/QXmppEncryptedFileSource.h include/QXmppQt%%QT_VER%%/QXmppEntityTimeIq.h include/QXmppQt%%QT_VER%%/QXmppEntityTimeManager.h include/QXmppQt%%QT_VER%%/QXmppError.h include/QXmppQt%%QT_VER%%/QXmppExtension.h +include/QXmppQt%%QT_VER%%/QXmppExternalService.h +include/QXmppQt%%QT_VER%%/QXmppExternalServiceDiscoveryIq.h +include/QXmppQt%%QT_VER%%/QXmppExternalServiceDiscoveryManager.h include/QXmppQt%%QT_VER%%/QXmppFileMetadata.h include/QXmppQt%%QT_VER%%/QXmppFileShare.h include/QXmppQt%%QT_VER%%/QXmppFileSharingManager.h include/QXmppQt%%QT_VER%%/QXmppFileSharingProvider.h include/QXmppQt%%QT_VER%%/QXmppFutureUtils_p.h include/QXmppQt%%QT_VER%%/QXmppGeolocItem.h include/QXmppQt%%QT_VER%%/QXmppGlobal.h include/QXmppQt%%QT_VER%%/QXmppHash.h include/QXmppQt%%QT_VER%%/QXmppHttpFileSharingProvider.h include/QXmppQt%%QT_VER%%/QXmppHttpFileSource.h include/QXmppQt%%QT_VER%%/QXmppHttpUploadIq.h include/QXmppQt%%QT_VER%%/QXmppHttpUploadManager.h include/QXmppQt%%QT_VER%%/QXmppIbbIq.h include/QXmppQt%%QT_VER%%/QXmppIncomingClient.h include/QXmppQt%%QT_VER%%/QXmppIncomingServer.h include/QXmppQt%%QT_VER%%/QXmppInvokable.h include/QXmppQt%%QT_VER%%/QXmppIq.h include/QXmppQt%%QT_VER%%/QXmppIqHandling.h +include/QXmppQt%%QT_VER%%/QXmppJingleData.h include/QXmppQt%%QT_VER%%/QXmppJingleIq.h +include/QXmppQt%%QT_VER%%/QXmppJingleMessageInitiationManager.h include/QXmppQt%%QT_VER%%/QXmppLogger.h include/QXmppQt%%QT_VER%%/QXmppMamIq.h include/QXmppQt%%QT_VER%%/QXmppMamManager.h include/QXmppQt%%QT_VER%%/QXmppMessage.h include/QXmppQt%%QT_VER%%/QXmppMessageHandler.h include/QXmppQt%%QT_VER%%/QXmppMessageReaction.h include/QXmppQt%%QT_VER%%/QXmppMessageReceiptManager.h include/QXmppQt%%QT_VER%%/QXmppMixInfoItem.h include/QXmppQt%%QT_VER%%/QXmppMixInvitation.h include/QXmppQt%%QT_VER%%/QXmppMixIq.h include/QXmppQt%%QT_VER%%/QXmppMixParticipantItem.h include/QXmppQt%%QT_VER%%/QXmppMucIq.h include/QXmppQt%%QT_VER%%/QXmppMucManager.h include/QXmppQt%%QT_VER%%/QXmppNonSASLAuth.h include/QXmppQt%%QT_VER%%/QXmppNonza.h include/QXmppQt%%QT_VER%%/QXmppOutOfBandUrl.h include/QXmppQt%%QT_VER%%/QXmppOutgoingClient.h include/QXmppQt%%QT_VER%%/QXmppOutgoingServer.h include/QXmppQt%%QT_VER%%/QXmppPasswordChecker.h include/QXmppQt%%QT_VER%%/QXmppPingIq.h include/QXmppQt%%QT_VER%%/QXmppPresence.h include/QXmppQt%%QT_VER%%/QXmppPromise.h include/QXmppQt%%QT_VER%%/QXmppPubSubAffiliation.h include/QXmppQt%%QT_VER%%/QXmppPubSubBaseItem.h include/QXmppQt%%QT_VER%%/QXmppPubSubEvent.h include/QXmppQt%%QT_VER%%/QXmppPubSubEventHandler.h include/QXmppQt%%QT_VER%%/QXmppPubSubIq.h include/QXmppQt%%QT_VER%%/QXmppPubSubIq_p.h include/QXmppQt%%QT_VER%%/QXmppPubSubItem.h include/QXmppQt%%QT_VER%%/QXmppPubSubManager.h include/QXmppQt%%QT_VER%%/QXmppPubSubMetadata.h include/QXmppQt%%QT_VER%%/QXmppPubSubNodeConfig.h include/QXmppQt%%QT_VER%%/QXmppPubSubPublishOptions.h include/QXmppQt%%QT_VER%%/QXmppPubSubSubAuthorization.h include/QXmppQt%%QT_VER%%/QXmppPubSubSubscribeOptions.cpp include/QXmppQt%%QT_VER%%/QXmppPubSubSubscription.h include/QXmppQt%%QT_VER%%/QXmppPushEnableIq.h include/QXmppQt%%QT_VER%%/QXmppRegisterIq.h include/QXmppQt%%QT_VER%%/QXmppRegistrationManager.h include/QXmppQt%%QT_VER%%/QXmppRemoteMethod.h include/QXmppQt%%QT_VER%%/QXmppResultSet.h include/QXmppQt%%QT_VER%%/QXmppRosterIq.h include/QXmppQt%%QT_VER%%/QXmppRosterManager.h include/QXmppQt%%QT_VER%%/QXmppRpcIq.h include/QXmppQt%%QT_VER%%/QXmppRpcManager.h include/QXmppQt%%QT_VER%%/QXmppSendResult.h include/QXmppQt%%QT_VER%%/QXmppSendStanzaParams.h include/QXmppQt%%QT_VER%%/QXmppServer.h include/QXmppQt%%QT_VER%%/QXmppServerExtension.h include/QXmppQt%%QT_VER%%/QXmppServerPlugin.h include/QXmppQt%%QT_VER%%/QXmppSessionIq.h include/QXmppQt%%QT_VER%%/QXmppSocks.h include/QXmppQt%%QT_VER%%/QXmppStanza.h include/QXmppQt%%QT_VER%%/QXmppStartTlsPacket.h include/QXmppQt%%QT_VER%%/QXmppStream.h include/QXmppQt%%QT_VER%%/QXmppStreamFeatures.h include/QXmppQt%%QT_VER%%/QXmppStun.h include/QXmppQt%%QT_VER%%/QXmppTask.h include/QXmppQt%%QT_VER%%/QXmppThumbnail.h include/QXmppQt%%QT_VER%%/QXmppTransferManager.h include/QXmppQt%%QT_VER%%/QXmppTransferManager_p.h include/QXmppQt%%QT_VER%%/QXmppTrustLevel.h include/QXmppQt%%QT_VER%%/QXmppTrustManager.h include/QXmppQt%%QT_VER%%/QXmppTrustMemoryStorage.h include/QXmppQt%%QT_VER%%/QXmppTrustMessageElement.h include/QXmppQt%%QT_VER%%/QXmppTrustMessageKeyOwner.h include/QXmppQt%%QT_VER%%/QXmppTrustMessages.h include/QXmppQt%%QT_VER%%/QXmppTrustSecurityPolicy.h include/QXmppQt%%QT_VER%%/QXmppTrustStorage.h include/QXmppQt%%QT_VER%%/QXmppUploadRequestManager.h include/QXmppQt%%QT_VER%%/QXmppUserLocationManager.h include/QXmppQt%%QT_VER%%/QXmppUserTuneItem.h include/QXmppQt%%QT_VER%%/QXmppUserTuneManager.h include/QXmppQt%%QT_VER%%/QXmppUtils.h include/QXmppQt%%QT_VER%%/QXmppVCardIq.h include/QXmppQt%%QT_VER%%/QXmppVCardManager.h include/QXmppQt%%QT_VER%%/QXmppVersionIq.h include/QXmppQt%%QT_VER%%/QXmppVersionManager.h include/QXmppQt%%QT_VER%%/qxmpp_export.h %%QT5_ONLY%%lib/cmake/QXmpp/QXmppConfig.cmake %%QT5_ONLY%%lib/cmake/QXmpp/QXmppConfigVersion.cmake lib/cmake/QXmppOmemoQt%%QT_VER%%/QXmppOmemo-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/QXmppOmemoQt%%QT_VER%%/QXmppOmemo.cmake lib/cmake/QXmppOmemoQt%%QT_VER%%/QXmppOmemoQt%%QT_VER%%Config.cmake lib/cmake/QXmppOmemoQt%%QT_VER%%/QXmppOmemoQt%%QT_VER%%ConfigVersion.cmake lib/cmake/QXmppQt%%QT_VER%%/QXmpp-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/QXmppQt%%QT_VER%%/QXmpp.cmake lib/cmake/QXmppQt%%QT_VER%%/QXmppQt%%QT_VER%%Config.cmake lib/cmake/QXmppQt%%QT_VER%%/QXmppQt%%QT_VER%%ConfigVersion.cmake lib/libQXmppOmemoQt%%QT_VER%%.so lib/libQXmppOmemoQt%%QT_VER%%.so.4 lib/libQXmppOmemoQt%%QT_VER%%.so.%%VERSION%% lib/libQXmppQt%%QT_VER%%.so lib/libQXmppQt%%QT_VER%%.so.4 lib/libQXmppQt%%QT_VER%%.so.%%VERSION%% libdata/pkgconfig/QXmppQt%%QT_VER%%.pc %%QT5_ONLY%%libdata/pkgconfig/qxmpp.pc