Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cage for openSUSE:Factory checked in at 2021-04-17 00:02:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cage (Old) and /work/SRC/openSUSE:Factory/.cage.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cage" Sat Apr 17 00:02:08 2021 rev:5 rq:885981 version:0.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cage/cage.changes 2020-07-17 20:49:05.248809971 +0200 +++ /work/SRC/openSUSE:Factory/.cage.new.12324/cage.changes 2021-04-17 00:02:26.573658199 +0200 @@ -1,0 +2,6 @@ +Fri Apr 16 12:42:22 UTC 2021 - Michael Vetter <[email protected]> + +- Update to 0.1.3: + * compatibility release to track wlroots 0.13.0 + +------------------------------------------------------------------- Old: ---- v0.1.2.1.tar.gz New: ---- v0.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cage.spec ++++++ --- /var/tmp/diff_new_pack.koWSma/_old 2021-04-17 00:02:26.937658772 +0200 +++ /var/tmp/diff_new_pack.koWSma/_new 2021-04-17 00:02:26.941658779 +0200 @@ -1,7 +1,7 @@ # # spec file for package cage # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: cage -Version: 0.1.2.1 +Version: 0.1.3 Release: 0 Summary: Wayland Kiosk License: MIT @@ -27,7 +27,7 @@ BuildRequires: meson >= 0.43.0 BuildRequires: pkgconfig BuildRequires: scdoc -BuildRequires: wlroots-devel >= 0.11.0 +BuildRequires: wlroots-devel >= 0.13.0 BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(wayland-protocols) >= 1.14 BuildRequires: pkgconfig(wayland-server) ++++++ v0.1.2.1.tar.gz -> v0.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/.builds/alpine.yml new/cage-0.1.3/.builds/alpine.yml --- old/cage-0.1.2.1/.builds/alpine.yml 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/.builds/alpine.yml 2021-04-16 14:01:38.000000000 +0200 @@ -9,7 +9,8 @@ - scdoc - wayland-dev - wayland-protocols - - xorg-server-xwayland + - xcb-util-wm-dev + - xwayland sources: - https://github.com/swaywm/wlroots - https://github.com/Hjdskes/cage @@ -18,7 +19,7 @@ # version, instead of master, to avoid any breaking changes in wlroots. - wlroots: | cd wlroots - git checkout 0.11.0 + git checkout 0.13.0 meson --prefix=/usr build -Dexamples=false ninja -C build sudo ninja -C build install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/.builds/archlinux.yml new/cage-0.1.3/.builds/archlinux.yml --- old/cage-0.1.2.1/.builds/archlinux.yml 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/.builds/archlinux.yml 2021-04-16 14:01:38.000000000 +0200 @@ -4,10 +4,12 @@ - meson - libinput - libxkbcommon + - mesa - scdoc - wayland - wayland-protocols - - xorg-server-xwayland + - xcb-util-wm + - xorg-xwayland sources: - https://github.com/swaywm/wlroots - https://github.com/Hjdskes/cage @@ -16,7 +18,7 @@ # version, instead of master, to avoid any breaking changes in wlroots. - wlroots: | cd wlroots - git checkout 0.11.0 + git checkout 0.13.0 meson --prefix=/usr build -Dexamples=false ninja -C build sudo ninja -C build install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/.builds/freebsd.yml new/cage-0.1.3/.builds/freebsd.yml --- old/cage-0.1.2.1/.builds/freebsd.yml 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/.builds/freebsd.yml 2021-04-16 14:01:38.000000000 +0200 @@ -11,6 +11,8 @@ - x11/libinput - x11/libxkbcommon - x11/pixman + - x11/xcb-util-wm + - x11-servers/xwayland sources: - https://github.com/swaywm/wlroots - https://github.com/Hjdskes/cage @@ -19,7 +21,7 @@ # version, instead of master, to avoid any breaking changes in wlroots. - wlroots: | cd wlroots - git checkout 0.11.0 + git checkout 0.13.0 meson --prefix=/usr/local build -Dexamples=false ninja -C build sudo ninja -C build install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/cage.c new/cage-0.1.3/cage.c --- old/cage-0.1.2.1/cage.c 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/cage.c 2021-04-16 14:01:38.000000000 +0200 @@ -304,7 +304,7 @@ sigint_source = wl_event_loop_add_signal(event_loop, SIGINT, handle_signal, &server.wl_display); sigterm_source = wl_event_loop_add_signal(event_loop, SIGTERM, handle_signal, &server.wl_display); - server.backend = wlr_backend_autocreate(server.wl_display, NULL); + server.backend = wlr_backend_autocreate(server.wl_display); if (!server.backend) { wlr_log(WLR_ERROR, "Unable to create the wlroots backend"); ret = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/meson.build new/cage-0.1.3/meson.build --- old/cage-0.1.2.1/meson.build 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/meson.build 2021-04-16 14:01:38.000000000 +0200 @@ -1,5 +1,5 @@ project('cage', 'c', - version: '0.1.2', + version: '0.1.3', license: 'MIT', default_options: [ 'c_std=c11', @@ -34,7 +34,7 @@ ) endif -wlroots = dependency('wlroots', version: '>= 0.11.0') +wlroots = dependency('wlroots', version: '>= 0.13.0') wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_server = dependency('wayland-server') pixman = dependency('pixman-1') @@ -132,8 +132,8 @@ cage_headers = [ configure_file(input: 'config.h.in', - output: 'config.h', - configuration: conf_data), + output: 'config.h', + configuration: conf_data), 'idle_inhibit_v1.h', 'output.h', 'render.h', @@ -164,10 +164,10 @@ ) summary = [ - '', - 'Cage @0@'.format(version), - '', - ' xwayland: @0@'.format(have_xwayland), - '' + '', + 'Cage @0@'.format(version), + '', + ' xwayland: @0@'.format(have_xwayland), + '' ] message('\n'.join(summary)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/output.c new/cage-0.1.3/output.c --- old/cage-0.1.2.1/output.c 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/output.c 2021-04-16 14:01:38.000000000 +0200 @@ -122,8 +122,8 @@ } void -output_view_for_each_popup(struct cg_output *output, struct cg_view *view, cg_surface_iterator_func_t iterator, - void *user_data) +output_view_for_each_popup_surface(struct cg_output *output, struct cg_view *view, cg_surface_iterator_func_t iterator, + void *user_data) { struct surface_iterator_data data = { .user_iterator = iterator, @@ -134,7 +134,7 @@ }; wlr_output_layout_output_coords(output->server->output_layout, output->wlr_output, &data.ox, &data.oy); - view_for_each_popup(view, output_for_each_surface_iterator, &data); + view_for_each_popup_surface(view, output_for_each_surface_iterator, &data); } void @@ -358,17 +358,20 @@ } static void -handle_output_transform(struct wl_listener *listener, void *data) +handle_output_commit(struct wl_listener *listener, void *data) { - struct cg_output *output = wl_container_of(listener, output, transform); + struct cg_output *output = wl_container_of(listener, output, commit); + struct wlr_output_event_commit *event = data; if (!output->wlr_output->enabled) { return; } - struct cg_view *view; - wl_list_for_each (view, &output->server->views, link) { - view_position(view); + if (event->committed & WLR_OUTPUT_STATE_TRANSFORM) { + struct cg_view *view; + wl_list_for_each (view, &output->server->views, link) { + view_position(view); + } } } @@ -393,8 +396,8 @@ struct cg_server *server = output->server; wl_list_remove(&output->destroy.link); + wl_list_remove(&output->commit.link); wl_list_remove(&output->mode.link); - wl_list_remove(&output->transform.link); wl_list_remove(&output->damage_frame.link); wl_list_remove(&output->damage_destroy.link); wl_list_remove(&output->link); @@ -450,10 +453,10 @@ output->damage = wlr_output_damage_create(wlr_output); wl_list_insert(&server->outputs, &output->link); + output->commit.notify = handle_output_commit; + wl_signal_add(&wlr_output->events.commit, &output->commit); output->mode.notify = handle_output_mode; wl_signal_add(&wlr_output->events.mode, &output->mode); - output->transform.notify = handle_output_transform; - wl_signal_add(&wlr_output->events.transform, &output->transform); output->destroy.notify = handle_output_destroy; wl_signal_add(&wlr_output->events.destroy, &output->destroy); output->damage_frame.notify = handle_output_damage_frame; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/output.h new/cage-0.1.3/output.h --- old/cage-0.1.2.1/output.h 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/output.h 2021-04-16 14:01:38.000000000 +0200 @@ -13,8 +13,8 @@ struct wlr_output *wlr_output; struct wlr_output_damage *damage; + struct wl_listener commit; struct wl_listener mode; - struct wl_listener transform; struct wl_listener destroy; struct wl_listener damage_frame; struct wl_listener damage_destroy; @@ -28,8 +28,8 @@ void handle_new_output(struct wl_listener *listener, void *data); void output_surface_for_each_surface(struct cg_output *output, struct wlr_surface *surface, double ox, double oy, cg_surface_iterator_func_t iterator, void *user_data); -void output_view_for_each_popup(struct cg_output *output, struct cg_view *view, cg_surface_iterator_func_t iterator, - void *user_data); +void output_view_for_each_popup_surface(struct cg_output *output, struct cg_view *view, + cg_surface_iterator_func_t iterator, void *user_data); void output_drag_icons_for_each_surface(struct cg_output *output, struct wl_list *drag_icons, cg_surface_iterator_func_t iterator, void *user_data); void output_damage_surface(struct cg_output *output, struct wlr_surface *surface, double lx, double ly, bool whole); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/render.c new/cage-0.1.3/render.c --- old/cage-0.1.2.1/render.c 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/render.c 2021-04-16 14:01:38.000000000 +0200 @@ -120,22 +120,12 @@ } static void -render_popup_iterator(struct cg_output *output, struct wlr_surface *surface, struct wlr_box *box, void *data) -{ - /* Render this popup's surface. */ - render_surface_iterator(output, surface, box, data); - - /* Render this popup's child toplevels. */ - output_surface_for_each_surface(output, surface, box->x, box->y, render_surface_iterator, data); -} - -static void render_view_popups(struct cg_view *view, struct cg_output *output, pixman_region32_t *damage) { struct render_data data = { .damage = damage, }; - output_view_for_each_popup(output, view, render_popup_iterator, &data); + output_view_for_each_popup_surface(output, view, render_surface_iterator, &data); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/seat.c new/cage-0.1.3/seat.c --- old/cage-0.1.2.1/seat.c 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/seat.c 2021-04-16 14:01:38.000000000 +0200 @@ -20,6 +20,7 @@ #include <wlr/types/wlr_primary_selection.h> #include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_surface.h> +#include <wlr/types/wlr_touch.h> #include <wlr/types/wlr_xcursor_manager.h> #include <wlr/util/log.h> #if CAGE_HAS_XWAYLAND @@ -229,13 +230,12 @@ #ifdef DEBUG if (sym == XKB_KEY_Escape) { wl_display_terminate(server->wl_display); - } else + return true; + } #endif - if (server->allow_vt_switch && sym >= XKB_KEY_XF86Switch_VT_1 - && sym <= XKB_KEY_XF86Switch_VT_12) { + if (server->allow_vt_switch && sym >= XKB_KEY_XF86Switch_VT_1 && sym <= XKB_KEY_XF86Switch_VT_12) { if (wlr_backend_is_multi(server->backend)) { - struct wlr_session *session = - wlr_backend_get_session(server->backend); + struct wlr_session *session = wlr_backend_get_session(server->backend); if (session) { unsigned vt = sym - XKB_KEY_XF86Switch_VT_1 + 1; wlr_session_change_vt(session, vt); @@ -261,7 +261,7 @@ bool handled = false; uint32_t modifiers = wlr_keyboard_get_modifiers(device->keyboard); - if ((modifiers & WLR_MODIFIER_ALT) && event->state == WLR_KEY_PRESSED) { + if ((modifiers & WLR_MODIFIER_ALT) && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { /* If Alt is held down and this button was pressed, we * attempt to process it as a compositor * keybinding. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/view.c new/cage-0.1.3/view.c --- old/cage-0.1.2.1/view.c 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/view.c 2021-04-16 14:01:38.000000000 +0200 @@ -206,12 +206,12 @@ } void -view_for_each_popup(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data) +view_for_each_popup_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data) { - if (!view->impl->for_each_popup) { + if (!view->impl->for_each_popup_surface) { return; } - view->impl->for_each_popup(view, iterator, data); + view->impl->for_each_popup_surface(view, iterator, data); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/view.h new/cage-0.1.3/view.h --- old/cage-0.1.2.1/view.h 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/view.h 2021-04-16 14:01:38.000000000 +0200 @@ -45,7 +45,7 @@ void (*maximize)(struct cg_view *view, int output_width, int output_height); void (*destroy)(struct cg_view *view); void (*for_each_surface)(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); - void (*for_each_popup)(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); + void (*for_each_popup_surface)(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); struct wlr_surface *(*wlr_surface_at)(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y); }; @@ -75,7 +75,7 @@ void view_activate(struct cg_view *view, bool activate); void view_position(struct cg_view *view); void view_for_each_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); -void view_for_each_popup(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); +void view_for_each_popup_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); void view_unmap(struct cg_view *view); void view_map(struct cg_view *view, struct wlr_surface *surface); void view_destroy(struct cg_view *view); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/xdg_shell.c new/cage-0.1.3/xdg_shell.c --- old/cage-0.1.2.1/xdg_shell.c 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/xdg_shell.c 2021-04-16 14:01:38.000000000 +0200 @@ -224,10 +224,10 @@ } static void -for_each_popup(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data) +for_each_popup_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data) { struct cg_xdg_shell_view *xdg_shell_view = xdg_shell_view_from_view(view); - wlr_xdg_surface_for_each_popup(xdg_shell_view->xdg_surface, iterator, data); + wlr_xdg_surface_for_each_popup_surface(xdg_shell_view->xdg_surface, iterator, data); } static struct wlr_surface * @@ -305,7 +305,7 @@ .maximize = maximize, .destroy = destroy, .for_each_surface = for_each_surface, - .for_each_popup = for_each_popup, + .for_each_popup_surface = for_each_popup_surface, .wlr_surface_at = wlr_surface_at, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cage-0.1.2.1/xwayland.c new/cage-0.1.3/xwayland.c --- old/cage-0.1.2.1/xwayland.c 2020-07-16 16:25:19.000000000 +0200 +++ new/cage-0.1.3/xwayland.c 2021-04-16 14:01:38.000000000 +0200 @@ -181,7 +181,7 @@ .destroy = destroy, .for_each_surface = for_each_surface, /* XWayland doesn't have a separate popup iterator. */ - .for_each_popup = NULL, + .for_each_popup_surface = NULL, .wlr_surface_at = wlr_surface_at, };
