Date: Tue, 4 Aug 2020 20:35:10 +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: r544185 - in head: devel/wf-config x11-wm/wayfire x11-wm/wayfire/files x11/wcm x11/wf-shell Message-ID: <202008042035.074KZAhY034848@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Aug 4 20:35:09 2020 New Revision: 544185 URL: https://svnweb.freebsd.org/changeset/ports/544185 Log: x11-wm/wayfire: update to 0.5.0 Changes: https://github.com/WayfireWM/wayfire/compare/0.4.0...0.5.0 Changes: https://github.com/WayfireWM/wf-config/compare/0.4.1...0.5.0 Changes: https://github.com/WayfireWM/wf-shell/compare/0.4.0...0.5.0 Changes: https://github.com/WayfireWM/wcm/compare/v0.4.0...v0.5.0 Reported by: GitHub (watch releases) Added: head/x11-wm/wayfire/files/patch-private-wfutils (contents, props changed) Deleted: head/x11-wm/wayfire/files/patch-wlroots-0.11 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/wcm/Makefile (contents, props changed) head/x11/wcm/distinfo (contents, props changed) head/x11/wcm/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 Tue Aug 4 20:34:55 2020 (r544184) +++ head/devel/wf-config/Makefile Tue Aug 4 20:35:09 2020 (r544185) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= wf-config -DISTVERSION= 0.4.1 +DISTVERSION= 0.5.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org Modified: head/devel/wf-config/distinfo ============================================================================== --- head/devel/wf-config/distinfo Tue Aug 4 20:34:55 2020 (r544184) +++ head/devel/wf-config/distinfo Tue Aug 4 20:35:09 2020 (r544185) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592750775 -SHA256 (WayfireWM-wf-config-0.4.1_GH0.tar.gz) = 32a08c9b9043581cdbd7e85c43d30f893d149bb5054e143ee772f1b041201129 -SIZE (WayfireWM-wf-config-0.4.1_GH0.tar.gz) = 78849 +TIMESTAMP = 1596262861 +SHA256 (WayfireWM-wf-config-0.5.0_GH0.tar.gz) = bf690477ff0d8928ddeca6a278b9153a39ade1e13fd32cc6d04552db4d65cbf0 +SIZE (WayfireWM-wf-config-0.5.0_GH0.tar.gz) = 78958 Modified: head/devel/wf-config/pkg-plist ============================================================================== --- head/devel/wf-config/pkg-plist Tue Aug 4 20:34:55 2020 (r544184) +++ head/devel/wf-config/pkg-plist Tue Aug 4 20:35:09 2020 (r544185) @@ -11,6 +11,6 @@ include/wayfire/util/duration.hpp include/wayfire/util/log.hpp include/wayfire/util/stringify.hpp lib/libwf-config.so -lib/libwf-config.so.0 -lib/libwf-config.so.0.4.1 +lib/libwf-config.so.1 +lib/libwf-config.so.0.5.0 libdata/pkgconfig/wf-config.pc Modified: head/x11-wm/wayfire/Makefile ============================================================================== --- head/x11-wm/wayfire/Makefile Tue Aug 4 20:34:55 2020 (r544184) +++ head/x11-wm/wayfire/Makefile Tue Aug 4 20:35:09 2020 (r544185) @@ -1,13 +1,9 @@ # $FreeBSD$ PORTNAME= wayfire -DISTVERSION= 0.4.0 -PORTREVISION= 2 +DISTVERSION= 0.5.0 CATEGORIES= x11-wm -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= e5b6f1245709.patch:-p1 # https://github.com/WayfireWM/wayfire/pull/472 - MAINTAINER= jbeich@FreeBSD.org COMMENT= 3D Wayland compositor @@ -15,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wf-config>=0.4.0<0.5.0:devel/wf-config \ + wf-config>=0.5.0<0.6.0:devel/wf-config \ ${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \ wayland-protocols>=1.12:graphics/wayland-protocols \ glm>=0.9.8:math/glm \ @@ -34,12 +30,22 @@ USE_GL= egl glesv2 USE_GNOME= cairo USE_XORG= pixman GH_ACCOUNT= WayfireWM +GH_TUPLE= WayfireWM:wf-utils:f9b5eba:wfutils/subprojects/wf-utils -OPTIONS_DEFINE= SUID -OPTIONS_DEFAULT=SUID +OPTIONS_DEFINE= SUID X11 +OPTIONS_DEFAULT=SUID X11 SUID_DESC= setuid bit on "${PORTNAME}" binary (required for DRM session) 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 .include <bsd.port.mk> Modified: head/x11-wm/wayfire/distinfo ============================================================================== --- head/x11-wm/wayfire/distinfo Tue Aug 4 20:34:55 2020 (r544184) +++ head/x11-wm/wayfire/distinfo Tue Aug 4 20:35:09 2020 (r544185) @@ -1,5 +1,5 @@ -TIMESTAMP = 1584817827 -SHA256 (WayfireWM-wayfire-0.4.0_GH0.tar.gz) = 9c009c01bccce97149d0695b5429cf44787fdc1423c58425ba8e8de601019e97 -SIZE (WayfireWM-wayfire-0.4.0_GH0.tar.gz) = 265360 -SHA256 (e5b6f1245709.patch) = 2c0f2c892ba299f84b47c64c96b2bb9704448808f6a8e536050cceb606653203 -SIZE (e5b6f1245709.patch) = 1249 +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 Added: head/x11-wm/wayfire/files/patch-private-wfutils ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/wayfire/files/patch-private-wfutils Tue Aug 4 20:35:09 2020 (r544185) @@ -0,0 +1,51 @@ +wf-utils is untagged and has no other consumers. Keep it private to +wayfire package for now. + +--- meson.build.orig 2020-08-04 18:56:17 UTC ++++ meson.build +@@ -41,7 +41,7 @@ if not use_system_wfconfig + wfconfig = subproject('wf-config').get_variable('wfconfig') + endif + +-wfutils = subproject('wf-utils').get_variable('wfutils') ++wfutils = subproject('wf-utils', default_options: ['default_library=static']).get_variable('wfutils') + + needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system()) + libinotify = dependency('libinotify', required: needs_libinotify) +--- subprojects/wf-utils/meson.build.orig 2020-05-11 09:28:45 UTC ++++ subprojects/wf-utils/meson.build +@@ -34,9 +34,10 @@ lib_wfutils = library('wf-utils', + sources, + dependencies: [], + include_directories: wfutils_inc, +- install: true, ++ install: not meson.is_subproject(), + version: meson.project_version()) + ++if not meson.is_subproject() + pkgconfig = import('pkgconfig') + pkgconfig.generate( + libraries: lib_wfutils, +@@ -44,6 +45,7 @@ pkgconfig.generate( + filebase: meson.project_name(), + name: meson.project_name(), + description: 'Utilities library for Wayfire') ++endif + + install_headers([], subdir: 'wayfire/utils') + +@@ -85,12 +87,14 @@ headers_root = [ + 'wayfire/variant.hpp', + ] + ++if not meson.is_subproject() + install_headers(headers_action, subdir: 'wayfire/action') + install_headers(headers_condition, subdir: 'wayfire/condition') + install_headers(headers_lexer, subdir: 'wayfire/lexer') + install_headers(headers_parser, subdir: 'wayfire/parser') + install_headers(headers_rule, subdir: 'wayfire/rule') + install_headers(headers_root, subdir: 'wayfire') ++endif + + # ------------------------------------------------------------------------------------------------- + # Unit tests Modified: head/x11-wm/wayfire/pkg-plist ============================================================================== --- head/x11-wm/wayfire/pkg-plist Tue Aug 4 20:34:55 2020 (r544184) +++ head/x11-wm/wayfire/pkg-plist Tue Aug 4 20:35:09 2020 (r544185) @@ -2,12 +2,14 @@ include/wayfire/bindings.hpp include/wayfire/compositor-surface.hpp include/wayfire/compositor-view.hpp +include/wayfire/config.h include/wayfire/core.hpp include/wayfire/debug.hpp include/wayfire/decorator.hpp include/wayfire/geometry.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 @@ -18,11 +20,18 @@ 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/preview-indication.hpp +include/wayfire/plugins/common/simple-texture.hpp +include/wayfire/plugins/common/view-change-viewport-signal.hpp +include/wayfire/plugins/common/workspace-wall.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 @@ -40,7 +49,6 @@ lib/wayfire/libfisheye.so lib/wayfire/libgrid.so lib/wayfire/libidle.so lib/wayfire/libinvert.so -lib/wayfire/libmatcher.so lib/wayfire/libmove.so lib/wayfire/liboswitch.so lib/wayfire/libplace.so @@ -50,6 +58,7 @@ 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 @@ -72,7 +81,6 @@ libdata/pkgconfig/wayfire.pc %%DATADIR%%/metadata/idle.xml %%DATADIR%%/metadata/input.xml %%DATADIR%%/metadata/invert.xml -%%DATADIR%%/metadata/matcher.xml %%DATADIR%%/metadata/move.xml %%DATADIR%%/metadata/oswitch.xml %%DATADIR%%/metadata/place.xml @@ -82,7 +90,9 @@ libdata/pkgconfig/wayfire.pc %%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 Modified: head/x11/wcm/Makefile ============================================================================== --- head/x11/wcm/Makefile Tue Aug 4 20:34:55 2020 (r544184) +++ head/x11/wcm/Makefile Tue Aug 4 20:35:09 2020 (r544185) @@ -2,8 +2,7 @@ PORTNAME= wcm DISTVERSIONPREFIX= v -DISTVERSION= 0.4.0 -PORTREVISION= 1 +DISTVERSION= 0.5.0 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -13,7 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayfire>0:x11-wm/wayfire + wayfire>0:x11-wm/wayfire \ + wf-shell>0:x11/wf-shell LIB_DEPENDS= libevdev.so:devel/libevdev \ libwf-config.so:devel/wf-config \ libwayland-client.so:graphics/wayland Modified: head/x11/wcm/distinfo ============================================================================== --- head/x11/wcm/distinfo Tue Aug 4 20:34:55 2020 (r544184) +++ head/x11/wcm/distinfo Tue Aug 4 20:35:09 2020 (r544185) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584642513 -SHA256 (WayfireWM-wcm-v0.4.0_GH0.tar.gz) = 8b03dbc9fad184c8e3277e8f5da68707148b3df9df6e042d848b80ee1c53b701 -SIZE (WayfireWM-wcm-v0.4.0_GH0.tar.gz) = 263841 +TIMESTAMP = 1596569376 +SHA256 (WayfireWM-wcm-v0.5.0_GH0.tar.gz) = 9cfcceefc838c8a0d547f5e40206901b282680da02a96490f756f7ad7da79341 +SIZE (WayfireWM-wcm-v0.5.0_GH0.tar.gz) = 253120 Modified: head/x11/wcm/pkg-plist ============================================================================== --- head/x11/wcm/pkg-plist Tue Aug 4 20:34:55 2020 (r544184) +++ head/x11/wcm/pkg-plist Tue Aug 4 20:35:09 2020 (r544185) @@ -9,16 +9,18 @@ share/icons/hicolor/72x72/apps/wcm.png share/icons/hicolor/96x96/apps/wcm.png %%DATADIR%%/icons/plugin-alpha.svg %%DATADIR%%/icons/plugin-animate.svg +%%DATADIR%%/icons/plugin-annotate.svg %%DATADIR%%/icons/plugin-autorotate-iio.svg %%DATADIR%%/icons/plugin-autostart.svg +%%DATADIR%%/icons/plugin-background-view.svg %%DATADIR%%/icons/plugin-background.svg +%%DATADIR%%/icons/plugin-bench.svg %%DATADIR%%/icons/plugin-blur.svg %%DATADIR%%/icons/plugin-command.svg %%DATADIR%%/icons/plugin-core.svg %%DATADIR%%/icons/plugin-cube.svg %%DATADIR%%/icons/plugin-decoration.svg %%DATADIR%%/icons/plugin-dock.svg -%%DATADIR%%/icons/plugin-example.svg %%DATADIR%%/icons/plugin-expo.svg %%DATADIR%%/icons/plugin-fast-switcher.svg %%DATADIR%%/icons/plugin-fisheye.svg @@ -26,7 +28,8 @@ share/icons/hicolor/96x96/apps/wcm.png %%DATADIR%%/icons/plugin-idle.svg %%DATADIR%%/icons/plugin-input.svg %%DATADIR%%/icons/plugin-invert.svg -%%DATADIR%%/icons/plugin-matcher.svg +%%DATADIR%%/icons/plugin-keycolor.svg +%%DATADIR%%/icons/plugin-mag.svg %%DATADIR%%/icons/plugin-move.svg %%DATADIR%%/icons/plugin-oswitch.svg %%DATADIR%%/icons/plugin-panel.svg @@ -36,8 +39,10 @@ share/icons/hicolor/96x96/apps/wcm.png %%DATADIR%%/icons/plugin-switcher.svg %%DATADIR%%/icons/plugin-vswipe.svg %%DATADIR%%/icons/plugin-vswitch.svg +%%DATADIR%%/icons/plugin-water.svg %%DATADIR%%/icons/plugin-wobbly.svg %%DATADIR%%/icons/plugin-workarounds.svg +%%DATADIR%%/icons/plugin-workspace-names.svg %%DATADIR%%/icons/plugin-wrot.svg %%DATADIR%%/icons/plugin-zoom.svg %%DATADIR%%/icons/wcm.png Modified: head/x11/wf-shell/Makefile ============================================================================== --- head/x11/wf-shell/Makefile Tue Aug 4 20:34:55 2020 (r544184) +++ head/x11/wf-shell/Makefile Tue Aug 4 20:35:09 2020 (r544185) @@ -1,12 +1,9 @@ # $FreeBSD$ PORTNAME= wf-shell -DISTVERSION= 0.4.0 +DISTVERSION= 0.5.0 CATEGORIES= x11 -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= d86538344ade1.patch:-p1 - MAINTAINER= jbeich@FreeBSD.org COMMENT= GTK3-based panel for wayfire @@ -14,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \ - wf-config>=0.4.0:devel/wf-config \ + wf-config>=0.5.0:devel/wf-config \ wayfire>0:x11-wm/wayfire LIB_DEPENDS= libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \ Modified: head/x11/wf-shell/distinfo ============================================================================== --- head/x11/wf-shell/distinfo Tue Aug 4 20:34:55 2020 (r544184) +++ head/x11/wf-shell/distinfo Tue Aug 4 20:35:09 2020 (r544185) @@ -1,7 +1,5 @@ -TIMESTAMP = 1584818331 -SHA256 (WayfireWM-wf-shell-0.4.0_GH0.tar.gz) = e86ed5e6c01abeec30755423096f094c62e24408ec4bd9c577383c7e01ce8126 -SIZE (WayfireWM-wf-shell-0.4.0_GH0.tar.gz) = 8948473 +TIMESTAMP = 1596263008 +SHA256 (WayfireWM-wf-shell-0.5.0_GH0.tar.gz) = 7e274d46009193129e763e383d2e91b579f4bd1468ed89386a3249f01410b40f +SIZE (WayfireWM-wf-shell-0.5.0_GH0.tar.gz) = 8948762 SHA256 (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 1c1d806ad1f57d7f644381b67ee87ef3e7e10f3a2da1432beef535ca50c0040f SIZE (GNOME-libgnome-volume-control-468022b_GH0.tar.gz) = 45503 -SHA256 (d86538344ade1.patch) = 7b75fc65fba06beadc01c691546a79f35286559072fca46981e3b4e7feee8bf7 -SIZE (d86538344ade1.patch) = 1074 Modified: head/x11/wf-shell/pkg-plist ============================================================================== --- head/x11/wf-shell/pkg-plist Tue Aug 4 20:34:55 2020 (r544184) +++ head/x11/wf-shell/pkg-plist Tue Aug 4 20:35:09 2020 (r544185) @@ -1,6 +1,7 @@ bin/wf-background bin/wf-dock bin/wf-panel +libdata/pkgconfig/wf-shell.pc %%DATADIR%%/icons/wayfire.png %%DATADIR%%/metadata/wf-shell/background.xml %%DATADIR%%/metadata/wf-shell/dock.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008042035.074KZAhY034848>