diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-12-05 00:52:16 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2023-12-05 02:19:03 +0000 |
| commit | ca9b785803a65687f4ec1ee2dbc28f33f7868239 (patch) | |
| tree | 2ff54f486fce1de03f03b653e6cecb76397609b0 | |
| parent | 254231223bab2e21505ab5ef5a122694de2a792f (diff) | |
| download | ports-ca9b785803a65687f4ec1ee2dbc28f33f7868239.tar.gz ports-ca9b785803a65687f4ec1ee2dbc28f33f7868239.zip | |
x11-wm/hyprland: update to 0.33.0
Changes: https://github.com/hyprwm/Hyprland/releases/tag/v0.33.0
Reported by: GitHub (watch releases)
| -rw-r--r-- | x11-wm/hyprland/Makefile | 3 | ||||
| -rw-r--r-- | x11-wm/hyprland/distinfo | 6 | ||||
| -rw-r--r-- | x11-wm/hyprland/files/patch-wlroots-0.17 | 54 |
3 files changed, 58 insertions, 5 deletions
diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 1d3661038ca8..a64c2cfa3f94 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,7 +1,6 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v -DISTVERSION= 0.32.3 -PORTREVISION= 3 +DISTVERSION= 0.33.0 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index e1de3673c29d..febfb06c462b 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1699726486 -SHA256 (hyprwm-Hyprland-v0.32.3_GH0.tar.gz) = 880d5496ec0352983579398f3e202fa2b9bd3808a4e3f2420cdde5d2ddc41a9c -SIZE (hyprwm-Hyprland-v0.32.3_GH0.tar.gz) = 7343127 +TIMESTAMP = 1701737536 +SHA256 (hyprwm-Hyprland-v0.33.0_GH0.tar.gz) = 802bba6ba638fc841ee9b7e05258a78db91f103be26bd00ef5bcf5da295df1c0 +SIZE (hyprwm-Hyprland-v0.33.0_GH0.tar.gz) = 7350504 SHA256 (hyprwm-hyprland-protocols-v0.2-4-g0c2ce70_GH0.tar.gz) = d8eb9712d66a167a22a0dae829b6dba2b85814b566d0a87918c944e7c0388d1b SIZE (hyprwm-hyprland-protocols-v0.2-4-g0c2ce70_GH0.tar.gz) = 6478 SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff6247b375b92e797221dbd8e078eabbf1366280b0532617e7fb8 diff --git a/x11-wm/hyprland/files/patch-wlroots-0.17 b/x11-wm/hyprland/files/patch-wlroots-0.17 new file mode 100644 index 000000000000..f489a10606b1 --- /dev/null +++ b/x11-wm/hyprland/files/patch-wlroots-0.17 @@ -0,0 +1,54 @@ +Revert to wlroots 0.17 API as 0.18 is a moving target, so hard to +use as system package with more than one consumer. + +https://github.com/hyprwm/hyprland/commit/2ebfd0c7456e +https://github.com/hyprwm/hyprland/commit/d2c3b23ace74 + +--- src/Compositor.cpp.orig 2023-11-30 15:20:08 UTC ++++ src/Compositor.cpp +@@ -190,7 +190,7 @@ void CCompositor::initServer() { + + m_sWLRGammaCtrlMgr = wlr_gamma_control_manager_v1_create(m_sWLDisplay); + +- m_sWLROutputLayout = wlr_output_layout_create(m_sWLDisplay); ++ m_sWLROutputLayout = wlr_output_layout_create(); + + m_sWLROutputPowerMgr = wlr_output_power_manager_v1_create(m_sWLDisplay); + +@@ -282,7 +282,7 @@ void CCompositor::initAllSignals() { + + void CCompositor::initAllSignals() { + addWLSignal(&m_sWLRBackend->events.new_output, &Events::listen_newOutput, m_sWLRBackend, "Backend"); +- addWLSignal(&m_sWLRXDGShell->events.new_toplevel, &Events::listen_newXDGToplevel, m_sWLRXDGShell, "XDG Shell"); ++ addWLSignal(&m_sWLRXDGShell->events.new_surface, &Events::listen_newXDGToplevel, m_sWLRXDGShell, "XDG Shell"); + addWLSignal(&m_sWLRCursor->events.motion, &Events::listen_mouseMove, m_sWLRCursor, "WLRCursor"); + addWLSignal(&m_sWLRCursor->events.motion_absolute, &Events::listen_mouseMoveAbsolute, m_sWLRCursor, "WLRCursor"); + addWLSignal(&m_sWLRCursor->events.button, &Events::listen_mouseButton, m_sWLRCursor, "WLRCursor"); +--- src/events/Windows.cpp.orig 2023-11-30 15:20:08 UTC ++++ src/events/Windows.cpp +@@ -1171,10 +1171,12 @@ void Events::listener_newXDGToplevel(wl_listener* list + + void Events::listener_newXDGToplevel(wl_listener* listener, void* data) { + // A window got opened +- const auto XDGTOPLEVEL = (wlr_xdg_toplevel*)data; +- const auto XDGSURFACE = XDGTOPLEVEL->base; ++ const auto XDGSURFACE = (wlr_xdg_surface*)data; + +- Debug::log(LOG, "New XDG Toplevel created. (class: {})", XDGSURFACE->toplevel->app_id ? XDGSURFACE->toplevel->app_id : "null"); ++ if (XDGSURFACE->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) ++ return; ++ ++ Debug::log(LOG, "New XDG Surface created. (class: {})", XDGSURFACE->toplevel->app_id ? XDGSURFACE->toplevel->app_id : "null"); + + const auto PNEWWINDOW = g_pCompositor->m_vWindows.emplace_back(std::make_unique<CWindow>()).get(); + PNEWWINDOW->m_uSurface.xdg = XDGSURFACE; +--- src/includes.hpp.orig 2023-11-30 15:20:08 UTC ++++ src/includes.hpp +@@ -105,7 +105,6 @@ extern "C" { + #include <wlr/types/wlr_cursor_shape_v1.h> + #include <wlr/types/wlr_tearing_control_v1.h> + #include <wlr/util/box.h> +-#include <wlr/util/transform.h> + #include <wlr/render/swapchain.h> + #include <wlr/render/egl.h> + |