Index: branches/2021Q1/devel/wf-config/Makefile =================================================================== --- branches/2021Q1/devel/wf-config/Makefile (revision 563242) +++ branches/2021Q1/devel/wf-config/Makefile (revision 563243) @@ -1,25 +1,26 @@ # $FreeBSD$ PORTNAME= wf-config -DISTVERSION= 0.6.0 +DISTVERSIONPREFIX= v +DISTVERSION= 0.7.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Library for managing configuration files, written for wayfire LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols \ glm>0:math/glm LIB_DEPENDS= libevdev.so:devel/libevdev RUN_DEPENDS= glm>0:math/glm USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= libxml2 USE_LDCONFIG= yes GH_ACCOUNT= WayfireWM .include Index: branches/2021Q1/devel/wf-config/distinfo =================================================================== --- branches/2021Q1/devel/wf-config/distinfo (revision 563242) +++ branches/2021Q1/devel/wf-config/distinfo (revision 563243) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604853687 -SHA256 (WayfireWM-wf-config-0.6.0_GH0.tar.gz) = 73af6d803044d4e5907974ece019ae0d1b4020a057f6c27be0594fb70d86653b -SIZE (WayfireWM-wf-config-0.6.0_GH0.tar.gz) = 79631 +TIMESTAMP = 1611559979 +SHA256 (WayfireWM-wf-config-v0.7.0_GH0.tar.gz) = a8712d6a10d74b2bdba3dac9e01448945a0470ce8b1cd6d5caa2a8194f889b04 +SIZE (WayfireWM-wf-config-v0.7.0_GH0.tar.gz) = 90361 Index: branches/2021Q1/devel/wf-config/pkg-plist =================================================================== --- branches/2021Q1/devel/wf-config/pkg-plist (revision 563242) +++ branches/2021Q1/devel/wf-config/pkg-plist (revision 563243) @@ -1,16 +1,17 @@ +include/wayfire/config/compound-option.hpp include/wayfire/config/config-manager.hpp include/wayfire/config/file.hpp include/wayfire/config/option-types.hpp include/wayfire/config/option-wrapper.hpp include/wayfire/config/option.hpp include/wayfire/config/section.hpp include/wayfire/config/types.hpp include/wayfire/config/xml.hpp include/wayfire/nonstd/optional.hpp include/wayfire/util/duration.hpp include/wayfire/util/log.hpp include/wayfire/util/stringify.hpp lib/libwf-config.so +lib/libwf-config.so.0.7.0 lib/libwf-config.so.1 -lib/libwf-config.so.0.6.0 libdata/pkgconfig/wf-config.pc Index: branches/2021Q1/x11/wcm/Makefile =================================================================== --- branches/2021Q1/x11/wcm/Makefile (revision 563242) +++ branches/2021Q1/x11/wcm/Makefile (revision 563243) @@ -1,39 +1,38 @@ # $FreeBSD$ PORTNAME= wcm DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0 -PORTREVISION= 1 +DISTVERSION= 0.7.0 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayfire Config Manager LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ 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= gtk30 libxml2 GH_ACCOUNT= WayfireWM DATADIR= ${PREFIX}/share/wayfire INSTALLS_ICONS= yes OPTIONS_DEFINE= WFSHELL OPTIONS_DEFAULT=WFSHELL OPTIONS_SUB= yes WFSHELL_DESC= Build with wf-shell support WFSHELL_BUILD_DEPENDS= wf-shell>0:x11/wf-shell WFSHELL_MESON_ENABLED= wf_shell .include Index: branches/2021Q1/x11/wcm/distinfo =================================================================== --- branches/2021Q1/x11/wcm/distinfo (revision 563242) +++ branches/2021Q1/x11/wcm/distinfo (revision 563243) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604873991 -SHA256 (WayfireWM-wcm-v0.6.0_GH0.tar.gz) = bfead0b617f46306ad3bc15b8e9c7e8f13996de6b5bdd3f2d18f066a9033740f -SIZE (WayfireWM-wcm-v0.6.0_GH0.tar.gz) = 308100 +TIMESTAMP = 1611938818 +SHA256 (WayfireWM-wcm-v0.7.0_GH0.tar.gz) = 930792b9567183aa4939ce880c294d38b56fcd1b9b64760bb33126067010166f +SIZE (WayfireWM-wcm-v0.7.0_GH0.tar.gz) = 310195 Index: branches/2021Q1/x11/wf-shell/Makefile =================================================================== --- branches/2021Q1/x11/wf-shell/Makefile (revision 563242) +++ branches/2021Q1/x11/wf-shell/Makefile (revision 563243) @@ -1,37 +1,42 @@ # $FreeBSD$ PORTNAME= wf-shell DISTVERSIONPREFIX= v -DISTVERSION= 0.6.1 +DISTVERSION= 0.7.0 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org COMMENT= GTK3-based panel for wayfire LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \ - wf-config>=0.6.0:devel/wf-config \ + wf-config>=0.7.0:devel/wf-config \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= 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 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 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 Index: branches/2021Q1/x11/wf-shell/distinfo =================================================================== --- branches/2021Q1/x11/wf-shell/distinfo (revision 563242) +++ branches/2021Q1/x11/wf-shell/distinfo (revision 563243) @@ -1,5 +1,5 @@ -TIMESTAMP = 1605124163 -SHA256 (WayfireWM-wf-shell-v0.6.1_GH0.tar.gz) = 9159dea7addd81670cb308d61803dd32cc8b04577d670d0af54d2e08b1e1b5a1 -SIZE (WayfireWM-wf-shell-v0.6.1_GH0.tar.gz) = 8949941 +TIMESTAMP = 1611938292 +SHA256 (WayfireWM-wf-shell-v0.7.0_GH0.tar.gz) = 148ad702235cdcbdafb5fa276658d546f42c8843e2cd41c6c26b9ef3d4186b3a +SIZE (WayfireWM-wf-shell-v0.7.0_GH0.tar.gz) = 8950942 SHA256 (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 1c1d806ad1f57d7f644381b67ee87ef3e7e10f3a2da1432beef535ca50c0040f SIZE (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 45503 Index: branches/2021Q1/x11-wm/wayfire/Makefile =================================================================== --- branches/2021Q1/x11-wm/wayfire/Makefile (revision 563242) +++ branches/2021Q1/x11-wm/wayfire/Makefile (revision 563243) @@ -1,60 +1,60 @@ # $FreeBSD$ PORTNAME= wayfire -DISTVERSION= 0.6.0 -PORTREVISION= 1 +DISTVERSIONPREFIX= v +DISTVERSION= 0.7.0 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org COMMENT= 3D Wayland compositor LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wf-config>=0.6.0<0.7.0:devel/wf-config \ + wf-config>=0.7.0<0.8.0:devel/wf-config \ ${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \ wayland-protocols>=1.12:graphics/wayland-protocols \ glm>=0.9.8:math/glm \ wlroots>=0.12.0<0.13.0:x11-toolkits/wlroots LIB_DEPENDS= 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 USES= compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg USE_GITHUB= yes USE_GL= egl glesv2 USE_GNOME= cairo USE_XORG= pixman GH_ACCOUNT= WayfireWM GH_TUPLE= WayfireWM:wf-touch:b1075c5:wftouch/subprojects/wf-touch \ WayfireWM:wf-utils:f45641b:wfutils/subprojects/wf-utils OPTIONS_DEFINE= SUID X11 OPTIONS_DEFAULT=SUID X11 SUID_DESC= setuid bit on "${PORTNAME}" binary (to claim DRM without seatd/console-kit-daemon) SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) " SUID_PLIST_SUB_OFF= MAYBE_SUID="" 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 post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/wayland-sessions .include Index: branches/2021Q1/x11-wm/wayfire/distinfo =================================================================== --- branches/2021Q1/x11-wm/wayfire/distinfo (revision 563242) +++ branches/2021Q1/x11-wm/wayfire/distinfo (revision 563243) @@ -1,7 +1,7 @@ -TIMESTAMP = 1604855952 -SHA256 (WayfireWM-wayfire-0.6.0_GH0.tar.gz) = 9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33 -SIZE (WayfireWM-wayfire-0.6.0_GH0.tar.gz) = 325079 +TIMESTAMP = 1611927243 +SHA256 (WayfireWM-wayfire-v0.7.0_GH0.tar.gz) = b1a94ad2843db19e78cbd361ceebaade4507647ad893d5b5117a9fc7724ce41c +SIZE (WayfireWM-wayfire-v0.7.0_GH0.tar.gz) = 362226 SHA256 (WayfireWM-wf-touch-b1075c5_GH0.tar.gz) = 107fd73280e90c1330adc051b4dada1549a47e221e60d601d23e15b995f8bdc9 SIZE (WayfireWM-wf-touch-b1075c5_GH0.tar.gz) = 53883 SHA256 (WayfireWM-wf-utils-f45641b_GH0.tar.gz) = 2f546333d4b1dfa3ed14caee3682dcc4c7e33164cb255991d918f3ace5f51dd7 SIZE (WayfireWM-wf-utils-f45641b_GH0.tar.gz) = 48453 Index: branches/2021Q1/x11-wm/wayfire/pkg-plist =================================================================== --- branches/2021Q1/x11-wm/wayfire/pkg-plist (revision 563242) +++ branches/2021Q1/x11-wm/wayfire/pkg-plist (revision 563243) @@ -1,112 +1,123 @@ %%MAYBE_SUID%%bin/wayfire include/wayfire/bindings.hpp include/wayfire/compositor-surface.hpp include/wayfire/compositor-view.hpp +include/wayfire/config-backend.hpp include/wayfire/config.h include/wayfire/core.hpp include/wayfire/debug.hpp include/wayfire/decorator.hpp include/wayfire/geometry.hpp include/wayfire/gtk-shell.hpp include/wayfire/idle.hpp include/wayfire/img.hpp include/wayfire/input-device.hpp include/wayfire/matcher.hpp include/wayfire/nonstd/noncopyable.hpp include/wayfire/nonstd/observer_ptr.h include/wayfire/nonstd/reverse.hpp include/wayfire/nonstd/safe-list.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/plugin.hpp include/wayfire/plugins/common/cairo-util.hpp include/wayfire/plugins/common/geometry-animation.hpp -include/wayfire/plugins/common/move-snap-helper.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/view-change-viewport-signal.hpp include/wayfire/plugins/common/workspace-stream-sharing.hpp include/wayfire/plugins/common/workspace-wall.hpp +include/wayfire/plugins/scale-signal.hpp +include/wayfire/plugins/scale-transform.hpp include/wayfire/plugins/vswitch.hpp include/wayfire/plugins/wobbly/wobbly-signal.hpp include/wayfire/render-manager.hpp include/wayfire/signal-definitions.hpp include/wayfire/singleton-plugin.hpp include/wayfire/surface.hpp include/wayfire/util.hpp include/wayfire/view-access-interface.hpp include/wayfire/view-transform.hpp include/wayfire/view.hpp include/wayfire/workspace-manager.hpp include/wayfire/workspace-stream.hpp 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/libexpo.so lib/wayfire/libextra-gestures.so lib/wayfire/libfast-switcher.so lib/wayfire/libfisheye.so lib/wayfire/libgrid.so lib/wayfire/libidle.so lib/wayfire/libinvert.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/libsimple-tile.so lib/wayfire/libswitcher.so lib/wayfire/libvswipe.so lib/wayfire/libvswitch.so lib/wayfire/libwindow-rules.so lib/wayfire/libwm-actions.so lib/wayfire/libwobbly.so lib/wayfire/libwrot.so lib/wayfire/libzoom.so libdata/pkgconfig/wayfire.pc %%EXAMPLESDIR%%/wayfire.ini %%DATADIR%%/decoration/resources/close.png %%DATADIR%%/decoration/resources/maximize.png %%DATADIR%%/decoration/resources/minimize.png %%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/grid.xml %%DATADIR%%/metadata/idle.xml +%%DATADIR%%/metadata/input-device.xml %%DATADIR%%/metadata/input.xml %%DATADIR%%/metadata/invert.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/simple-tile.xml %%DATADIR%%/metadata/switcher.xml %%DATADIR%%/metadata/vswipe.xml %%DATADIR%%/metadata/vswitch.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/zoom.xml %%DATADIR%%/protocols/unstable/wayfire-shell-unstable-v2.xml share/wayland-sessions/wayfire.desktop Index: branches/2021Q1/x11-wm/wayfire-plugins-extra/Makefile =================================================================== --- branches/2021Q1/x11-wm/wayfire-plugins-extra/Makefile (revision 563242) +++ branches/2021Q1/x11-wm/wayfire-plugins-extra/Makefile (revision 563243) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= wayfire-plugins-extra DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0 +DISTVERSION= 0.7.0 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org COMMENT= Additional plugins for Wayfire LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-scanner:graphics/wayland \ wayland-protocols>0:graphics/wayland-protocols \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= libwf-config.so:devel/wf-config \ libwlroots.so:x11-toolkits/wlroots USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= cairo glibmm GH_ACCOUNT= WayfireWM .include Index: branches/2021Q1/x11-wm/wayfire-plugins-extra/distinfo =================================================================== --- branches/2021Q1/x11-wm/wayfire-plugins-extra/distinfo (revision 563242) +++ branches/2021Q1/x11-wm/wayfire-plugins-extra/distinfo (revision 563243) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604873844 -SHA256 (WayfireWM-wayfire-plugins-extra-v0.6.0_GH0.tar.gz) = d1ac42c0b2d212a7523f2aeb63285ab8b95ffb6efd564bf27877310eeab1ab0e -SIZE (WayfireWM-wayfire-plugins-extra-v0.6.0_GH0.tar.gz) = 47411 +TIMESTAMP = 1611938557 +SHA256 (WayfireWM-wayfire-plugins-extra-v0.7.0_GH0.tar.gz) = e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287 +SIZE (WayfireWM-wayfire-plugins-extra-v0.7.0_GH0.tar.gz) = 50385 Index: branches/2021Q1/x11-wm/wayfire-plugins-extra/pkg-plist =================================================================== --- branches/2021Q1/x11-wm/wayfire-plugins-extra/pkg-plist (revision 563242) +++ branches/2021Q1/x11-wm/wayfire-plugins-extra/pkg-plist (revision 563243) @@ -1,26 +1,29 @@ lib/wayfire/libannotate.so lib/wayfire/libautorotate-iio.so lib/wayfire/libbackground-view.so lib/wayfire/libbench.so lib/wayfire/libcrosshair.so lib/wayfire/libfollow-focus.so lib/wayfire/libforce-fullscreen.so +lib/wayfire/libglib-main-loop.so lib/wayfire/libjoin-views.so lib/wayfire/libkeycolor.so lib/wayfire/libmag.so lib/wayfire/libshowrepaint.so lib/wayfire/libwater.so +lib/wayfire/libwinzoom.so lib/wayfire/libworkspace-names.so share/wayfire/metadata/annotate.xml share/wayfire/metadata/autorotate-iio.xml share/wayfire/metadata/background-view.xml share/wayfire/metadata/bench.xml share/wayfire/metadata/crosshair.xml share/wayfire/metadata/follow-focus.xml share/wayfire/metadata/force-fullscreen.xml share/wayfire/metadata/join-views.xml share/wayfire/metadata/keycolor.xml share/wayfire/metadata/mag.xml share/wayfire/metadata/showrepaint.xml share/wayfire/metadata/water.xml +share/wayfire/metadata/window-zoom.xml share/wayfire/metadata/workspace-names.xml Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 563242) +++ branches/2021Q1 (revision 563243) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r563237