diff --git a/main/waybar/.checksums b/main/waybar/.checksums index c82c81583..3a7494f24 100644 --- a/main/waybar/.checksums +++ b/main/waybar/.checksums @@ -1 +1 @@ -291120b9d4705dd11577a8e15f36f876 waybar-0.9.23.tar.gz +2048ce64800d84e2e57fc33fe5faf279 waybar-0.9.24.tar.gz diff --git a/main/waybar/.pkgfiles b/main/waybar/.pkgfiles index 5a63c0668..13a7ea1e3 100644 --- a/main/waybar/.pkgfiles +++ b/main/waybar/.pkgfiles @@ -1,4 +1,4 @@ -waybar-0.9.23-1 +waybar-0.9.24-1 drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/xdg/ drwxr-xr-x root/root etc/xdg/waybar/ diff --git a/main/waybar/spkgbuild b/main/waybar/spkgbuild index a51ecf831..d6d71e0a2 100755 --- a/main/waybar/spkgbuild +++ b/main/waybar/spkgbuild @@ -1,15 +1,24 @@ # description : Highly customizable Wayland bar for Sway and Wlroots based compositors # depends : gtkmm3 jsoncpp wayland fmt spdlog gobject-introspection pulseaudio libnl libappindicator libmpdclient libdbusmenu wayland-protocols meson playerctl - name=waybar -version=0.9.23 +name=waybar +version=0.9.24 release=1 +backup=/etc/xdg/waybar/config +backup=/etc/xdg/waybar/style.css source="$name-$version.tar.gz::https://github.com/Alexays/Waybar/archive/$version.tar.gz" build() { + hyp() { + sed -i \ + 's/zext_workspace_handle_v1_activate(workspace_handle_);/const std::string command = "hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());/g' \ + Waybar-$version/src/modules/wlr/workspace_manager.cpp + } + + scratch isinstalled hyprland && hyp + venom-meson Waybar-$version build \ - --wrap-mode=default \ -Ddbusmenu-gtk=enabled \ -Dgtk-layer-shell=enabled \ -Dlibevdev=disabled \ @@ -25,8 +34,8 @@ build() { -Dcava=disabled \ -Dexperimental=true \ -Dtests=disabled - ninja -C build - DESTDIR=$PKG ninja -C build install + meson compile -C build + DESTDIR=$PKG meson install --no-rebuild -C build }