From nobody Sun Sep 01 04:26:10 2024 X-Original-To: dev-commits-ports-branches@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 4WxJjZ4MHyz5MlkV; Sun, 01 Sep 2024 04:26:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WxJjZ3pmRz4VMb; Sun, 1 Sep 2024 04:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725164770; 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=1xkJ3eFZT/YoS+ADD3dvFHEHGzxFH2T5jc/Qh9UkvX0=; b=M7wnr1tKlL4e3cVN95ZkE940QxZzt2rUhv5Jtp1X52n343BPWsDolcklZhaAc60pvBXvLQ ZMvpo2D3ITlIifykBv97LiDsyVyQgJbp7Pf0FVVWH51gmIYwc98vOTwaoYgkltVuBMXPf2 rjn2M11AWOon959ycDbvgg9l+GbNrKms+ufjFz23anhqKEpVK+dgnaO4hjDrkfbwMQKNWR mhkvhQAxAvzrooXszMVm8sfWtd70swIMpqlW7h8v01zy9VGNUGuiiYvxfksyK1k+nPpRsf 4rUD0xqBohnMflO9g3MsvTtAFl6hWFQMq2HJp90NfQLlVDbKNXl2eORZ7D8SQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725164770; a=rsa-sha256; cv=none; b=NSJ/ALlcP1+6jE/ui2p9EXj1fAxmuen675XAM3qA46V08JLlR1KSwgb6gn4uSEhi+I/KuV IOoH6tg6VIACdEAuswI5GRFoD9+lOqyPR3S6P+WPtjmeMAccTwgZjvbJyO8AwlDrrRhU2M JJsC0e/62/OTH+EXuJlLkNs1tkZBEDf5PENQEAa5UjVGjs/QPDH5s6s8Eu99fLB9LCc5gt L7gEEuh6GehJz7v1m7clrcy8oXb/7Hnm8BI1+C1GqLhAraqQFtdGvjCGU2kehYIgDM2U2v MAF6O42hfOeGJ+QlnIw/AIMLuwMFJK2+5EuPKayEUENaGpt8oMfK+x/WKrsFkQ== 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=1725164770; 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=1xkJ3eFZT/YoS+ADD3dvFHEHGzxFH2T5jc/Qh9UkvX0=; b=gohZAhCCwFEh0IRuQwuGvujhK2U2vgdwG9BheESxvKjM0scw8E6dYvrvgI4aRKkb15oTER HLqey1oxfpUD6DSUL0R3VTLQ9dqqsyz1WlRUVQNz52FxaKgCkBPqm+OaKlY95VbcKTIjBN Lc9v66MkBMIMlGJo6UuUNROKTWPKgZ0AG7fp/asnhrUQQYTyfvno4m+aQvHFe5I3GjK2tT szLi7Kcmu+R/nXeIKIxQ13KeKKwTVe7/jjyWG9bTjr/ninVST2rSY0qFe0dvh8OE7kRqaV bauY0oKsZCQPLdSTfP77oc/J9mhGsXxrbg5Jqwgo7Z1/XEOU8l8E80aQJ67Yww== 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 4WxJjZ3QkZz1Cc9; Sun, 1 Sep 2024 04:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4814QAju016291; Sun, 1 Sep 2024 04:26:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4814QAVg016288; Sun, 1 Sep 2024 04:26:10 GMT (envelope-from git) Date: Sun, 1 Sep 2024 04:26:10 GMT Message-Id: <202409010426.4814QAVg016288@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: d6c98104ff75 - 2024Q3 - x11-toolkits/qt6-declarative: Install Qt6QuickTools List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: d6c98104ff752367f6d6e09a5acaf71f27e8f0a7 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6c98104ff752367f6d6e09a5acaf71f27e8f0a7 commit d6c98104ff752367f6d6e09a5acaf71f27e8f0a7 Author: Jason E. Hale AuthorDate: 2024-09-01 04:11:17 +0000 Commit: Jason E. Hale CommitDate: 2024-09-01 04:26:00 +0000 x11-toolkits/qt6-declarative: Install Qt6QuickTools This fixes pkg-plist issues for users that build on live systems if graphics/qt6-svg is already installed. While here, fix configure if sysutils/lttng-ust is installed. https://lists.freebsd.org/archives/freebsd-ports/2024-August/006545.html Reported by: Tatsuki Makino MFH: 2024Q3 (cherry picked from commit cfbc15422947713828103f2b59471167a2777107) --- x11-toolkits/qt6-declarative/Makefile | 5 ++++- x11-toolkits/qt6-declarative/pkg-plist | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/x11-toolkits/qt6-declarative/Makefile b/x11-toolkits/qt6-declarative/Makefile index 68ed3fab9c77..26aad8cafc0c 100644 --- a/x11-toolkits/qt6-declarative/Makefile +++ b/x11-toolkits/qt6-declarative/Makefile @@ -1,5 +1,6 @@ PORTNAME= declarative DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- @@ -12,9 +13,11 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig python \ qt-dist:6 USE_GL= opengl -USE_QT= base languageserver shadertools:build +USE_QT= base languageserver shadertools:build svg USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} +CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_LTTngUST + .include .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marmv?} || ${ARCH} == i386 diff --git a/x11-toolkits/qt6-declarative/pkg-plist b/x11-toolkits/qt6-declarative/pkg-plist index 0864b85e1a74..a89a57abc80e 100644 --- a/x11-toolkits/qt6-declarative/pkg-plist +++ b/x11-toolkits/qt6-declarative/pkg-plist @@ -2065,6 +2065,14 @@ lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateDependencies.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateTargets.cmake lib/cmake/Qt6QuickTestUtilsPrivate/Qt6QuickTestUtilsPrivateVersionlessTargets.cmake +lib/cmake/Qt6QuickTools/Qt6QuickToolsAdditionalTargetInfo.cmake +lib/cmake/Qt6QuickTools/Qt6QuickToolsConfig.cmake +lib/cmake/Qt6QuickTools/Qt6QuickToolsConfigVersion.cmake +lib/cmake/Qt6QuickTools/Qt6QuickToolsConfigVersionImpl.cmake +lib/cmake/Qt6QuickTools/Qt6QuickToolsDependencies.cmake +lib/cmake/Qt6QuickTools/Qt6QuickToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6QuickTools/Qt6QuickToolsTargets.cmake +lib/cmake/Qt6QuickTools/Qt6QuickToolsVersionlessTargets.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsConfig.cmake lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsConfigVersion.cmake @@ -2086,6 +2094,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake %%QT_BINDIR%%/qmltc %%QT_BINDIR%%/qmltestrunner %%QT_BINDIR%%/qmltime +%%QT_BINDIR%%/svgtoqml %%QT_LIBDIR%%/libQt6LabsAnimation.prl %%QT_LIBDIR%%/libQt6LabsAnimation.so %%QT_LIBDIR%%/libQt6LabsAnimation.so.6