Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.9.1

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is an updated pull request by damneq against master on the void-packages repository

https://github.com/damneq/void-packages wlroots
https://github.com/void-linux/void-packages/pull/18432

[WIP] wlroots: update to 0.9.1


A patch file from https://github.com/void-linux/void-packages/pull/18432.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wlroots-18432.patch --]
[-- Type: text/x-diff, Size: 9369 bytes --]

From 0981f55ef3ddbf747656d20eb7936f4a007a7879 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Mon, 20 Jan 2020 21:33:03 +0100
Subject: [PATCH 1/4] 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 <orphan@voidlinux.org>"
 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 b41860c4f02e323b430cc8367ce09f1d27584426 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Wed, 22 Jan 2020 21:16:14 +0100
Subject: [PATCH 2/4] 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 <ishestakov@airmail.cc>"
 license="MIT"

From 0b833efda5cc91dded908ffdd6f2bf669c2ea8e3 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Wed, 22 Jan 2020 21:17:02 +0100
Subject: [PATCH 3/4] wayfire: update to 0.3.1

---
 srcpkgs/wayfire/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c5e31d12414..81d2970d89b 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 freerdp-devel wlroots-devel glm cairo-devel wf-config-devel"
 short_desc="3D wayland compositor"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 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 cad772c322908d528a354c19108618707a86108e Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Wed, 22 Jan 2020 21:39:42 +0100
Subject: [PATCH 4/4] sway: update to 1.4

---
 .../sway-1.4-fix-compiling-with-wlroots-0.9.1.patch   | 11 +++++++++++
 srcpkgs/sway/template                                 | 11 ++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/sway/patches/sway-1.4-fix-compiling-with-wlroots-0.9.1.patch

diff --git a/srcpkgs/sway/patches/sway-1.4-fix-compiling-with-wlroots-0.9.1.patch b/srcpkgs/sway/patches/sway-1.4-fix-compiling-with-wlroots-0.9.1.patch
new file mode 100644
index 00000000000..ff6251670c6
--- /dev/null
+++ b/srcpkgs/sway/patches/sway-1.4-fix-compiling-with-wlroots-0.9.1.patch
@@ -0,0 +1,11 @@
+--- meson.build
++++ meson.build
+@@ -60,7 +60,7 @@
+ rt             = cc.find_library('rt')
+ 
+ # Try first to find wlroots as a subproject, then as a system dependency
+-wlroots_version = ['>=0.10.0', '<0.11.0']
++wlroots_version = ['>=0.9.0', '<0.10.0']
+ wlroots_proj = subproject(
+ 	'wlroots',
+ 	default_options: ['examples=false'],
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index a428a590d34..61b0018e90a 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 freerdp-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 <xtraeme@gmail.com>"
 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"