From: Landry Breuil Subject: [update] wayfire 0.9.0 (& wcm/wf-shell/wf-config) To: ports@openbsd.org Date: Mon, 26 Aug 2024 15:23:20 +0200 hi, here's a quick update for wayfire 0.9.0, cf https://wayfire.org/2024/08/23/Wayfire-0-9.html completely untested at runtime yet, but will try - just sending in case there are some wayland players. Landry ? wayfire/wayfire-0.8.1-libwf-utils.so.0.0 ? wayfire/wayfire-0.9.0-libwf-utils.so.0.0 ? wf-config/wf-config-0.8.0-libwf-config.so.0.0 ? wf-config/wf-config-0.9.0-libwf-config.so.0.0 Index: wayfire/Makefile =================================================================== RCS file: /cvs/ports/wayland/wayfire/Makefile,v diff -u -r1.7 Makefile --- wayfire/Makefile 2 Apr 2024 06:26:49 -0000 1.7 +++ wayfire/Makefile 26 Aug 2024 13:20:02 -0000 @@ -1,6 +1,6 @@ COMMENT = modular and extensible wayland compositor -V = 0.8.1 +V = 0.9.0 DISTNAME = wayfire-${V} SHARED_LIBS += wf-utils 0.0 # 0.0 @@ -26,6 +26,7 @@ CONFIGURE_ARGS =-Duse_system_wfconfig=enabled \ -Duse_system_wlroots=enabled \ + -Denable_openmp=false \ -Dtests=disabled LIB_DEPENDS = devel/pango \ Index: wayfire/distinfo =================================================================== RCS file: /cvs/ports/wayland/wayfire/distinfo,v diff -u -r1.2 distinfo --- wayfire/distinfo 2 Apr 2024 06:26:49 -0000 1.2 +++ wayfire/distinfo 26 Aug 2024 13:20:02 -0000 @@ -1,2 +1,2 @@ -SHA256 (wayfire-0.8.1.tar.xz) = isGUe2iKnsbE2e4tdzEbs1eo6tJWZbgADtqWlSMoKQ0= -SIZE (wayfire-0.8.1.tar.xz) = 856364 +SHA256 (wayfire-0.9.0.tar.xz) = 3QycCLinKi2MMxfIvmxCsXpJPCWrqx0CrAnCTqqVIp0= +SIZE (wayfire-0.9.0.tar.xz) = 875584 Index: wayfire/patches/patch-meson_build =================================================================== RCS file: /cvs/ports/wayland/wayfire/patches/patch-meson_build,v diff -u -r1.2 patch-meson_build --- wayfire/patches/patch-meson_build 2 Apr 2024 06:26:49 -0000 1.2 +++ wayfire/patches/patch-meson_build 26 Aug 2024 13:20:02 -0000 @@ -1,15 +1,15 @@ Index: meson.build --- meson.build.orig +++ meson.build -@@ -33,7 +33,6 @@ libinput = dependency('libinput', version: '>=1. +@@ -32,7 +32,6 @@ glm = dependency('glm', required: false) + libinput = dependency('libinput', version: '>=1.7.0') pixman = dependency('pixman-1') - threads = dependency('threads') xkbcommon = dependency('xkbcommon') -libdl = meson.get_compiler('cpp').find_library('dl') + json = dependency('nlohmann_json', version: '>= 3.11.2') # We're not to use system wlroots: So we'll use the subproject - if get_option('use_system_wlroots').disabled() -@@ -75,7 +74,7 @@ endif +@@ -114,7 +113,7 @@ backtrace = meson.get_compiler('cpp').find_library('ex wfutils = subproject('wf-utils').get_variable('wfutils') wftouch = subproject('wf-touch').get_variable('wftouch') Index: wayfire/patches/patch-src_meson_build =================================================================== RCS file: /cvs/ports/wayland/wayfire/patches/patch-src_meson_build,v diff -u -r1.2 patch-src_meson_build --- wayfire/patches/patch-src_meson_build 2 Apr 2024 06:26:49 -0000 1.2 +++ wayfire/patches/patch-src_meson_build 26 Aug 2024 13:20:02 -0000 @@ -9,10 +9,10 @@ wayfire_dependencies = [wayland_server, wlroots, xkbcommon, libinput, - pixman, drm, egl, glesv2, glm, wf_protos, libdl, + pixman, drm, egl, glesv2, glm, wf_protos, - wfconfig, libinotify, backtrace, wfutils, xcb, wftouch] + wfconfig, libinotify, backtrace, wfutils, xcb, wftouch, json] if conf_data.get('BUILD_WITH_IMAGEIO') -@@ -131,6 +131,7 @@ shared_module('default-config-backend', 'default-confi +@@ -134,6 +134,7 @@ shared_module('default-config-backend', 'default-confi dependencies: wayfire_dependencies, include_directories: [wayfire_conf_inc, wayfire_api_inc], cpp_args: debug_arguments, Index: wayfire/pkg/PLIST =================================================================== RCS file: /cvs/ports/wayland/wayfire/pkg/PLIST,v diff -u -r1.2 PLIST --- wayfire/pkg/PLIST 2 Apr 2024 06:26:49 -0000 1.2 +++ wayfire/pkg/PLIST 26 Aug 2024 13:20:02 -0000 @@ -55,11 +55,14 @@ 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-text-node.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/input-method-v1/ +include/wayfire/plugins/input-method-v1/input-method-v1.hpp include/wayfire/plugins/ipc/ include/wayfire/plugins/ipc/ipc-activator.hpp include/wayfire/plugins/ipc/ipc-helpers.hpp @@ -91,6 +94,8 @@ include/wayfire/txn/transaction.hpp include/wayfire/unstable/ include/wayfire/unstable/translation-node.hpp +include/wayfire/unstable/wlr-subsurface-controller.hpp +include/wayfire/unstable/wlr-surface-controller.hpp include/wayfire/unstable/wlr-surface-node.hpp include/wayfire/unstable/wlr-text-input-v3-popup.hpp include/wayfire/unstable/wlr-view-events.hpp @@ -142,6 +147,7 @@ @so lib/wayfire/libresize.so @so lib/wayfire/libscale-title-filter.so @so lib/wayfire/libscale.so +@so lib/wayfire/libsession-lock.so @so lib/wayfire/libshortcuts-inhibit.so @so lib/wayfire/libsimple-tile.so @so lib/wayfire/libstipc.so @@ -155,6 +161,7 @@ @so lib/wayfire/libwrot.so @so lib/wayfire/libwsets.so @so lib/wayfire/libxdg-activation.so +@so lib/wayfire/libxkb-bindings.so @so lib/wayfire/libzoom.so @man man/man1/wayfire.1 share/examples/wayfire/ @@ -191,6 +198,7 @@ share/wayfire/metadata/resize.xml share/wayfire/metadata/scale-title-filter.xml share/wayfire/metadata/scale.xml +share/wayfire/metadata/session-lock.xml share/wayfire/metadata/shortcuts-inhibit.xml share/wayfire/metadata/simple-tile.xml share/wayfire/metadata/switcher.xml Index: wcm/Makefile =================================================================== RCS file: /cvs/ports/wayland/wcm/Makefile,v diff -u -r1.1.1.1 Makefile --- wcm/Makefile 21 Dec 2023 16:19:21 -0000 1.1.1.1 +++ wcm/Makefile 26 Aug 2024 13:20:02 -0000 @@ -1,9 +1,8 @@ COMMENT = wayfire graphical configuration manager -V = 0.8.0 +V = 0.9.0 DISTNAME = wcm-${V} -SHARED_LIBS += wf-wcm 0.0 # 0.0 CATEGORIES = wayland MAINTAINER = Landry Breuil @@ -16,7 +15,7 @@ MODULES = devel/meson BUILD_DEPENDS = wayland/wayland-protocols\ - wayland/wayfire \ + wayland/wayfire>=0.9.0 \ wayland/wf-shell \ LIB_DEPENDS = wayland/wayland \ Index: wcm/distinfo =================================================================== RCS file: /cvs/ports/wayland/wcm/distinfo,v diff -u -r1.1.1.1 distinfo --- wcm/distinfo 21 Dec 2023 16:19:21 -0000 1.1.1.1 +++ wcm/distinfo 26 Aug 2024 13:20:02 -0000 @@ -1,2 +1,2 @@ -SHA256 (wcm-0.8.0.tar.xz) = Ya7zzqt/XBaWZGLELZi9BYDUWzRqhtAp3z5iW5vBO7o= -SIZE (wcm-0.8.0.tar.xz) = 430960 +SHA256 (wcm-0.9.0.tar.xz) = jIYFzLcg+yTljxbC4nJ80HtnVL1EHJo/DnFVSLTnxK4= +SIZE (wcm-0.9.0.tar.xz) = 434076 Index: wcm/patches/patch-src_wcm_cpp =================================================================== RCS file: /cvs/ports/wayland/wcm/patches/patch-src_wcm_cpp,v diff -u -r1.1.1.1 patch-src_wcm_cpp --- wcm/patches/patch-src_wcm_cpp 21 Dec 2023 16:19:21 -0000 1.1.1.1 +++ wcm/patches/patch-src_wcm_cpp 26 Aug 2024 13:20:02 -0000 @@ -1,15 +1,15 @@ Index: src/wcm.cpp --- src/wcm.cpp.orig +++ src/wcm.cpp -@@ -6,7 +6,6 @@ - #include +@@ -7,7 +7,6 @@ #include #include + #include -#include #define OUTPUT_CONFIG_PROGRAM "wdisplays" -@@ -1507,15 +1506,6 @@ void WCM::open_page(Plugin *plugin) +@@ -1604,15 +1603,6 @@ void WCM::open_page(Plugin *plugin) current_plugin = plugin; } @@ -25,7 +25,7 @@ void WCM::load_config_files() { const char *wf_config_file_override = getenv("WAYFIRE_CONFIG_FILE"); -@@ -1523,7 +1513,7 @@ void WCM::load_config_files() +@@ -1620,7 +1610,7 @@ void WCM::load_config_files() if (wf_config_file.empty()) { @@ -34,7 +34,7 @@ } std::vector wayfire_xmldirs; -@@ -1546,8 +1536,7 @@ void WCM::load_config_files() +@@ -1643,8 +1633,7 @@ void WCM::load_config_files() if (wf_shell_config_file.empty()) { Index: wcm/patches/patch-src_wcm_hpp =================================================================== RCS file: wcm/patches/patch-src_wcm_hpp diff -N wcm/patches/patch-src_wcm_hpp --- wcm/patches/patch-src_wcm_hpp 21 Dec 2023 16:19:21 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -https://github.com/WayfireWM/wcm/commit/aade4224e23e2c204e9e6a9d5f53437490b0cda8 - -Index: src/wcm.hpp ---- src/wcm.hpp.orig -+++ src/wcm.hpp -@@ -27,6 +27,7 @@ - #pragma once - - #include -+#include - #include - #include - #include Index: wcm/pkg/PLIST =================================================================== RCS file: /cvs/ports/wayland/wcm/pkg/PLIST,v diff -u -r1.1.1.1 PLIST --- wcm/pkg/PLIST 21 Dec 2023 16:19:21 -0000 1.1.1.1 +++ wcm/pkg/PLIST 26 Aug 2024 13:20:02 -0000 @@ -47,6 +47,7 @@ share/wayfire/icons/plugin-lxqt-shell.svg share/wayfire/icons/plugin-mag.svg share/wayfire/icons/plugin-move.svg +share/wayfire/icons/plugin-obs.svg share/wayfire/icons/plugin-oswitch.svg share/wayfire/icons/plugin-panel.svg share/wayfire/icons/plugin-place.svg Index: wf-config/Makefile =================================================================== RCS file: /cvs/ports/wayland/wf-config/Makefile,v diff -u -r1.5 Makefile --- wf-config/Makefile 5 Apr 2024 12:39:33 -0000 1.5 +++ wf-config/Makefile 26 Aug 2024 13:20:02 -0000 @@ -1,10 +1,9 @@ COMMENT = configuration files library for wayfire -V = 0.8.0 +V = 0.9.0 DISTNAME = wf-config-${V} -REVISION = 0 -SHARED_LIBS += wf-config 0.0 # 0.0 +SHARED_LIBS += wf-config 0.1 # 0.0 CATEGORIES = wayland MAINTAINER = Landry Breuil Index: wf-config/distinfo =================================================================== RCS file: /cvs/ports/wayland/wf-config/distinfo,v diff -u -r1.1.1.1 distinfo --- wf-config/distinfo 21 Dec 2023 16:17:10 -0000 1.1.1.1 +++ wf-config/distinfo 26 Aug 2024 13:20:02 -0000 @@ -1,2 +1,2 @@ -SHA256 (wf-config-0.8.0.tar.xz) = FpiPY/0FS0RtT+rAJKr9TMliGT1tbf3pDm1hacI0Q68= -SIZE (wf-config-0.8.0.tar.xz) = 41200 +SHA256 (wf-config-0.9.0.tar.xz) = 9oH+AoqpAm4MaJTXuUxUQjC4KFB48XYHaj2WT9Hfw3s= +SIZE (wf-config-0.9.0.tar.xz) = 42612 Index: wf-shell/Makefile =================================================================== RCS file: /cvs/ports/wayland/wf-shell/Makefile,v diff -u -r1.4 Makefile --- wf-shell/Makefile 27 Mar 2024 16:39:55 -0000 1.4 +++ wf-shell/Makefile 26 Aug 2024 13:20:02 -0000 @@ -1,6 +1,6 @@ COMMENT = GTK3-based panel for wayfire -V = 0.8.1 +V = 0.9.0 DISTNAME = wf-shell-${V} CATEGORIES = wayland Index: wf-shell/distinfo =================================================================== RCS file: /cvs/ports/wayland/wf-shell/distinfo,v diff -u -r1.2 distinfo --- wf-shell/distinfo 27 Mar 2024 16:39:55 -0000 1.2 +++ wf-shell/distinfo 26 Aug 2024 13:20:02 -0000 @@ -1,2 +1,2 @@ -SHA256 (wf-shell-0.8.1.tar.xz) = xUywaF9V+kSmLFWxtk+BYwt4ew5ngTSGroWSH7X3mzg= -SIZE (wf-shell-0.8.1.tar.xz) = 9161772 +SHA256 (wf-shell-0.9.0.tar.xz) = yKxSm5+mpPZb1DAUA5S2tqSGx7Le9sIrgROWYSupS7Q= +SIZE (wf-shell-0.9.0.tar.xz) = 9167256 Index: wf-shell/patches/patch-src_background_background_cpp =================================================================== RCS file: /cvs/ports/wayland/wf-shell/patches/patch-src_background_background_cpp,v diff -u -r1.2 patch-src_background_background_cpp --- wf-shell/patches/patch-src_background_background_cpp 27 Mar 2024 16:39:55 -0000 1.2 +++ wf-shell/patches/patch-src_background_background_cpp 26 Aug 2024 13:20:02 -0000 @@ -6,7 +6,7 @@ #include #include #include -@@ -124,24 +123,9 @@ bool WayfireBackground::change_background() +@@ -167,24 +166,9 @@ bool WayfireBackground::change_background() bool WayfireBackground::load_images_from_dir(std::string path) { @@ -32,7 +32,7 @@ return false; } -@@ -155,7 +139,7 @@ bool WayfireBackground::load_images_from_dir(std::stri +@@ -198,7 +182,7 @@ bool WayfireBackground::load_images_from_dir(std::stri continue; } @@ -41,7 +41,7 @@ struct stat next; if (stat(fullpath.c_str(), &next) == 0) -@@ -170,8 +154,6 @@ bool WayfireBackground::load_images_from_dir(std::stri +@@ -213,8 +197,6 @@ bool WayfireBackground::load_images_from_dir(std::stri } } } Index: wf-shell/patches/patch-src_panel_meson_build =================================================================== RCS file: /cvs/ports/wayland/wf-shell/patches/patch-src_panel_meson_build,v diff -u -r1.1.1.1 patch-src_panel_meson_build --- wf-shell/patches/patch-src_panel_meson_build 21 Dec 2023 16:18:12 -0000 1.1.1.1 +++ wf-shell/patches/patch-src_panel_meson_build 26 Aug 2024 13:20:02 -0000 @@ -1,7 +1,7 @@ Index: src/panel/meson.build --- src/panel/meson.build.orig +++ src/panel/meson.build -@@ -16,7 +16,7 @@ widget_sources = ['widgets/battery.cpp', +@@ -17,7 +17,7 @@ widget_sources = ['widgets/battery.cpp', 'widgets/tray/item.cpp', 'widgets/tray/host.cpp'] @@ -10,7 +10,7 @@ if libpulse.found() widget_sources += 'widgets/volume.cpp' -@@ -25,4 +25,5 @@ endif +@@ -26,4 +26,5 @@ endif executable('wf-panel', ['panel.cpp'] + widget_sources, dependencies: deps, Index: wf-shell/pkg/PLIST =================================================================== RCS file: /cvs/ports/wayland/wf-shell/pkg/PLIST,v diff -u -r1.2 PLIST --- wf-shell/pkg/PLIST 27 Mar 2024 16:39:55 -0000 1.2 +++ wf-shell/pkg/PLIST 26 Aug 2024 13:20:02 -0000 @@ -15,6 +15,8 @@ share/icons/hicolor/96x96/apps/wayfire.png share/icons/hicolor/scalable/apps/wayfire.svg share/wayfire/ +share/wayfire/css/ +share/wayfire/css/default.css share/wayfire/icons/ share/wayfire/icons/wayfire.png share/wayfire/metadata/