From 103656c6a92602cf0aebd1532fa0a64c12a17ab5 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 16 Jul 2020 17:51:15 +0200 Subject: [PATCH 1/3] wlroots: update to 0.11.0. --- common/shlibs | 2 +- srcpkgs/wlroots/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index ba4d41130a5..887f160d5fd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3572,7 +3572,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.5 wlroots-0.10.0_1 +libwlroots.so.6 wlroots-0.11.0_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 eae5dd60566..5a171277978 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,6 +1,6 @@ # Template file for 'wlroots' pkgname=wlroots -version=0.10.1 +version=0.11.0 revision=1 build_style=meson configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind @@ -13,11 +13,11 @@ makedepends="elogind-devel libcap-devel wayland-devel wayland-protocols xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel xcb-util-errors-devel xcb-util-xrm-devel" short_desc="Modular Wayland compositor library" -maintainer="Orphaned " +maintainer="Isaac Freund " license="MIT" homepage="https://github.com/swaywm/wlroots" distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz" -checksum=b84baefbaff7bb04b3d2c43cbacef1a433e2cd65111f8fbf4bfc5faaa4b34b08 +checksum=a7645e77229aab4942748c621be8bdb8b073d94f35f3e032b867246862bf2d01 post_install() { vlicense LICENSE From 8691bf7f5aa93a1e43ca3fd12dabdcdd88f55dd3 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 16 Jul 2020 17:54:09 +0200 Subject: [PATCH 2/3] sway: update to 1.5. --- srcpkgs/sway/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index 49f50cd191a..3835a0c8866 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,7 +1,7 @@ # Template file for 'sway' pkgname=sway -version=1.4 -revision=4 +version=1.5 +revision=1 build_style=meson conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc git" @@ -14,7 +14,7 @@ maintainer="Érico Nogueira " license="MIT" homepage="https://swaywm.org" distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz" -checksum=e2805291fc01d49e21dda4b273e38170d1fff4e1757215439729edbed880dfbe +checksum=c80644774d612d7d377093d4990061d36c36673862c06318a7b0e37fa47b0178 build_options="elogind" desc_option_elogind="Uses elogind instead of setuid for privilege escalation" From 524202c643cc18091ce7461ea8ce9ed5f429dfe3 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 16 Jul 2020 18:03:40 +0200 Subject: [PATCH 3/3] cage: update to 0.1.2.1. --- ...1.1-fix-building-with-wlroots-0.10.0.patch | 41 ------------------- srcpkgs/cage/template | 9 ++-- 2 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 srcpkgs/cage/patches/cage-0.1.1-fix-building-with-wlroots-0.10.0.patch diff --git a/srcpkgs/cage/patches/cage-0.1.1-fix-building-with-wlroots-0.10.0.patch b/srcpkgs/cage/patches/cage-0.1.1-fix-building-with-wlroots-0.10.0.patch deleted file mode 100644 index 111aa937dfb..00000000000 --- a/srcpkgs/cage/patches/cage-0.1.1-fix-building-with-wlroots-0.10.0.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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 ---- meson.build -+++ meson.build -@@ -35,7 +35,7 @@ - ) - endif - --wlroots = dependency('wlroots', version: '>= 0.6.0') -+wlroots = dependency('wlroots', version: '>= 0.10.0') - 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 49342bf81c7..76ba731cc58 100644 --- a/srcpkgs/cage/template +++ b/srcpkgs/cage/template @@ -1,18 +1,17 @@ # Template file for 'cage' pkgname=cage -version=0.1.1 -revision=2 +version=0.1.2.1 +revision=1 build_style=meson -hostmakedepends="pkg-config wayland-devel" +hostmakedepends="pkg-config wayland-devel scdoc" makedepends="xcb-util-wm-devel xcb-util-errors-devel libxkbcommon-devel pixman-devel wayland-devel wlroots-devel" short_desc="Kiosk compositor for Wayland" maintainer="Illia Shestakov " license="MIT" homepage="https://www.hjdskes.nl/projects/cage/" distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz" -checksum=63efbe96cf307381f2bedf9b80153343e255970a70d612515da7dc325dd49478 +checksum=38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac post_install() { vlicense LICENSE - vdoc README.md }