From 6a90aa2883c681f4a9b6176ba3d3a2ca7bd850d7 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 2 Dec 2023 20:26:40 +0100 Subject: [PATCH] accessibility/libqaccessibilityclient: flavorize for Qt5 and Qt6 --- accessibility/kmag/Makefile | 3 ++- .../libqaccessibilityclient/Makefile | 20 ++++++++++++++----- .../{pkg-plist => pkg-plist.qt5} | 0 .../libqaccessibilityclient/pkg-plist.qt6 | 11 ++++++++++ x11-wm/kwinft/Makefile | 4 ++-- 5 files changed, 30 insertions(+), 8 deletions(-) rename accessibility/libqaccessibilityclient/{pkg-plist => pkg-plist.qt5} (100%) create mode 100644 accessibility/libqaccessibilityclient/pkg-plist.qt6 diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile index 9a822746cae26..a6dccda0cee80 100644 --- a/accessibility/kmag/Makefile +++ b/accessibility/kmag/Makefile @@ -1,5 +1,6 @@ PORTNAME= kmag DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= accessibility kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -9,7 +10,7 @@ WWW= https://www.kde.org/applications/utilities/kmag/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient +LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient@qt5 USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons \ diff --git a/accessibility/libqaccessibilityclient/Makefile b/accessibility/libqaccessibilityclient/Makefile index 6bbd6409fe44c..2b17a4d6b8b64 100644 --- a/accessibility/libqaccessibilityclient/Makefile +++ b/accessibility/libqaccessibilityclient/Makefile @@ -1,20 +1,30 @@ PORTNAME= libqaccessibilityclient DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= accessibility kde MASTER_SITES= KDE/stable/${PORTNAME}/ +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Helper to make writing accessibility tools easier WWW= https://api.kde.org/libqaccessibilityclient/html/index.html -LICENSE= LGPL21 LGPL3 -LICENSE_COMB= dual +LICENSE= LGPL21 LGPL3 +LICENSE_COMB= dual LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSES/LGPL-2.1-only.txt LICENSE_FILE_LGPL3= ${WRKSRC}/LICENSES/LGPL-3.0-only.txt -USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + +USES= cmake compiler:c++11-lang kde:${FLAVOR:S/qt//} \ + qt:${FLAVOR:S/qt//} tar:xz +CMAKE_ARGS= -DQT_MAJOR_VERSION=${FLAVOR:S/qt//} USE_KDE= ecm:build -USE_QT= core dbus gui widgets \ - buildtools:build qmake:build +USE_QT= ${_USE_QT_${FLAVOR}} +_USE_QT_qt5= core dbus gui widgets buildtools:build qmake:build +_USE_QT_qt6= base + +PLIST= ${.CURDIR}/pkg-plist.${FLAVOR} .include diff --git a/accessibility/libqaccessibilityclient/pkg-plist b/accessibility/libqaccessibilityclient/pkg-plist.qt5 similarity index 100% rename from accessibility/libqaccessibilityclient/pkg-plist rename to accessibility/libqaccessibilityclient/pkg-plist.qt5 diff --git a/accessibility/libqaccessibilityclient/pkg-plist.qt6 b/accessibility/libqaccessibilityclient/pkg-plist.qt6 new file mode 100644 index 0000000000000..53e9b7c9a75ea --- /dev/null +++ b/accessibility/libqaccessibilityclient/pkg-plist.qt6 @@ -0,0 +1,11 @@ +include/QAccessibilityClient6/qaccessibilityclient/accessibleobject.h +include/QAccessibilityClient6/qaccessibilityclient/libqaccessibilityclient-version.h +include/QAccessibilityClient6/qaccessibilityclient/qaccessibilityclient_export.h +include/QAccessibilityClient6/qaccessibilityclient/registry.h +lib/cmake/QAccessibilityClient6/QAccessibilityClient6Config.cmake +lib/cmake/QAccessibilityClient6/QAccessibilityClient6ConfigVersion.cmake +lib/cmake/QAccessibilityClient6/QAccessibilityClient6Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QAccessibilityClient6/QAccessibilityClient6Targets.cmake +lib/libqaccessibilityclient-qt6.so +lib/libqaccessibilityclient-qt6.so.0 +lib/libqaccessibilityclient-qt6.so.0.5.0 diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile index 41dbf3b41b0f6..cff034f191209 100644 --- a/x11-wm/kwinft/Makefile +++ b/x11-wm/kwinft/Makefile @@ -1,7 +1,7 @@ PORTNAME= kwinft DISTVERSIONPREFIX= ${PORTNAME}@ DISTVERSION= 5.27.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -55,7 +55,7 @@ DOCS_USE= KDE=doctools:build DOCS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5DocTools QA11Y_DESC= Accessibility (focus tracking) for Zoom effect -QA11Y_LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient +QA11Y_LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient@qt5 QA11Y_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_QAccessibilityClient post-patch: