diff --git a/graphics/wrapland/Makefile b/graphics/wrapland/Makefile index 5af682579ff2..0b0dd96edc9b 100644 --- a/graphics/wrapland/Makefile +++ b/graphics/wrapland/Makefile @@ -1,36 +1,32 @@ PORTNAME= wrapland -DISTVERSIONPREFIX= ${PORTNAME}@ -DISTVERSION= 0.527.0 +DISTVERSIONPREFIX= v +DISTVERSION= 0.600.0 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= d4d703bc4676.patch:-p1 # https://github.com/winft/wrapland/pull/92 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Qt/C++ library wrapping libwayland WWW= https://github.com/winft/wrapland LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ + microsoft-gsl>0:devel/microsoft-gsl \ wayland-protocols>=1.27:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland -TEST_DEPENDS= ${qt-testlib_PORT:T}>0:${qt-testlib_PORT} +RUN_DEPENDS= microsoft-gsl>0:devel/microsoft-gsl -USES= cmake:testing gl kde:5 pkgconfig qt:5 +USES= cmake:testing gl kde:6 pkgconfig qt:6 USE_GITHUB= yes USE_GL= egl USE_KDE= ecm:build USE_LDCONFIG= yes -USE_QT= qmake:build buildtools:build concurrent core gui +USE_QT= base GH_ACCOUNT= winft -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/@/-/} +LDFLAGS+= -Wl,--as-needed # GL, xkbcommon PLIST_SUB= VERSION=${PORTVERSION} -OPTIONS_DEFINE= DOXYGEN -OPTIONS_DEFAULT=DOXYGEN -OPTIONS_SUB= yes - -DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen -DOXYGEN_USE= QT=help:build -DOXYGEN_CMAKE_BOOL= BUILD_QCH - .include diff --git a/graphics/wrapland/distinfo b/graphics/wrapland/distinfo index b6c5a4dd94fd..0483cd981800 100644 --- a/graphics/wrapland/distinfo +++ b/graphics/wrapland/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1676636801 -SHA256 (winft-wrapland-wrapland@0.527.0_GH0.tar.gz) = 415bc8a51ca74cfb7324d3aca8b6240535febe5dae8326f5296a448305a77953 -SIZE (winft-wrapland-wrapland@0.527.0_GH0.tar.gz) = 571883 +TIMESTAMP = 1709033936 +SHA256 (winft-wrapland-v0.600.0_GH0.tar.gz) = 2a07b69b6489c2c83f75c346a3aeecf28cc79a7f5040ace467022f554290287e +SIZE (winft-wrapland-v0.600.0_GH0.tar.gz) = 562189 +SHA256 (d4d703bc4676.patch) = 5903679438ea0c792a8fba66258c79b9a7f353620279563fe56b565de4e75e70 +SIZE (d4d703bc4676.patch) = 1646 diff --git a/graphics/wrapland/pkg-plist b/graphics/wrapland/pkg-plist index 591834de1dbb..28bbee999f4d 100644 --- a/graphics/wrapland/pkg-plist +++ b/graphics/wrapland/pkg-plist @@ -1,152 +1,146 @@ include/Wrapland/Client/appmenu.h include/Wrapland/Client/blur.h include/Wrapland/Client/buffer.h include/Wrapland/Client/compositor.h include/Wrapland/Client/connection_thread.h include/Wrapland/Client/contrast.h include/Wrapland/Client/data_control_v1.h include/Wrapland/Client/datadevice.h include/Wrapland/Client/datadevicemanager.h include/Wrapland/Client/dataoffer.h include/Wrapland/Client/datasource.h include/Wrapland/Client/dpms.h include/Wrapland/Client/drm_lease_v1.h include/Wrapland/Client/event_queue.h include/Wrapland/Client/fakeinput.h include/Wrapland/Client/fullscreen_shell.h include/Wrapland/Client/idle.h include/Wrapland/Client/idle_notify_v1.h include/Wrapland/Client/idleinhibit.h include/Wrapland/Client/input_method_v2.h include/Wrapland/Client/keyboard.h include/Wrapland/Client/keyboard_shortcuts_inhibit.h include/Wrapland/Client/keystate.h include/Wrapland/Client/layer_shell_v1.h include/Wrapland/Client/linux_dmabuf_v1.h include/Wrapland/Client/output.h -include/Wrapland/Client/output_configuration_v1.h -include/Wrapland/Client/output_device_v1.h -include/Wrapland/Client/output_management_v1.h include/Wrapland/Client/plasma_activation_feedback.h include/Wrapland/Client/plasmashell.h include/Wrapland/Client/plasmavirtualdesktop.h include/Wrapland/Client/plasmawindowmanagement.h include/Wrapland/Client/plasmawindowmodel.h include/Wrapland/Client/pointer.h include/Wrapland/Client/pointerconstraints.h include/Wrapland/Client/pointergestures.h include/Wrapland/Client/presentation_time.h include/Wrapland/Client/primary_selection.h include/Wrapland/Client/region.h include/Wrapland/Client/registry.h include/Wrapland/Client/relativepointer.h include/Wrapland/Client/seat.h +include/Wrapland/Client/security_context_v1.h include/Wrapland/Client/server_decoration_palette.h include/Wrapland/Client/shadow.h include/Wrapland/Client/shell.h include/Wrapland/Client/shm_pool.h include/Wrapland/Client/slide.h include/Wrapland/Client/subcompositor.h include/Wrapland/Client/subsurface.h include/Wrapland/Client/surface.h include/Wrapland/Client/text_input_v2.h include/Wrapland/Client/text_input_v3.h include/Wrapland/Client/touch.h include/Wrapland/Client/viewporter.h include/Wrapland/Client/virtual_keyboard_v1.h include/Wrapland/Client/wlr_output_configuration_v1.h include/Wrapland/Client/wlr_output_manager_v1.h include/Wrapland/Client/wraplandclient_export.h include/Wrapland/Client/xdg_activation_v1.h include/Wrapland/Client/xdg_shell.h include/Wrapland/Client/xdg_shell_popup.h include/Wrapland/Client/xdg_shell_positioner.h include/Wrapland/Client/xdg_shell_toplevel.h include/Wrapland/Client/xdgdecoration.h include/Wrapland/Client/xdgforeign.h include/Wrapland/Client/xdgoutput.h include/Wrapland/Server/appmenu.h include/Wrapland/Server/blur.h include/Wrapland/Server/buffer.h include/Wrapland/Server/client.h include/Wrapland/Server/compositor.h include/Wrapland/Server/contrast.h include/Wrapland/Server/data_control_v1.h include/Wrapland/Server/data_device.h include/Wrapland/Server/data_device_manager.h include/Wrapland/Server/data_offer.h include/Wrapland/Server/data_source.h include/Wrapland/Server/display.h include/Wrapland/Server/dpms.h include/Wrapland/Server/drag_pool.h include/Wrapland/Server/drm_lease_v1.h include/Wrapland/Server/fake_input.h include/Wrapland/Server/filtered_display.h -include/Wrapland/Server/globals.h include/Wrapland/Server/idle_inhibit_v1.h include/Wrapland/Server/idle_notify_v1.h include/Wrapland/Server/input_method_v2.h include/Wrapland/Server/kde_idle.h include/Wrapland/Server/keyboard.h include/Wrapland/Server/keyboard_pool.h include/Wrapland/Server/keyboard_shortcuts_inhibit.h include/Wrapland/Server/keystate.h include/Wrapland/Server/layer_shell_v1.h include/Wrapland/Server/linux_dmabuf_v1.h include/Wrapland/Server/output.h -include/Wrapland/Server/output_changeset_v1.h -include/Wrapland/Server/output_configuration_v1.h -include/Wrapland/Server/output_device_v1.h -include/Wrapland/Server/output_management_v1.h +include/Wrapland/Server/output_manager.h include/Wrapland/Server/plasma_activation_feedback.h include/Wrapland/Server/plasma_shell.h include/Wrapland/Server/plasma_virtual_desktop.h include/Wrapland/Server/plasma_window.h include/Wrapland/Server/pointer.h include/Wrapland/Server/pointer_constraints_v1.h include/Wrapland/Server/pointer_gestures_v1.h include/Wrapland/Server/pointer_pool.h include/Wrapland/Server/presentation_time.h include/Wrapland/Server/primary_selection.h include/Wrapland/Server/region.h include/Wrapland/Server/relative_pointer_v1.h include/Wrapland/Server/seat.h +include/Wrapland/Server/security_context_v1.h include/Wrapland/Server/server_decoration_palette.h include/Wrapland/Server/shadow.h include/Wrapland/Server/slide.h include/Wrapland/Server/subcompositor.h include/Wrapland/Server/surface.h include/Wrapland/Server/text_input_pool.h include/Wrapland/Server/text_input_v2.h include/Wrapland/Server/text_input_v3.h include/Wrapland/Server/touch.h include/Wrapland/Server/touch_pool.h include/Wrapland/Server/viewporter.h include/Wrapland/Server/virtual_keyboard_v1.h include/Wrapland/Server/wl_output.h +include/Wrapland/Server/wlr_output_configuration_head_v1.h +include/Wrapland/Server/wlr_output_configuration_v1.h +include/Wrapland/Server/wlr_output_manager_v1.h include/Wrapland/Server/wraplandserver_export.h include/Wrapland/Server/xdg_activation_v1.h include/Wrapland/Server/xdg_decoration.h include/Wrapland/Server/xdg_foreign.h include/Wrapland/Server/xdg_output.h include/Wrapland/Server/xdg_shell.h include/Wrapland/Server/xdg_shell_popup.h include/Wrapland/Server/xdg_shell_positioner.h include/Wrapland/Server/xdg_shell_surface.h include/Wrapland/Server/xdg_shell_toplevel.h include/wrapland_version.h lib/cmake/Wrapland/WraplandConfig.cmake lib/cmake/Wrapland/WraplandConfigVersion.cmake -%%DOXYGEN%%lib/cmake/Wrapland/WraplandQchTargets.cmake lib/cmake/Wrapland/WraplandTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Wrapland/WraplandTargets.cmake lib/libWraplandClient.so lib/libWraplandClient.so.0 lib/libWraplandClient.so.%%VERSION%% lib/libWraplandServer.so lib/libWraplandServer.so.0 lib/libWraplandServer.so.%%VERSION%% -lib/libexec/org-kde-kf5-wrapland-testserver -%%DOXYGEN%%%%QT_DOCDIR%%/Wrapland.qch -%%DOXYGEN%%%%QT_DOCDIR%%/Wrapland.tags -share/qlogging-categories5/org_kde_wrapland.categories +share/qlogging-categories6/org_kde_wrapland.categories diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile index 46b09b6d86f2..71226b305399 100644 --- a/x11-wm/kwinft/Makefile +++ b/x11-wm/kwinft/Makefile @@ -1,76 +1,78 @@ PORTNAME= kwinft DISTVERSIONPREFIX= ${PORTNAME}@ DISTVERSION= 5.27.0 DISTVERSIONSUFFIX= -0-g6d47e3aeb PORTREVISION= 4 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland compositor and X11 window manager WWW= https://github.com/winft/theseus-ship LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN= fails to build with wrapland 0.600 + 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_GITHUB= 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 GH_ACCOUNT= winft GH_PROJECT= theseus-ship WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/@/-/} 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@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,${LINUXBASE}&,' \ ${WRKSRC}/debug/perf/ftrace_impl.cpp .include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" .include diff --git a/x11/disman/Makefile b/x11/disman/Makefile index fd0358e79983..a59e93016f1d 100644 --- a/x11/disman/Makefile +++ b/x11/disman/Makefile @@ -1,41 +1,43 @@ PORTNAME= disman DISTVERSIONPREFIX= ${PORTNAME}@ DISTVERSION= 0.527.0 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org COMMENT= Qt/C++ display management library WWW= https://github.com/winft/disman LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB +BROKEN= fails to build with wrapland 0.600 + TEST_DEPENDS= ${qt-testlib_PORT:T}>0:${qt-testlib_PORT} USES= cmake:testing kde:5 pathfix qt:5 USE_GITHUB= yes USE_KDE= ecm:build coreaddons USE_LDCONFIG= yes USE_QT= qmake:build buildtools:build core dbus gui GH_ACCOUNT= winft WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/@/-/} PLIST_SUB= VERSION=${PORTVERSION} OPTIONS_DEFINE= WAYLAND X11 OPTIONS_DEFAULT=WAYLAND X11 OPTIONS_SUB= yes WAYLAND_LIB_DEPENDS= libWraplandClient.so:graphics/wrapland WAYLAND_USE= KDE=wayland WAYLAND_CMAKE_BOOL_OFF= ${KF5Wayland Wrapland:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} X11_USES= xorg X11_USE= QT=x11extras XORG=xcb X11_CMAKE_BOOL_OFF= ${Qt5X11Extras XCB:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} post-patch: # Respect PREFIX for hwdata @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/backends/edid.cpp .include