net-im/qxmpp: Update to 1.7.0

Add the GSTREAMER option to enable audio/video support over Jingle. Non-
default locally FTTB as this is a non-default upstream option and I'm not
entirely sure if it would make a difference in qxmpp's singular consumer
net-im/kaidan. Input from kaidan users to kde@ would be appreciated in
this regard.

Fix up my screwy implementation the TEST option, especially for the qt5
flavor in cca8f3b4d4cc0fdd50e515492bf26ea36a69b339. Most normal users
don't run the regression tests and the rest problably already have
devel/qt5-testlib installed anyways, but it was still very wrong.

https://github.com/qxmpp-project/qxmpp/releases/tag/v1.7.0

3 files changed, 28 insertions, 9 deletions

diff --git a/net-im/qxmpp/Makefile b/net-im/qxmpp/Makefile
index 75c2e0cf4864..c466530ecde4 100644
--- a/net-im/qxmpp/Makefile
+++ b/net-im/qxmpp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qxmpp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.0
+DISTVERSION=	1.7.0
 CATEGORIES=	net-im
 PKGNAMESUFFIX=	-${FLAVOR}
 
@@ -20,6 +20,7 @@ USES=		cmake compiler:c++17-lang pathfix pkgconfig qca \
 		qt:${QT_VER}
 USE_GITHUB=	yes
 GH_ACCOUNT=	qxmpp-project
+USE_LDCONFIG=	yes
 _USE_QT_qt5=	core network xml \
 		buildtools:build qmake:build
 _USE_QT_qt6=	base
@@ -37,11 +38,18 @@ PLIST_SUB=	VERSION=${PORTVERSION} \
 
 QT_VER=		${FLAVOR:S/qt//}
 
-OPTIONS_DEFINE=	TEST
+OPTIONS_DEFINE=		GSTREAMER TEST
+OPTIONS_SUB=		yes
 
-_TEST_USE_QT_qt5=	testlib:build
+GSTREAMER_DESC=		Audio/video support over Jingle via GStreamer
+GSTREAMER_USES=		gnome gstreamer
+GSTREAMER_USE=		GNOME=glib20 \
+			GSTREAMER=good,ugly
+GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
+
+_TEST_USE_QT_qt5=	QT=testlib:build
 _TEST_USE_QT_qt6=	# empty
-TEST_USE_QT=		${_FLAVOR_USE_QT_${FLAVOR}}
+TEST_USE=		${_TEST_USE_QT_${FLAVOR}}
 TEST_CMAKE_BOOL=	BUILD_TESTS
 TEST_TEST_TARGET=	test
 
diff --git a/net-im/qxmpp/distinfo b/net-im/qxmpp/distinfo
index fca9c30aef06..655b1cce9367 100644
--- a/net-im/qxmpp/distinfo
+++ b/net-im/qxmpp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707602726
-SHA256 (qxmpp-project-qxmpp-v1.6.0_GH0.tar.gz) = af19b8644ff92f3b38d3e75b89ce4632501c102f17f32b09d7dcde0b27e1c16e
-SIZE (qxmpp-project-qxmpp-v1.6.0_GH0.tar.gz) = 645985
+TIMESTAMP = 1717127752
+SHA256 (qxmpp-project-qxmpp-v1.7.0_GH0.tar.gz) = 92f23238bc68d0f135a810454729c5da34312ebe2ae8f4bf9d303d2c3cde5e7d
+SIZE (qxmpp-project-qxmpp-v1.7.0_GH0.tar.gz) = 688019
diff --git a/net-im/qxmpp/pkg-plist b/net-im/qxmpp/pkg-plist
index bd22915e52a7..bdd10b2b9f22 100644
--- a/net-im/qxmpp/pkg-plist
+++ b/net-im/qxmpp/pkg-plist
@@ -8,6 +8,8 @@ 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%%/QXmppAuthenticationError.h
+include/QXmppQt%%QT_VER%%/QXmppBindError.h
 include/QXmppQt%%QT_VER%%/QXmppBindIq.h
 include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryContentId.h
 include/QXmppQt%%QT_VER%%/QXmppBitsOfBinaryData.h
@@ -17,7 +19,10 @@ include/QXmppQt%%QT_VER%%/QXmppBlockingManager.h
 include/QXmppQt%%QT_VER%%/QXmppBookmarkManager.h
 include/QXmppQt%%QT_VER%%/QXmppBookmarkSet.h
 include/QXmppQt%%QT_VER%%/QXmppByteStreamIq.h
+%%GSTREAMER%%include/QXmppQt%%QT_VER%%/QXmppCall.h
 include/QXmppQt%%QT_VER%%/QXmppCallInviteManager.h
+%%GSTREAMER%%include/QXmppQt%%QT_VER%%/QXmppCallManager.h
+%%GSTREAMER%%include/QXmppQt%%QT_VER%%/QXmppCallStream.h
 include/QXmppQt%%QT_VER%%/QXmppCarbonManager.h
 include/QXmppQt%%QT_VER%%/QXmppCarbonManagerV2.h
 include/QXmppQt%%QT_VER%%/QXmppClient.h
@@ -40,6 +45,7 @@ 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%%/QXmppFallback.h
 include/QXmppQt%%QT_VER%%/QXmppFileMetadata.h
 include/QXmppQt%%QT_VER%%/QXmppFileShare.h
 include/QXmppQt%%QT_VER%%/QXmppFileSharingManager.h
@@ -68,9 +74,12 @@ 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%%/QXmppMixConfigItem.h
 include/QXmppQt%%QT_VER%%/QXmppMixInfoItem.h
 include/QXmppQt%%QT_VER%%/QXmppMixInvitation.h
 include/QXmppQt%%QT_VER%%/QXmppMixIq.h
+include/QXmppQt%%QT_VER%%/QXmppMixIq_p.h
+include/QXmppQt%%QT_VER%%/QXmppMixManager.h
 include/QXmppQt%%QT_VER%%/QXmppMixParticipantItem.h
 include/QXmppQt%%QT_VER%%/QXmppMucIq.h
 include/QXmppQt%%QT_VER%%/QXmppMucManager.h
@@ -106,6 +115,7 @@ 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%%/QXmppSasl2UserAgent.h
 include/QXmppQt%%QT_VER%%/QXmppSendResult.h
 include/QXmppQt%%QT_VER%%/QXmppSendStanzaParams.h
 include/QXmppQt%%QT_VER%%/QXmppServer.h
@@ -116,6 +126,7 @@ 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%%/QXmppStreamError.h
 include/QXmppQt%%QT_VER%%/QXmppStreamFeatures.h
 include/QXmppQt%%QT_VER%%/QXmppStun.h
 include/QXmppQt%%QT_VER%%/QXmppTask.h
@@ -151,10 +162,10 @@ 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.5
 lib/libQXmppOmemoQt%%QT_VER%%.so.%%VERSION%%
 lib/libQXmppQt%%QT_VER%%.so
-lib/libQXmppQt%%QT_VER%%.so.4
+lib/libQXmppQt%%QT_VER%%.so.5
 lib/libQXmppQt%%QT_VER%%.so.%%VERSION%%
 libdata/pkgconfig/QXmppQt%%QT_VER%%.pc
 %%QT5_ONLY%%libdata/pkgconfig/qxmpp.pc