Hello community, here is the log from the commit of package cage for openSUSE:Factory checked in at 2020-01-24 13:11:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cage (Old) and /work/SRC/openSUSE:Factory/.cage.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cage" Fri Jan 24 13:11:43 2020 rev:2 rq:766649 version:0.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cage/cage.changes 2019-06-04 12:14:45.295774327 +0200 +++ /work/SRC/openSUSE:Factory/.cage.new.26092/cage.changes 2020-01-24 13:12:31.937466062 +0100 @@ -1,0 +2,5 @@ +Thu Jan 23 15:22:35 UTC 2020 - Michael Vetter <mvet...@suse.com> + +- Add cage-0.1.1-new-wlroots.patch: make it work with newer wlroots + +------------------------------------------------------------------- New: ---- cage-0.1.1-new-wlroots.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cage.spec ++++++ --- /var/tmp/diff_new_pack.CuSc9P/_old 2020-01-24 13:12:33.441466667 +0100 +++ /var/tmp/diff_new_pack.CuSc9P/_new 2020-01-24 13:12:33.445466668 +0100 @@ -1,7 +1,7 @@ # # spec file for package cage # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,11 @@ Group: System/GUI/Other URL: https://www.hjdskes.nl/projects/cage/ Source: https://github.com/Hjdskes/cage/archive/v%{version}.tar.gz +Patch0: cage-0.1.1-new-wlroots.patch BuildRequires: libpixman-1-0-devel BuildRequires: meson >= 0.43.0 BuildRequires: pkgconfig -BuildRequires: wlroots-devel >= 0.6 +BuildRequires: wlroots-devel >= 0.9.1 BuildRequires: pkgconfig(wayland-protocols) >= 1.14 BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xkbcommon) @@ -37,6 +38,7 @@ %prep %setup -q +%patch0 -p1 %build %meson ++++++ cage-0.1.1-new-wlroots.patch ++++++ diff -urEbw cage-0.1.1/cage.c cage-0.1.1.new/cage.c --- cage-0.1.1/cage.c 2019-06-03 19:55:52.000000000 +0200 +++ cage-0.1.1.new/cage.c 2020-01-23 16:21:21.210364904 +0100 @@ -374,15 +374,6 @@ wl_event_source_remove(sigint_source); wl_event_source_remove(sigterm_source); seat_destroy(server.seat); - wlr_server_decoration_manager_destroy(server_decoration_manager); - wlr_xdg_decoration_manager_v1_destroy(xdg_decoration_manager); - wlr_xdg_shell_destroy(xdg_shell); - wlr_idle_inhibit_v1_destroy(server.idle_inhibit_v1); - if (server.idle) { - wlr_idle_destroy(server.idle); - } - wlr_data_device_manager_destroy(data_device_mgr); - wlr_compositor_destroy(compositor); wlr_output_layout_destroy(server.output_layout); /* This function is not null-safe, but we only ever get here with a proper wl_display. */ diff -urEbw cage-0.1.1/meson.build cage-0.1.1.new/meson.build --- cage-0.1.1/meson.build 2019-06-03 19:55:52.000000000 +0200 +++ cage-0.1.1.new/meson.build 2020-01-23 16:11:00.559237129 +0100 @@ -35,7 +35,7 @@ ) endif -wlroots = dependency('wlroots', version: '>= 0.6.0') +wlroots = dependency('wlroots', version: '>= 0.9.1') wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_server = dependency('wayland-server') pixman = dependency('pixman-1') diff -urEbw cage-0.1.1/output.c cage-0.1.1.new/output.c --- cage-0.1.1/output.c 2019-06-03 19:55:52.000000000 +0200 +++ cage-0.1.1.new/output.c 2020-01-23 16:12:47.115771758 +0100 @@ -207,6 +207,7 @@ } if (!needs_frame) { + wlr_output_rollback(output->wlr_output); wlr_log(WLR_DEBUG, "Output doesn't need frame and isn't damaged"); goto buffer_damage_finish; } @@ -386,6 +387,9 @@ /* Place the cursor in the center of the screen. */ wlr_cursor_warp(server->seat->cursor, NULL, wlr_output->width / 2, wlr_output->height / 2); wlr_output_damage_add_whole(server->output->damage); + + wlr_output_enable(wlr_output, true); + wlr_output_commit(wlr_output); } void
