From 277800ffc9195f223706244ce44a15d02f8ae41b Mon Sep 17 00:00:00 2001 From: damneq Date: Thu, 23 Jan 2020 09:01:14 +0100 Subject: [PATCH 1/4] wlroots: update to 0.10.0 --- common/shlibs | 2 +- srcpkgs/wlroots/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 60f082055a39b4..d7af712815b00e 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.5 wlroots-0.10.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 75ddb338a15359..d025e27f70df3e 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.10.0 revision=1 build_style=meson configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind @@ -11,13 +11,13 @@ makedepends="elogind-devel libcap-devel wayland-devel wayland-protocols MesaLib-devel libinput-devel libxkbcommon-devel libdrm-devel pixman-devel libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel - xcb-util-errors-devel xcb-util-xrm-devel freerdp-devel" + xcb-util-errors-devel xcb-util-xrm-devel" short_desc="Modular Wayland compositor library" maintainer="Orphaned " license="MIT" homepage="https://github.com/swaywm/wlroots" distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz" -checksum=202b86e0e21699b6660bbda56afc2e3358db7252f83ff69c89f01926b4900d98 +checksum=9414ba761c321f9c2b3e0426e1bbed55443fa8f97d46643d1706d1ddd614f6cd post_install() { vlicense LICENSE From 424517e76053cf1e23d1313b28320800f2a01b83 Mon Sep 17 00:00:00 2001 From: damneq Date: Thu, 23 Jan 2020 09:09:17 +0100 Subject: [PATCH 2/4] cage: revbump and fix for updated wlroots --- ...1.1-fix-building-with-wlroots-0.10.0.patch | 41 +++++++++++++++++++ srcpkgs/cage/template | 4 +- 2 files changed, 43 insertions(+), 2 deletions(-) create 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 new file mode 100644 index 00000000000000..111aa937dfb2c7 --- /dev/null +++ b/srcpkgs/cage/patches/cage-0.1.1-fix-building-with-wlroots-0.10.0.patch @@ -0,0 +1,41 @@ +--- 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 eca84c1dacc20b..49342bf81c7b89 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 libxkbcommon-devel pixman-devel wayland-devel wlroots-devel" short_desc="Kiosk compositor for Wayland" maintainer="Illia Shestakov " license="MIT" From 7b604a7f756c2501b21626ba7df6fa53a5c059ec Mon Sep 17 00:00:00 2001 From: damneq Date: Thu, 23 Jan 2020 09:19:47 +0100 Subject: [PATCH 3/4] wayfire: update to 0.3.1 --- ...yfire-0.3.1-fix-building-with-wlroots-0.10.0.patch | 11 +++++++++++ srcpkgs/wayfire/template | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/wayfire/patches/wayfire-0.3.1-fix-building-with-wlroots-0.10.0.patch diff --git a/srcpkgs/wayfire/patches/wayfire-0.3.1-fix-building-with-wlroots-0.10.0.patch b/srcpkgs/wayfire/patches/wayfire-0.3.1-fix-building-with-wlroots-0.10.0.patch new file mode 100644 index 00000000000000..3cd4d3fe6f922e --- /dev/null +++ b/srcpkgs/wayfire/patches/wayfire-0.3.1-fix-building-with-wlroots-0.10.0.patch @@ -0,0 +1,11 @@ +--- meson.build ++++ meson.build +@@ -29,7 +29,7 @@ libinput = dependency('libinput', version: '>=1.7.0') + pixman = dependency('pixman-1') + threads = dependency('threads') + xkbcommon = dependency('xkbcommon') +-wlroots = dependency('wlroots', version: ['>=0.9.0', '<0.10.0'], fallback: ['wlroots', 'wlroots']) ++wlroots = dependency('wlroots', version: ['>=0.9.0', '<0.11.0'], fallback: ['wlroots', 'wlroots']) + wfconfig = dependency('wf-config', version: '>=0.3', fallback: ['wf-config', 'wfconfig']) + + needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system()) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index c5e31d124141c8..cdcd900b67ee8e 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,16 +1,16 @@ # Template file for 'wayfire' pkgname=wayfire -version=0.3.0 +version=0.3.1 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel" -makedepends="wlroots-devel glm cairo-devel wf-config-devel" +makedepends="xcb-util-wm-devel xcb-util-errors-devel wlroots-devel glm cairo-devel wf-config-devel" short_desc="3D wayland compositor" maintainer="Young Jin Park " license="MIT" homepage="https://wayfire.org" distfiles="https://github.com/WayfireWM/wayfire/archive/${version}.tar.gz" -checksum=c686bf5abb7f0db829196785bba4136c85d7b52d701212e21636dad75e1da0aa +checksum=e3bf727696f7f089b3474e8f4161e59adaeaa019de191b3e47a4f4663044cd00 case $XBPS_TARGET_MACHINE in *-musl) makedepends+=" libexecinfo-devel" From d6ee29e9fa6356a6195b0d3f510cda5a168c69fb Mon Sep 17 00:00:00 2001 From: damneq Date: Thu, 23 Jan 2020 09:34:47 +0100 Subject: [PATCH 4/4] sway: update to 1.4 --- srcpkgs/sway/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index a428a590d34f70..964702f39485fa 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,19 +1,20 @@ # Template file for 'sway' pkgname=sway -version=1.2 -revision=2 +version=1.4 +revision=1 build_style=meson conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc git" -makedepends="wlroots-devel wayland-devel wayland-protocols pcre-devel +makedepends="xcb-util-wm-devel xcb-util-errors-devel wlroots-devel + wayland-devel wayland-protocols pcre-devel json-c-devel pango-devel cairo-devel gdk-pixbuf-devel" -depends="swaybg xorg-server-xwayland $(vopt_if elogind "elogind")" +depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)" short_desc="Tiling Wayland compositor compatible with i3" maintainer="Juan RP " license="MIT" homepage="https://swaywm.org" distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz" -checksum=9f79382577ee132111c290b4d1a1a3e114ef485595c30cf5f181a11575bda846 +checksum=e2805291fc01d49e21dda4b273e38170d1fff4e1757215439729edbed880dfbe build_options="elogind" desc_option_elogind="Uses elogind instead of setuid for privilege escalation"