git: d6c98104ff75 - 2024Q3 - x11-toolkits/qt6-declarative: Install Qt6QuickTools
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 01 Sep 2024 04:26:10 UTC
The branch 2024Q3 has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d6c98104ff752367f6d6e09a5acaf71f27e8f0a7
commit d6c98104ff752367f6d6e09a5acaf71f27e8f0a7
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-09-01 04:11:17 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
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 <tatsuki_makino_at_hotmail.com>
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 <bsd.port.options.mk>
.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