diff --git a/x11-wm/wayfire-plugins-extra/Makefile b/x11-wm/wayfire-plugins-extra/Makefile index c14b4017334d..0ed8af9a5d9e 100644 --- a/x11-wm/wayfire-plugins-extra/Makefile +++ b/x11-wm/wayfire-plugins-extra/Makefile @@ -1,45 +1,47 @@ PORTNAME= wayfire-plugins-extra DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= cc4d177de89f.patch:-p1 # https://github.com/WayfireWM/wayfire-plugins-extra/pull/206 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Additional plugins for Wayfire WWW= https://wayfire.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-scanner:graphics/wayland \ wayland-protocols>0:graphics/wayland-protocols \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= libwf-config.so:devel/wf-config \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes USE_GITLAB= nodefault USE_GNOME= cairo glibmm GH_ACCOUNT= WayfireWM GH_TUPLE= timgott:wayfire-shadows:de32395:wayfire_shadows/subprojects/wayfire-shadows GL_TUPLE= wayfireplugins:focus-request:bc41d54:focus_request/subprojects/focus-request \ wayfireplugins:windecor:f609ac0:windecor/subprojects/windecor MESON_ARGS= -Denable_focus_request=true -Denable_wayfire_shadows=true OPTIONS_DEFINE= LIBRSVG2 OPTIONS_DEFAULT=LIBRSVG2 OPTIONS_SUB= yes LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_MESON_TRUE= enable_windecor post-patch: # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/subprojects/windecor/deco-icontheme.cpp -.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" .include diff --git a/x11-wm/wayfire-plugins-extra/distinfo b/x11-wm/wayfire-plugins-extra/distinfo index 2599c41d5c75..67cbf74f32cf 100644 --- a/x11-wm/wayfire-plugins-extra/distinfo +++ b/x11-wm/wayfire-plugins-extra/distinfo @@ -1,9 +1,11 @@ TIMESTAMP = 1696671377 SHA256 (WayfireWM-wayfire-plugins-extra-v0.8.0_GH0.tar.gz) = 6871f19c79dc9d9c965229f958da79eebbc7ff54ebc8ba0b97c514aaaf36cd3b SIZE (WayfireWM-wayfire-plugins-extra-v0.8.0_GH0.tar.gz) = 45089 SHA256 (timgott-wayfire-shadows-de32395_GH0.tar.gz) = 2d6f0c4fc8524d2b4a926955d3f6856c090d08d37b8908979039e6e1291779c8 SIZE (timgott-wayfire-shadows-de32395_GH0.tar.gz) = 11260 SHA256 (focus-request-bc41d54.tar.bz2) = da114547ed0b3ccca593d44e4a01f6d86a45ff284e15610e8e465696e9446da9 SIZE (focus-request-bc41d54.tar.bz2) = 1740 SHA256 (windecor-f609ac0.tar.bz2) = 2b10209bb6e787af69b6115291330c37dfc8f1c39fb9f91a650cf3ad1c586c10 SIZE (windecor-f609ac0.tar.bz2) = 32244 +SHA256 (cc4d177de89f.patch) = c05b79384ea18f51f7d7157b4c2fcc8fa687c1ef98255c6a779a70de07e1430c +SIZE (cc4d177de89f.patch) = 6410 diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index f258ef48b628..60c78445397e 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -1,79 +1,75 @@ PORTNAME= wayfire DISTVERSIONPREFIX= v -DISTVERSION= 0.8.0 -PORTREVISION= 3 +DISTVERSION= 0.8.1 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= dd479c06bf84.patch:-p1 # https://github.com/WayfireWM/wayfire/issues/599 -PATCHFILES+= 564b75a45d7c.patch:-p1 # https://github.com/WayfireWM/wayfire/pull/1943 MAINTAINER= jbeich@FreeBSD.org COMMENT= 3D Wayland compositor WWW= https://wayfire.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ evdev-proto>0:devel/evdev-proto \ nlohmann-json>0:devel/nlohmann-json \ wf-config>=0.8.0<0.9.0:devel/wf-config \ ${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \ wayland-protocols>=1.12:graphics/wayland-protocols \ glm>=0.9.8:math/glm LIB_DEPENDS= libevdev.so:devel/libevdev \ libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \ libpng.so:graphics/png \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon TEST_DEPENDS= doctest>0:devel/doctest USES= compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg USE_GITHUB= yes USE_GL= egl glesv2 USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= WayfireWM GH_TUPLE= WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \ WayfireWM:wf-utils:15f8e16:wfutils/subprojects/wf-utils MESON_ARGS= -Dtests=disabled \ -Dwf-touch:tests=disabled \ -Dwf-utils:default_library=static \ ${NULL} OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR} pre-test: @if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \ ${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \ ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \ ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi -# Keep override.mk in sync with x11/wcm + x11/wf-shell -.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" .include diff --git a/x11-wm/wayfire/distinfo b/x11-wm/wayfire/distinfo index 07ff91c909a8..4a280aec7593 100644 --- a/x11-wm/wayfire/distinfo +++ b/x11-wm/wayfire/distinfo @@ -1,11 +1,9 @@ -TIMESTAMP = 1696673372 -SHA256 (WayfireWM-wayfire-v0.8.0_GH0.tar.gz) = 3b67dd03a9370a0c0a2d9b98d77d9184d62b25ca13844cfdbb0cac788cb9d4b6 -SIZE (WayfireWM-wayfire-v0.8.0_GH0.tar.gz) = 433417 +TIMESTAMP = 1710332286 +SHA256 (WayfireWM-wayfire-v0.8.1_GH0.tar.gz) = 04f43df21167db15d266f7e01085b111680d57779ebc27a410201f995b33c6df +SIZE (WayfireWM-wayfire-v0.8.1_GH0.tar.gz) = 454813 SHA256 (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 3d66a67b35452741135420caf43ba349d35fc64643b8e223e6cdf74dbcef33aa SIZE (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 9881 SHA256 (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 8f32164bb2c620252aa5ca74f03f25d808cce01809a9eddd4b13a4b83ecfa94d SIZE (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 48505 SHA256 (dd479c06bf84.patch) = c58562defa005b8b3188d8a64003f0ee5444fef7449ed0a5f899d70b1901fb6d SIZE (dd479c06bf84.patch) = 2086 -SHA256 (564b75a45d7c.patch) = 723750d0a09cdf5a806af5563385f510f16c7dc16c582ba81a4c49fbce389c88 -SIZE (564b75a45d7c.patch) = 684 diff --git a/x11-wm/wayfire/pkg-plist b/x11-wm/wayfire/pkg-plist index 539dd6426eb9..87380d737eb9 100644 --- a/x11-wm/wayfire/pkg-plist +++ b/x11-wm/wayfire/pkg-plist @@ -1,165 +1,169 @@ bin/wayfire include/wayfire/bindings-repository.hpp include/wayfire/bindings.hpp include/wayfire/compositor-view.hpp include/wayfire/config-backend.hpp include/wayfire/config.h include/wayfire/core.hpp include/wayfire/dassert.hpp include/wayfire/debug.hpp include/wayfire/geometry.hpp include/wayfire/idle.hpp include/wayfire/img.hpp include/wayfire/input-device.hpp include/wayfire/matcher.hpp include/wayfire/nonstd/observer_ptr.h include/wayfire/nonstd/reverse.hpp include/wayfire/nonstd/safe-list.hpp include/wayfire/nonstd/tracking-allocator.hpp include/wayfire/nonstd/wlroots-full.hpp include/wayfire/nonstd/wlroots.hpp include/wayfire/object.hpp include/wayfire/opengl.hpp include/wayfire/option-wrapper.hpp include/wayfire/output-layout.hpp include/wayfire/output.hpp include/wayfire/per-output-plugin.hpp include/wayfire/plugin.hpp include/wayfire/plugins/blur/blur.hpp include/wayfire/plugins/common/cairo-util.hpp include/wayfire/plugins/common/geometry-animation.hpp include/wayfire/plugins/common/input-grab.hpp include/wayfire/plugins/common/key-repeat.hpp include/wayfire/plugins/common/move-drag-interface.hpp include/wayfire/plugins/common/preview-indication.hpp include/wayfire/plugins/common/shared-core-data.hpp include/wayfire/plugins/common/simple-texture.hpp include/wayfire/plugins/common/util.hpp include/wayfire/plugins/common/workspace-wall.hpp include/wayfire/plugins/crossfade.hpp include/wayfire/plugins/grid.hpp include/wayfire/plugins/ipc/ipc-activator.hpp include/wayfire/plugins/ipc/ipc-helpers.hpp include/wayfire/plugins/ipc/ipc-method-repository.hpp -include/wayfire/plugins/ipc/ipc.hpp include/wayfire/plugins/scale-signal.hpp include/wayfire/plugins/vswitch.hpp include/wayfire/plugins/wm-actions-signals.hpp include/wayfire/plugins/wobbly/wobbly-signal.hpp include/wayfire/region.hpp include/wayfire/render-manager.hpp include/wayfire/scene-input.hpp include/wayfire/scene-operations.hpp include/wayfire/scene-render.hpp include/wayfire/scene.hpp include/wayfire/seat.hpp include/wayfire/signal-definitions.hpp include/wayfire/signal-provider.hpp include/wayfire/toplevel-view.hpp include/wayfire/toplevel.hpp include/wayfire/txn/transaction-manager.hpp include/wayfire/txn/transaction-object.hpp include/wayfire/txn/transaction.hpp include/wayfire/unstable/translation-node.hpp include/wayfire/unstable/wlr-surface-node.hpp +include/wayfire/unstable/wlr-text-input-v3-popup.hpp include/wayfire/unstable/wlr-view-events.hpp include/wayfire/unstable/wlr-view-keyboard-interaction.hpp include/wayfire/unstable/xdg-toplevel-base.hpp include/wayfire/unstable/xwl-toplevel-base.hpp include/wayfire/util.hpp include/wayfire/view-access-interface.hpp include/wayfire/view-helpers.hpp include/wayfire/view-transform.hpp include/wayfire/view.hpp include/wayfire/window-manager.hpp include/wayfire/workarea.hpp include/wayfire/workspace-set.hpp include/wayfire/workspace-stream.hpp lib/libwayfire-blur-base.so lib/wayfire/libalpha.so lib/wayfire/libanimate.so lib/wayfire/libautostart.so lib/wayfire/libblur.so lib/wayfire/libcommand.so lib/wayfire/libcube.so lib/wayfire/libdecoration.so lib/wayfire/libdefault-config-backend.so lib/wayfire/libdemo-ipc.so lib/wayfire/libexpo.so lib/wayfire/libextra-gestures.so lib/wayfire/libfast-switcher.so lib/wayfire/libfisheye.so lib/wayfire/libforeign-toplevel.so lib/wayfire/libgrid.so lib/wayfire/libgtk-shell.so lib/wayfire/libidle.so +lib/wayfire/libinput-method-v1.so lib/wayfire/libinvert.so lib/wayfire/libipc-rules.so lib/wayfire/libipc.so lib/wayfire/libmove.so lib/wayfire/liboswitch.so lib/wayfire/libplace.so lib/wayfire/libpreserve-output.so lib/wayfire/libresize.so lib/wayfire/libscale-title-filter.so lib/wayfire/libscale.so +lib/wayfire/libshortcuts-inhibit.so lib/wayfire/libsimple-tile.so lib/wayfire/libstipc.so lib/wayfire/libswitcher.so lib/wayfire/libvswipe.so lib/wayfire/libvswitch.so lib/wayfire/libwayfire-shell.so lib/wayfire/libwindow-rules.so lib/wayfire/libwm-actions.so lib/wayfire/libwobbly.so lib/wayfire/libwrot.so lib/wayfire/libwsets.so lib/wayfire/libxdg-activation.so lib/wayfire/libzoom.so libdata/pkgconfig/wayfire.pc share/man/man1/wayfire.1.gz %%EXAMPLESDIR%%/wayfire.ini %%DATADIR%%/metadata/alpha.xml %%DATADIR%%/metadata/animate.xml %%DATADIR%%/metadata/autostart.xml %%DATADIR%%/metadata/blur.xml %%DATADIR%%/metadata/command.xml %%DATADIR%%/metadata/core.xml %%DATADIR%%/metadata/cube.xml %%DATADIR%%/metadata/decoration.xml %%DATADIR%%/metadata/expo.xml %%DATADIR%%/metadata/extra-gestures.xml %%DATADIR%%/metadata/fast-switcher.xml %%DATADIR%%/metadata/fisheye.xml %%DATADIR%%/metadata/foreign-toplevel.xml %%DATADIR%%/metadata/grid.xml %%DATADIR%%/metadata/gtk-shell.xml %%DATADIR%%/metadata/idle.xml %%DATADIR%%/metadata/input-device.xml +%%DATADIR%%/metadata/input-method-v1.xml %%DATADIR%%/metadata/input.xml %%DATADIR%%/metadata/invert.xml %%DATADIR%%/metadata/ipc-rules.xml %%DATADIR%%/metadata/ipc.xml %%DATADIR%%/metadata/move.xml %%DATADIR%%/metadata/oswitch.xml %%DATADIR%%/metadata/output.xml %%DATADIR%%/metadata/place.xml %%DATADIR%%/metadata/preserve-output.xml %%DATADIR%%/metadata/resize.xml %%DATADIR%%/metadata/scale-title-filter.xml %%DATADIR%%/metadata/scale.xml +%%DATADIR%%/metadata/shortcuts-inhibit.xml %%DATADIR%%/metadata/simple-tile.xml %%DATADIR%%/metadata/switcher.xml %%DATADIR%%/metadata/vswipe.xml %%DATADIR%%/metadata/vswitch.xml %%DATADIR%%/metadata/wayfire-shell.xml %%DATADIR%%/metadata/window-rules.xml %%DATADIR%%/metadata/wm-actions.xml %%DATADIR%%/metadata/wobbly.xml %%DATADIR%%/metadata/workarounds.xml %%DATADIR%%/metadata/wrot.xml %%DATADIR%%/metadata/wsets.xml %%DATADIR%%/metadata/xdg-activation.xml %%DATADIR%%/metadata/zoom.xml %%DATADIR%%/protocols/unstable/wayfire-shell-unstable-v2.xml share/wayland-sessions/wayfire.desktop diff --git a/x11/wcm/Makefile b/x11/wcm/Makefile index f4964719bf27..075d4786306c 100644 --- a/x11/wcm/Makefile +++ b/x11/wcm/Makefile @@ -1,46 +1,45 @@ PORTNAME= wcm DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 PORTREVISION= 1 CATEGORIES= x11 wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= aade4224e23e.patch:-p1 # https://github.com/WayfireWM/wcm/pull/69 MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayfire Config Manager WWW= https://wayfire.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= libevdev.so:devel/libevdev \ libwf-config.so:devel/wf-config \ libwayland-client.so:graphics/wayland RUN_DEPENDS= wayfire>0:x11-wm/wayfire CONFLICTS_INSTALL= wcmcommander # bin/wcm USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= gdkpixbuf2 gtk30 libxml2 GH_ACCOUNT= WayfireWM MESON_ARGS= -Denable_wdisplays=false # use package DATADIR= ${PREFIX}/share/wayfire OPTIONS_DEFINE= WDISPLAYS WFSHELL OPTIONS_DEFAULT=WDISPLAYS WFSHELL OPTIONS_SUB= yes WDISPLAYS_DESC= Configure outputs via wdisplays WDISPLAYS_RUN_DEPENDS= wdisplays>0:x11/wdisplays WFSHELL_DESC= Build with wf-shell support WFSHELL_BUILD_DEPENDS= wf-shell>0:x11/wf-shell WFSHELL_MESON_ENABLED= wf_shell -.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" .include diff --git a/x11/wf-shell/Makefile b/x11/wf-shell/Makefile index b86edcf2edfc..a2419eb48bd1 100644 --- a/x11/wf-shell/Makefile +++ b/x11/wf-shell/Makefile @@ -1,51 +1,50 @@ PORTNAME= wf-shell DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= GTK3-based panel for wayfire WWW= https://wayfire.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \ wf-config>=0.7.0:devel/wf-config \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu \ libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \ libwayland-client.so:graphics/wayland \ libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell RUN_DEPENDS= wayland-logout:x11/wayland-logout FLAVORS= default nopulse default_CONFLICTS_INSTALL= ${PORTNAME}-nopulse nopulse_CONFLICTS_INSTALL= ${PORTNAME} nopulse_PKGNAMESUFFIX= -nopulse USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= gtkmm30 GH_ACCOUNT= WayfireWM GH_TUPLE= GNOME:libgnome-volume-control:468022b:gvc/subprojects/gvc MESON_ARGS= -Dgvc:alsa=false -Dwayland-logout=false DATADIR= ${PREFIX}/share/wayfire OPTIONS_DEFINE= PULSEAUDIO OPTIONS_DEFAULT=PULSEAUDIO .if ${FLAVOR:U} == nopulse OPTIONS_EXCLUDE=PULSEAUDIO .endif PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MESON_ENABLED= pulse post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \ ${WRKSRC}/src/dock/toplevel-icon.cpp \ ${WRKSRC}/src/panel/widgets/window-list/toplevel.cpp -.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" .include