x11-toolkits/wlroots: update to 0.11.0

Changes:	https://github.com/swaywm/wlroots/releases/tag/0.11.0
Reported by:	GitHub (watch releases)

7 files changed, 181 insertions, 6 deletions

diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile
index 0e7013798ec2..e5c3b4c50b9d 100644
--- a/x11-wm/cage/Makefile
+++ b/x11-wm/cage/Makefile
@@ -4,9 +4,12 @@ PORTNAME=	cage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1-77
 DISTVERSIONSUFFIX=	-gbd961db
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	6a12da196068.patch:-p1 # https://github.com/Hjdskes/cage/pull/145
+PATCHFILES+=	3575c9180bc0.patch:-p1 # https://github.com/Hjdskes/cage/pull/145
 PATCHFILES+=	70ecdcb02ea0.patch:-p1 # https://github.com/Hjdskes/cage/pull/148
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -17,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
-		wlroots>=0.9.1:x11-toolkits/wlroots
+		wlroots>=0.11.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
diff --git a/x11-wm/cage/distinfo b/x11-wm/cage/distinfo
index bddaacedad8f..ad9163267ccf 100644
--- a/x11-wm/cage/distinfo
+++ b/x11-wm/cage/distinfo
@@ -1,5 +1,9 @@
 TIMESTAMP = 1593197771
 SHA256 (Hjdskes-cage-v0.1.1-77-gbd961db_GH0.tar.gz) = 743b9df84289c8bb4405c9d92398927d8f60ce87c75dcd47c543cbee20a7f293
 SIZE (Hjdskes-cage-v0.1.1-77-gbd961db_GH0.tar.gz) = 24446
+SHA256 (6a12da196068.patch) = 9c296d65935e89155e8a0a85a402fc6d9a78563bfa0b26795fd21416d5d3e71e
+SIZE (6a12da196068.patch) = 781
+SHA256 (3575c9180bc0.patch) = 5f69a0157b05de9e2714f00630c6972b3c711634b1de358ce4131ffe2d40b2b5
+SIZE (3575c9180bc0.patch) = 924
 SHA256 (70ecdcb02ea0.patch) = 2dd0e99d181986c6b2d5e04e89f692e3d77b8bd2a3a08f94cf8a27b38489eb3c
 SIZE (70ecdcb02ea0.patch) = 2137
diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
index 5e0a75084881..925fdc40fbcd 100644
--- a/x11-wm/hikari/Makefile
+++ b/x11-wm/hikari/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	hikari
 DISTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://hikari.acmelabs.space/releases/
 
@@ -13,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
-		wlroots>=0.9.0<0.11.0:x11-toolkits/wlroots
+		wlroots>=0.9.0<0.12.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libinput.so:x11/libinput \
 		libucl.so:textproc/libucl \
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index ee589021668f..6544a7e4d291 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -2,10 +2,17 @@
 
 PORTNAME=	sway
 DISTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	9d0aa0cb8396.patch:-p1 # wlroots 0.11
+PATCHFILES+=	3a5d9b3b32a3.patch:-p1 # wlroots 0.11
+PATCHFILES+=	40e87fa98afd.patch:-p1 # wlroots 0.11
+PATCHFILES+=	f55de073c2a1.patch:-p1 # wlroots 0.11
+PATCHFILES+=	91c0ffd6cf1f.patch:-p1 # wlroots 0.11
+PATCHFILES+=	76adcc3fd3ac.patch:-p1 # wlroots 0.11
+PATCHFILES+=	9f944ff05d8b.patch:-p1 # wlroots 0.11
 PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
 PATCHFILES+=	f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090
 
@@ -17,7 +24,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
-		wlroots>=0.9.0<0.11.0:x11-toolkits/wlroots
+		wlroots>=0.11.0<0.12.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libevdev.so:devel/libevdev \
 		libpcre.so:devel/pcre \
diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo
index dc8558b9d9ff..0df49e6a5fdb 100644
--- a/x11-wm/sway/distinfo
+++ b/x11-wm/sway/distinfo
@@ -1,6 +1,20 @@
 TIMESTAMP = 1579718009
 SHA256 (swaywm-sway-1.4_GH0.tar.gz) = e2805291fc01d49e21dda4b273e38170d1fff4e1757215439729edbed880dfbe
 SIZE (swaywm-sway-1.4_GH0.tar.gz) = 5514489
