From nobody Sun Feb 11 07:22:05 2024 X-Original-To: dev-commits-ports-all@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 4TXfDF4pkLz59d8Q; Sun, 11 Feb 2024 07:22:05 +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 4TXfDF4KqKz4hS0; Sun, 11 Feb 2024 07:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707636125; 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=Jyp6uvTUXUm5xM6s+BufQgpow3GjrRIEfFwLZYY/+L4=; b=bA/N4P6QI5Y5SumYcHHAiA0JLOe3r3/8YtuTh6QjrMN3wYqTCwvdttYkPasXZXWFHhuJxx 3aTWWXz2X4SgyOPUZgK4LYOUl0n5WNqG9c/zxron6GMGxjIk3PEIp5IsT3mEI6+rhzbOK6 PLIUyMhNIN42T7ROwhxGiRcuIBq5TOIKGupClOz4SJ6ske0wssUWnWcvG39TVg0TsXygmc 3Kgxs5czU05lCWrOoX1aDcWPnHhNkn3Wy18andH5NfoVqWczEuFQzGjmEppwTqYNq3yFLG X63HmgVtfRIEBnC8/V2vKJ9qkifqVDkv9ksWGgpJQe+zUdix8ZgjbScHZdRacw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707636125; a=rsa-sha256; cv=none; b=KSyOgJI4GhbEiTwQu+7LYEf8iwDR3fpsCfDPJpUOt2oHvluQycBLcMCCH2cXK+W+ITguDq zTfr8BVWMpns9DIiNf2Wd6lukNbUsHB/fmn9mj04kC9/wWlyGetSMkGcHzbYzJAR6KDCGV rOAwZUvwELSsJwfWSiitA53xXS15HxO7p5a4aD5tsj+n6RJoYSFhArUL5jyxYchEBcRI20 xpr9XM8W18wJXrLyjjPdhChm2PoJoWbz8+pbwGdXpz5k1uLO6E+At3Vje+xn0o+gtTE8xt inKni74rQpPwfkOuCSyYVSIO/LeE5u2XZjLabIFpZqslksHUuORHoJ7U2PDhWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707636125; 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=Jyp6uvTUXUm5xM6s+BufQgpow3GjrRIEfFwLZYY/+L4=; b=M8wYGiXUxN0YtRLM02DJ2uWsUj3Ut5xorTgchASws9fVvczpRW21yGI/rcEY1UIks8ZMV4 a9sSWE6Rq6SY/FqDerbP5cOYWbHofbBQhNrNzZKPPTmazbHngj/23K8YI1hl4ThKzERU56 WD6oFC5i7MniXL0G88ubAhXWA+PmzLAYbNndEce5hClc9Jix4IqOltU1yi8nNeRSpq9GDi LjIFuFrsCZxN7JspQnAsquigbkpwr8monqsQ3wgLE8QmYlC+4bylRZPqcnjUbFpTZ0mo9/ URqkSYvKboWkZNZxY5G/a4dvhwHd4giVCeOXvfiUM8wrwiHal2jrNaKGoZZO2w== 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 4TXfDF3PdJzqpq; Sun, 11 Feb 2024 07:22:05 +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 41B7M5E0043091; Sun, 11 Feb 2024 07:22:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41B7M5M5043088; Sun, 11 Feb 2024 07:22:05 GMT (envelope-from git) Date: Sun, 11 Feb 2024 07:22:05 GMT Message-Id: <202402110722.41B7M5M5043088@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: cca8f3b4d4cc - main - net-im/qxmpp: Update to 1.6.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cca8f3b4d4cc0fdd50e515492bf26ea36a69b339 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=cca8f3b4d4cc0fdd50e515492bf26ea36a69b339 commit cca8f3b4d4cc0fdd50e515492bf26ea36a69b339 Author: Jason E. Hale AuthorDate: 2024-02-11 01:44:13 +0000 Commit: Jason E. Hale CommitDate: 2024-02-11 07:21:14 +0000 net-im/qxmpp: Update to 1.6.0 Update LICENSE - it's really LGPL21+ Remove wonderous use of USES=libtool alongside of USES=cmake. Still trying to figure out how that ever came to pass. Disable building of examples which we wern't installing anyways and make PLIST_SUB more readable. Add a TEST option to optionally build tests (previously on by default), which eliminates ~274 targets for normal builds, but still lets us check if everything is all hunky dory. --- net-im/qxmpp/Makefile | 36 ++++++++++++++++++++++++------------ net-im/qxmpp/distinfo | 6 +++--- net-im/qxmpp/pkg-plist | 7 +++++++ 3 files changed, 34 insertions(+), 15 deletions(-) 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,6 +1,6 @@ PORTNAME= qxmpp DISTVERSIONPREFIX= v -DISTVERSION= 1.5.6 +DISTVERSION= 1.6.0 CATEGORIES= net-im PKGNAMESUFFIX= -${FLAVOR} @@ -8,7 +8,7 @@ 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 @@ -16,21 +16,33 @@ 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 @@ -13,9 +13,11 @@ 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 @@ -35,6 +37,9 @@ 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 @@ -53,7 +58,9 @@ 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