From 9bd607748e899a9cb0df44be5d1b8328ca574298 Mon Sep 17 00:00:00 2001 From: damneq Date: Mon, 20 Jan 2020 21:33:03 +0100 Subject: [PATCH 1/3] wlroots: update to 0.9.1 --- common/shlibs | 2 +- srcpkgs/wlroots/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 60f082055a3..7de44400463 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3361,7 +3361,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1 libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1 libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1 -libwlroots.so.3 wlroots-0.6.0_1 +libwlroots.so.4 wlroots-0.9.1_1 libbaseencode.so.1 libbaseencode-1.0.9_1 libcotp.so.12 libcotp-1.2.1_1 libunarr.so.1 libunarr-1.0.1_1 diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index 75ddb338a15..0846e8bf6c7 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,6 +1,6 @@ # Template file for 'wlroots' pkgname=wlroots -version=0.8.1 +version=0.9.1 revision=1 build_style=meson configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind @@ -17,7 +17,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/swaywm/wlroots" distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz" -checksum=202b86e0e21699b6660bbda56afc2e3358db7252f83ff69c89f01926b4900d98 +checksum=2ddd8371b8cf847b6a9b20628512474b1405171393e6ec8a071e46afc73ca2e7 post_install() { vlicense LICENSE From 0981f55ef3ddbf747656d20eb7936f4a007a7879 Mon Sep 17 00:00:00 2001 From: damneq Date: Mon, 20 Jan 2020 21:33:03 +0100 Subject: [PATCH 2/3] wlroots: update to 0.9.1 --- common/shlibs | 2 +- srcpkgs/wlroots/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 60f082055a3..7de44400463 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3361,7 +3361,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1 libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1 libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1 -libwlroots.so.3 wlroots-0.6.0_1 +libwlroots.so.4 wlroots-0.9.1_1 libbaseencode.so.1 libbaseencode-1.0.9_1 libcotp.so.12 libcotp-1.2.1_1 libunarr.so.1 libunarr-1.0.1_1 diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index 75ddb338a15..0846e8bf6c7 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,6 +1,6 @@ # Template file for 'wlroots' pkgname=wlroots -version=0.8.1 +version=0.9.1 revision=1 build_style=meson configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind @@ -17,7 +17,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/swaywm/wlroots" distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz" -checksum=202b86e0e21699b6660bbda56afc2e3358db7252f83ff69c89f01926b4900d98 +checksum=2ddd8371b8cf847b6a9b20628512474b1405171393e6ec8a071e46afc73ca2e7 post_install() { vlicense LICENSE From cd76defce6df785af8256963e620ca159ffe6c03 Mon Sep 17 00:00:00 2001 From: damneq Date: Tue, 21 Jan 2020 17:17:36 +0100 Subject: [PATCH 3/3] cage: revbump and fix for updated wlroots --- ....1.1-fix-building-with-wlroots-0.9.1.patch | 77 +++++++++++++++++++ srcpkgs/cage/template | 4 +- 2 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/cage/patches/cage-0.1.1-fix-building-with-wlroots-0.9.1.patch diff --git a/srcpkgs/cage/patches/cage-0.1.1-fix-building-with-wlroots-0.9.1.patch b/srcpkgs/cage/patches/cage-0.1.1-fix-building-with-wlroots-0.9.1.patch new file mode 100644 index 00000000000..313cfe90419 --- /dev/null +++ b/srcpkgs/cage/patches/cage-0.1.1-fix-building-with-wlroots-0.9.1.patch @@ -0,0 +1,77 @@ +--- output.c ++++ output.c +@@ -386,6 +386,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 +--- .builds/alpine.yml ++++ .builds/alpine.yml +@@ -17,8 +17,7 @@ + # version, instead of master, to avoid any breaking changes in wlroots. + - wlroots: | + cd wlroots +- # This corresponds to the tag of 0.6.0 +- git checkout c0305f4f864543f8c3fea6f302e91c9b1d3396f3 ++ git checkout 0.9.1 + meson --prefix=/usr build -Drootston=false -Dexamples=false + ninja -C build + sudo ninja -C build install +--- .builds/archlinux.yml ++++ .builds/archlinux.yml +@@ -15,8 +15,7 @@ + # version, instead of master, to avoid any breaking changes in wlroots. + - wlroots: | + cd wlroots +- # This corresponds to the tag of 0.6.0 +- git checkout c0305f4f864543f8c3fea6f302e91c9b1d3396f3 ++ git checkout 0.9.1 + meson --prefix=/usr build -Drootston=false -Dexamples=false + ninja -C build + sudo ninja -C build install +--- .builds/freebsd.yml ++++ .builds/freebsd.yml +@@ -18,8 +18,7 @@ + # version, instead of master, to avoid any breaking changes in wlroots. + - wlroots: | + cd wlroots +- # This corresponds to the tag of 0.6.0 +- git checkout c0305f4f864543f8c3fea6f302e91c9b1d3396f3 ++ git checkout 0.9.1 + meson --prefix=/usr/local build -Drootston=false -Dexamples=false + ninja -C build + sudo ninja -C build install +--- meson.build ++++ meson.build +@@ -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') +--- cage.c ++++ cage.c +@@ -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 --git a/srcpkgs/cage/template b/srcpkgs/cage/template index eca84c1dacc..8d933e7684a 100644 --- a/srcpkgs/cage/template +++ b/srcpkgs/cage/template @@ -1,10 +1,10 @@ # Template file for 'cage' pkgname=cage version=0.1.1 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config wayland-devel" -makedepends="libxkbcommon-devel pixman-devel wayland-devel wlroots-devel" +makedepends="xcb-util-wm-devel xcb-util-errors-devel freerdp-devel libxkbcommon-devel pixman-devel wayland-devel wlroots-devel" short_desc="Kiosk compositor for Wayland" maintainer="Illia Shestakov " license="MIT"