+SHA256 (9d0aa0cb8396.patch) = 0a3630fbd33926805f8df6aba2320ed08e13838f88cfb8a4f9987a7e5843d227
+SIZE (9d0aa0cb8396.patch) = 2289
+SHA256 (3a5d9b3b32a3.patch) = f03d7dc16e8fca2605c8e895d5d6e9da8da16fb725c640b1bd45f9e1bdf58edc
+SIZE (3a5d9b3b32a3.patch) = 1202
+SHA256 (40e87fa98afd.patch) = 705c08b2cc72826b71b2df4179d84cb04f61746bc2285fd0cbdfbb27aa0d0c44
+SIZE (40e87fa98afd.patch) = 937
+SHA256 (f55de073c2a1.patch) = 25e363542257f1528ce6caeb6b4a75b5ecb762cf388f3d0714015c60b559db2b
+SIZE (f55de073c2a1.patch) = 1572
+SHA256 (91c0ffd6cf1f.patch) = aef192c7584857e6b4927605d0fdd84de9661e213a343f23cb55853a3a9f5deb
+SIZE (91c0ffd6cf1f.patch) = 967
+SHA256 (76adcc3fd3ac.patch) = fac5e73de21ebca1d6cc4d9fa1bdeca05edaf65850599141470afa89cb156260
+SIZE (76adcc3fd3ac.patch) = 1488
+SHA256 (9f944ff05d8b.patch) = 0f44daed01f9f4990c36bf2b2123cf8c102524b8b4a466d95fd6f2e51a3e12d6
+SIZE (9f944ff05d8b.patch) = 718
 SHA256 (cd9d1038a822.patch) = 4183dffdf4e3dbe70302d7e6e665cc83243a7166cf9bc2b8aacd7d56a9876069
 SIZE (cd9d1038a822.patch) = 8946
 SHA256 (f98ca3ab7ca1.patch) = 319a9658ea12403e6c73ed0c2c6f0deffd23ebe25b6ba81d7573f9984be95760
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index 836ef686e247..31482267d775 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wayfire
 DISTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \
 		wayland-protocols>=1.12:graphics/wayland-protocols \
 		glm>=0.9.8:math/glm \
-		wlroots>=0.9.0<0.11.0:x11-toolkits/wlroots
+		wlroots>=0.11.0<0.12.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libinotify.so:devel/libinotify \
 		libwf-config.so:devel/wf-config \
 		libpng.so:graphics/png \
