Date: Sun, 8 Nov 2020 17:59:48 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554641 - in head: devel/wf-config x11-wm/wayfire x11-wm/wayfire/files x11/wf-shell Message-ID: <202011081759.0A8HxmHd036909@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Nov 8 17:59:48 2020 New Revision: 554641 URL: https://svnweb.freebsd.org/changeset/ports/554641 Log: x11-wm/wayfire: update to 0.6.0 Changes: https://github.com/WayfireWM/wayfire/compare/0.5.0...0.6.0 Changes: https://github.com/WayfireWM/wf-config/compare/0.5.0...0.6.0 Changes: https://github.com/WayfireWM/wf-shell/compare/0.5.0...0.6.0 Reported by: GitHub (watch releases) Added: head/x11-wm/wayfire/files/patch-private-libs (contents, props changed) - copied, changed from r554640, head/x11-wm/wayfire/files/patch-private-wfutils Deleted: head/x11-wm/wayfire/files/patch-private-wfutils head/x11-wm/wayfire/files/patch-wlroots-0.12 Modified: head/devel/wf-config/Makefile (contents, props changed) head/devel/wf-config/distinfo (contents, props changed) head/devel/wf-config/pkg-plist (contents, props changed) head/x11-wm/wayfire/Makefile (contents, props changed) head/x11-wm/wayfire/distinfo (contents, props changed) head/x11-wm/wayfire/pkg-plist (contents, props changed) head/x11/wf-shell/Makefile (contents, props changed) head/x11/wf-shell/distinfo (contents, props changed) head/x11/wf-shell/pkg-plist (contents, props changed) Modified: head/devel/wf-config/Makefile ============================================================================== --- head/devel/wf-config/Makefile Sun Nov 8 17:50:06 2020 (r554640) +++ head/devel/wf-config/Makefile Sun Nov 8 17:59:48 2020 (r554641) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wf-config -DISTVERSION= 0.5.0 -PORTREVISION= 1 +DISTVERSION= 0.6.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Modified: head/devel/wf-config/distinfo ============================================================================== --- head/devel/wf-config/distinfo Sun Nov 8 17:50:06 2020 (r554640) +++ head/devel/wf-config/distinfo Sun Nov 8 17:59:48 2020 (r554641) @@ -1,3 +1,3 @@ -TIMESTAMP = 1596262861 -SHA256 (WayfireWM-wf-config-0.5.0_GH0.tar.gz) = bf690477ff0d8928ddeca6a278b9153a39ade1e13fd32cc6d04552db4d65cbf0 -SIZE (WayfireWM-wf-config-0.5.0_GH0.tar.gz) = 78958 +TIMESTAMP = 1604853687 +SHA256 (WayfireWM-wf-config-0.6.0_GH0.tar.gz) = 73af6d803044d4e5907974ece019ae0d1b4020a057f6c27be0594fb70d86653b +SIZE (WayfireWM-wf-config-0.6.0_GH0.tar.gz) = 79631 Modified: head/devel/wf-config/pkg-plist ============================================================================== --- head/devel/wf-config/pkg-plist Sun Nov 8 17:50:06 2020 (r554640) +++ head/devel/wf-config/pkg-plist Sun Nov 8 17:59:48 2020 (r554641) @@ -12,5 +12,5 @@ include/wayfire/util/log.hpp include/wayfire/util/stringify.hpp lib/libwf-config.so lib/libwf-config.so.1 -lib/libwf-config.so.0.5.0 +lib/libwf-config.so.0.6.0 libdata/pkgconfig/wf-config.pc Modified: head/x11-wm/wayfire/Makefile ============================================================================== --- head/x11-wm/wayfire/Makefile Sun Nov 8 17:50:06 2020 (r554640) +++ head/x11-wm/wayfire/Makefile Sun Nov 8 17:59:48 2020 (r554641) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wayfire -DISTVERSION= 0.5.0 -PORTREVISION= 2 +DISTVERSION= 0.6.0 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org @@ -12,11 +11,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wf-config>=0.5.0<0.6.0:devel/wf-config \ + wf-config>=0.6.0<0.7.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.11.0<0.13.0:x11-toolkits/wlroots + 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 \ @@ -31,7 +30,8 @@ USE_GL= egl glesv2 USE_GNOME= cairo USE_XORG= pixman GH_ACCOUNT= WayfireWM -GH_TUPLE= WayfireWM:wf-utils:f9b5eba:wfutils/subprojects/wf-utils +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 Modified: head/x11-wm/wayfire/distinfo ============================================================================== --- head/x11-wm/wayfire/distinfo Sun Nov 8 17:50:06 2020 (r554640) +++ head/x11-wm/wayfire/distinfo Sun Nov 8 17:59:48 2020 (r554641) @@ -1,5 +1,7 @@ -TIMESTAMP = 1596567377 -SHA256 (WayfireWM-wayfire-0.5.0_GH0.tar.gz) = 24c1a2c963dac5af762f87cd024bc3dd736ec9a28a6735d357a05e8f6502e8aa -SIZE (WayfireWM-wayfire-0.5.0_GH0.tar.gz) = 293982 -SHA256 (WayfireWM-wf-utils-f9b5eba_GH0.tar.gz) = 3f11c0335b689508f30d539a60d3c702a7f43c40e4cadcbfccd92970f685fba5 -SIZE (WayfireWM-wf-utils-f9b5eba_GH0.tar.gz) = 47279 +TIMESTAMP = 1604855952 +SHA256 (WayfireWM-wayfire-0.6.0_GH0.tar.gz) = 9c2bf92e6aecc9b800b87e4c086ff7a275393f7315501b8c39196baf9d245b33 +SIZE (WayfireWM-wayfire-0.6.0_GH0.tar.gz) = 325079 +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 Copied and modified: head/x11-wm/wayfire/files/patch-private-libs (from r554640, head/x11-wm/wayfire/files/patch-private-wfutils) ============================================================================== --- head/x11-wm/wayfire/files/patch-private-wfutils Sun Nov 8 17:50:06 2020 (r554640, copy source) +++ head/x11-wm/wayfire/files/patch-private-libs Sun Nov 8 17:59:48 2020 (r554641) @@ -1,14 +1,16 @@ -wf-utils is untagged and has no other consumers. Keep it private to -wayfire package for now. +wf-touch and wf-utils are untagged and have no other consumers. Keep +it private to wayfire package for now. ---- meson.build.orig 2020-08-04 18:56:17 UTC +--- meson.build.orig 2020-11-08 17:19:12 UTC +++ meson.build -@@ -41,7 +41,7 @@ if not use_system_wfconfig +@@ -41,8 +41,8 @@ if not use_system_wfconfig wfconfig = subproject('wf-config').get_variable('wfconfig') endif -wfutils = subproject('wf-utils').get_variable('wfutils') +-wftouch = subproject('wf-touch').get_variable('wftouch') +wfutils = subproject('wf-utils', default_options: ['default_library=static']).get_variable('wfutils') ++wftouch = subproject('wf-touch', default_options: ['default_library=static']).get_variable('wftouch') needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system()) libinotify = dependency('libinotify', required: needs_libinotify) @@ -49,3 +51,25 @@ wayfire package for now. # ------------------------------------------------------------------------------------------------- # Unit tests +--- subprojects/wf-touch/meson.build.orig 2020-09-20 09:41:37 UTC ++++ subprojects/wf-touch/meson.build +@@ -5,14 +5,18 @@ project('wf-touch', ['cpp'], + glm = dependency('glm') + + wf_touch_inc_dirs = include_directories('.') ++if not meson.is_subproject() + install_headers([ + 'wayfire/touch/touch.hpp'], + subdir: 'wayfire/touch') ++endif + + wftouch_lib = static_library('wftouch', ['src/touch.cpp', 'src/actions.cpp', 'src/math.cpp'], +- dependencies: glm, install: true) ++ dependencies: glm, install: not meson.is_subproject()) + + wftouch = declare_dependency(link_with: wftouch_lib, + include_directories: wf_touch_inc_dirs, dependencies: glm) + ++if not meson.is_subproject() + subdir('test') ++endif Modified: head/x11-wm/wayfire/pkg-plist ============================================================================== --- head/x11-wm/wayfire/pkg-plist Sun Nov 8 17:50:06 2020 (r554640) +++ head/x11-wm/wayfire/pkg-plist Sun Nov 8 17:59:48 2020 (r554641) @@ -7,6 +7,8 @@ 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 @@ -14,6 +16,8 @@ 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 @@ -22,10 +26,14 @@ 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/preview-indication.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/vswitch.hpp +include/wayfire/plugins/wobbly/wobbly-signal.hpp include/wayfire/render-manager.hpp include/wayfire/signal-definitions.hpp include/wayfire/singleton-plugin.hpp @@ -44,6 +52,7 @@ lib/wayfire/libcommand.so lib/wayfire/libcube.so lib/wayfire/libdecoration.so lib/wayfire/libexpo.so +lib/wayfire/libextra-gestures.so lib/wayfire/libfast-switcher.so lib/wayfire/libfisheye.so lib/wayfire/libgrid.so @@ -53,6 +62,7 @@ lib/wayfire/libmove.so lib/wayfire/liboswitch.so lib/wayfire/libplace.so lib/wayfire/libresize.so +lib/wayfire/libscale.so lib/wayfire/libsimple-tile.so lib/wayfire/libswitcher.so lib/wayfire/libvswipe.so @@ -75,6 +85,7 @@ libdata/pkgconfig/wayfire.pc %%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 @@ -85,6 +96,7 @@ libdata/pkgconfig/wayfire.pc %%DATADIR%%/metadata/oswitch.xml %%DATADIR%%/metadata/place.xml %%DATADIR%%/metadata/resize.xml +%%DATADIR%%/metadata/scale.xml %%DATADIR%%/metadata/simple-tile.xml %%DATADIR%%/metadata/switcher.xml %%DATADIR%%/metadata/vswipe.xml Modified: head/x11/wf-shell/Makefile ============================================================================== --- head/x11/wf-shell/Makefile Sun Nov 8 17:50:06 2020 (r554640) +++ head/x11/wf-shell/Makefile Sun Nov 8 17:59:48 2020 (r554641) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= wf-shell -DISTVERSION= 0.5.0 +DISTVERSION= 0.6.0 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \ - wf-config>=0.5.0:devel/wf-config \ + wf-config>=0.6.0:devel/wf-config \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \ @@ -22,7 +22,8 @@ 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 +GH_TUPLE= GNOME:libgnome-volume-control:468022b:gvc/subprojects/gvc \ + soreau:wayland-logout:v1.0-4-gab7c143:wayland_logout/subprojects/wayland-logout MESON_ARGS= -Dgvc:alsa=false DATADIR= ${PREFIX}/share/wayfire Modified: head/x11/wf-shell/distinfo ============================================================================== --- head/x11/wf-shell/distinfo Sun Nov 8 17:50:06 2020 (r554640) +++ head/x11/wf-shell/distinfo Sun Nov 8 17:59:48 2020 (r554641) @@ -1,5 +1,7 @@ -TIMESTAMP = 1596263008 -SHA256 (WayfireWM-wf-shell-0.5.0_GH0.tar.gz) = 7e274d46009193129e763e383d2e91b579f4bd1468ed89386a3249f01410b40f -SIZE (WayfireWM-wf-shell-0.5.0_GH0.tar.gz) = 8948762 +TIMESTAMP = 1604855332 +SHA256 (WayfireWM-wf-shell-0.6.0_GH0.tar.gz) = 6a22db73f6f7500cbc1208a860869c96184067a9ee7b1c4710e7bf79b6c283a3 +SIZE (WayfireWM-wf-shell-0.6.0_GH0.tar.gz) = 8949900 SHA256 (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 1c1d806ad1f57d7f644381b67ee87ef3e7e10f3a2da1432beef535ca50c0040f SIZE (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 45503 +SHA256 (soreau-wayland-logout-v1.0-4-gab7c143_GH0.tar.gz) = 854ea71dcad6b8ce4d6b5259ee8d5a830c794c31d8177282c81c2a0b29c652e5 +SIZE (soreau-wayland-logout-v1.0-4-gab7c143_GH0.tar.gz) = 16923 Modified: head/x11/wf-shell/pkg-plist ============================================================================== --- head/x11/wf-shell/pkg-plist Sun Nov 8 17:50:06 2020 (r554640) +++ head/x11/wf-shell/pkg-plist Sun Nov 8 17:59:48 2020 (r554641) @@ -1,3 +1,4 @@ +bin/wayland-logout bin/wf-background bin/wf-dock bin/wf-panel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011081759.0A8HxmHd036909>