diff --git a/accessibility/kmag/Makefile b/accessibility/kmag/Makefile index 9a822746cae2..a6dccda0cee8 100644 --- a/accessibility/kmag/Makefile +++ b/accessibility/kmag/Makefile @@ -1,23 +1,24 @@ PORTNAME= kmag DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= accessibility kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE Screen magnifier 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 \ i18n kio service widgetsaddons xmlgui \ ecm:build USE_QT= concurrent core dbus gui network printsupport widgets xml \ buildtools:build qmake:build OPTIONS_DEFINE= DOCS .include diff --git a/accessibility/libqaccessibilityclient/Makefile b/accessibility/libqaccessibilityclient/Makefile index 6bbd6409fe44..2b17a4d6b8b6 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 000000000000..53e9b7c9a75e --- /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 41dbf3b41b0f..cff034f19120 100644 --- a/x11-wm/kwinft/Makefile +++ b/x11-wm/kwinft/Makefile @@ -1,72 +1,72 @@ PORTNAME= kwinft DISTVERSIONPREFIX= ${PORTNAME}@ DISTVERSION= 5.27.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland compositor and X11 window manager WWW= https://gitlab.com/kwinft/kwinft LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libwayland-server.so:graphics/wayland \ libWraplandServer.so:graphics/wrapland \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon \ libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-icccm.so:x11/xcb-util-wm TEST_DEPENDS= ${qt-testlib_PORT:T}>0:${qt-testlib_PORT} CONFLICTS_INSTALL= plasma5-kwin # bin/kwin_wayland USES= cmake:testing gl kde:5 pkgconfig python:run qt:5 shebangfix xorg USE_GITLAB= yes USE_GL= egl USE_KDE= ecm:build auth config configwidgets \ coreaddons crash dbusaddons decoration globalaccel i18n \ idletime kcmutils kdeclarative kio kscreenlocker newstuff \ notifications package plasma-framework service \ widgetsaddons windowsystem xmlgui USE_LDCONFIG= yes USE_QT= qmake:build buildtools:build core dbus declarative gui \ multimedia:run quickcontrols2:run widgets x11extras USE_XORG= pixman x11 xcb xi SHEBANG_FILES= effect/effects/*.py kconf_update/*.py kconf_update/*.pl PLIST_SUB= VERSION=${PORTVERSION} LDFLAGS+= -Wl,--as-needed # GL, ICE/SM/Xext, glib, intl, Qt5*, KF5* OPTIONS_DEFINE= BREEZE DOCS QA11Y OPTIONS_DEFAULT=BREEZE QA11Y BREEZE_DESC= Default window decoration plugin BREEZE_USE= KDE=breeze BREEZE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Breeze 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: # Convert nodes from linprocfs(5) to procfs(5) # XXX kwinft lacks https://invent.kde.org/plasma/kwin/-/commit/1bc7afe8aaa9 @${REINPLACE_CMD} -e '/proc/,+1s,/exe,/file,' \ ${WRKSRC}/base/wayland/filtered_display.cpp \ ${WRKSRC}/desktop/kde/service_utils.h # Generic nodes are not supported by procfs(5) @${REINPLACE_CMD} -e '/mounts/s,/proc,/compat/linux&,' \ ${WRKSRC}/debug/perf/ftrace_impl.cpp .include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" .include