diff --git a/x11-wm/wayfire/files/patch-wlroots-0.11 b/x11-wm/wayfire/files/patch-wlroots-0.11
new file mode 100644
index 000000000000..109b9ae9b562
--- /dev/null
+++ b/x11-wm/wayfire/files/patch-wlroots-0.11
@@ -0,0 +1,146 @@
+https://github.com/WayfireWM/wayfire/commit/0d6cecd27799
+https://github.com/WayfireWM/wayfire/commit/187b525c16d1
+https://github.com/WayfireWM/wayfire/commit/29dcd1387700
+https://github.com/WayfireWM/wayfire/commit/0e4e29acb3e9
+
+--- meson.build.orig	2020-03-21 19:10:27 UTC
++++ meson.build
+@@ -29,7 +29,7 @@ libinput       = dependency('libinput', version: '>=1.
+ pixman         = dependency('pixman-1')
+ threads        = dependency('threads')
+ xkbcommon      = dependency('xkbcommon')
+-wlroots        = dependency('wlroots', version: ['>=0.9.0', '<0.11.0'], required: get_option('use_system_wlroots'))
++wlroots        = dependency('wlroots', version: ['>=0.11.0', '<0.12.0'], required: get_option('use_system_wlroots'))
+ wfconfig       = dependency('wf-config', version: ['>=0.4.0', '<0.5.0'], required: get_option('use_system_wfconfig'))
+ 
+ use_system_wlroots = not get_option('use_system_wlroots').disabled() and wlroots.found()
+--- src/api/wayfire/core.hpp.orig	2020-03-21 19:10:27 UTC
++++ src/api/wayfire/core.hpp
+@@ -226,11 +226,12 @@ class compositor_core_t : public wf::object_base_t
+     std::string wayland_display;
+ 
+     /**
+-     * Return the xwayland display number.
++     * Return the xwayland display name.
+      *
+-     * This returns -1 if xwayland is not available
++     * @return The xwayland display name, or empty string if xwayland is not
++     *   available.
+      */
+-    virtual int get_xwayland_display() = 0;
++    virtual std::string get_xwayland_display() = 0;
+ 
+     /**
+      * Execute the given command in a bash shell.
+--- src/core/core-impl.hpp.orig	2020-03-21 19:10:27 UTC
++++ src/core/core-impl.hpp
+@@ -75,7 +75,7 @@ class compositor_core_impl_t : public compositor_core_
+     int focus_layer(uint32_t layer, int request) override;
+     void unfocus_layer(int request) override;
+     uint32_t get_focused_layer() override;
+-    int get_xwayland_display() override;
++    std::string get_xwayland_display() override;
+     void run(std::string command) override;
+ 
+   private:
+--- src/core/core.cpp.orig	2020-03-21 19:10:27 UTC
++++ src/core/core.cpp
+@@ -548,9 +548,8 @@ void wf::compositor_core_impl_t::run(std::string comma
+             setenv("_JAVA_AWT_WM_NONREPARENTING", "1", 1);
+             setenv("WAYLAND_DISPLAY", wayland_display.c_str(), 1);
+ #if WLR_HAS_XWAYLAND
+-            if (xwayland_get_display() >= 0) {
+-                auto xdisp = ":" + std::to_string(xwayland_get_display());
+-                setenv("DISPLAY", xdisp.c_str(), 1);
++            if (!xwayland_get_display().empty()) {
++                setenv("DISPLAY", xwayland_get_display().c_str(), 1);
+             }
+ #endif
+             int dev_null = open("/dev/null", O_WRONLY);
+@@ -567,7 +566,7 @@ void wf::compositor_core_impl_t::run(std::string comma
+     }
+ }
+ 
+-int wf::compositor_core_impl_t::get_xwayland_display()
++std::string wf::compositor_core_impl_t::get_xwayland_display()
+ {
+     return xwayland_get_display();
+ }
+--- src/core/seat/keyboard.cpp.orig	2020-03-21 19:10:27 UTC
++++ src/core/seat/keyboard.cpp
+@@ -113,15 +113,20 @@ void input_manager::set_keyboard_focus(wayfire_view vi
+     if (!active_grab)
+     {
+         auto kbd = wlr_seat_get_keyboard(seat);
+-        wlr_seat_keyboard_notify_enter(seat, surface,
+-            kbd ? kbd->keycodes : NULL,
+-            kbd ? kbd->num_keycodes : 0,
+-            kbd ? &kbd->modifiers : NULL);
++        if (surface)
++        {
++            wlr_seat_keyboard_notify_enter(seat, surface,
++                kbd ? kbd->keycodes : NULL,
++                kbd ? kbd->num_keycodes : 0,
++                kbd ? &kbd->modifiers : NULL);
++        } else {
++            wlr_seat_keyboard_clear_focus(seat);
++        }
+         keyboard_focus = view;
+     }
+     else
+     {
+-        wlr_seat_keyboard_notify_enter(seat, NULL, NULL, 0, NULL);
++        wlr_seat_keyboard_clear_focus(seat);
+         keyboard_focus = nullptr;
+     }
+ }
+--- src/core/seat/pointer.cpp.orig	2020-03-21 19:10:27 UTC
++++ src/core/seat/pointer.cpp
+@@ -116,7 +116,7 @@ void wf::LogicalPointer::update_cursor_focus(wf::surfa
+ 
+     cursor_focus = focus;
+     wlr_surface *next_focus_wlr_surface = nullptr;
+-    if (focus && !compositor_surface_from_surface(focus))
++    if (focus && focus->get_wlr_surface())
+     {
+         next_focus_wlr_surface = focus->get_wlr_surface();
+         wlr_seat_pointer_notify_enter(input->seat, next_focus_wlr_surface,
+--- src/view/surface.cpp.orig	2020-03-21 19:10:27 UTC
++++ src/view/surface.cpp
+@@ -322,7 +322,7 @@ void wf::wlr_surface_base_t::unmap()
+ wlr_buffer* wf::wlr_surface_base_t::get_buffer()
+ {
+     if (surface && wlr_surface_has_buffer(surface))
+-        return surface->buffer;
++        return &surface->buffer->base;
+ 
+     return nullptr;
+ }
+--- src/view/view-impl.hpp.orig	2020-03-21 19:10:27 UTC
++++ src/view/view-impl.hpp
+@@ -204,7 +204,7 @@ void init_xwayland();
+ void init_layer_shell();
+ 
+ void xwayland_set_seat(wlr_seat *seat);
+-int xwayland_get_display();
++std::string xwayland_get_display();
+ 
+ void init_desktop_apis();
+ }
+--- src/view/xwayland.cpp.orig	2020-03-21 19:10:27 UTC
++++ src/view/xwayland.cpp
+@@ -567,11 +567,11 @@ void wf::xwayland_set_seat(wlr_seat *seat)
+ #endif
+ }
+ 
+-int wf::xwayland_get_display()
++std::string wf::xwayland_get_display()
+ {
+ #if WLR_HAS_XWAYLAND
+-    return xwayland_handle ? xwayland_handle->display : -1;
++    return xwayland_handle ? nonull(xwayland_handle->display_name) : "";
+ #else
+-    return -1;
++    return "";
+ #endif
+ }