[PR PATCH] wlroots: update to 0.9.1

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] wlroots: update to 0.9.1
@ 2020-01-20 20:34 voidlinux-github
  2020-01-20 20:44 ` voidlinux-github
                   ` (38 more replies)
  0 siblings, 39 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 20:34 UTC (permalink / raw)
  To: ml

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

There is a new 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

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: 1607 bytes --]

From 6c6ff6b3c98aeba8d2eda61a199c11feda5ebbe0 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Mon, 20 Jan 2020 21:33:03 +0100
Subject: [PATCH] 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

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
@ 2020-01-20 20:44 ` voidlinux-github
  2020-01-20 20:52 ` voidlinux-github
                   ` (37 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 20:44 UTC (permalink / raw)
  To: ml

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576425011

Comment:
soname bump? 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
  2020-01-20 20:44 ` voidlinux-github
@ 2020-01-20 20:52 ` voidlinux-github
  2020-01-20 20:54 ` voidlinux-github
                   ` (36 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 20:52 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576426934

Comment:
Yes, anything else I need to do when that happens?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
  2020-01-20 20:44 ` voidlinux-github
  2020-01-20 20:52 ` voidlinux-github
@ 2020-01-20 20:54 ` voidlinux-github
  2020-01-20 21:01 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (35 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 20:54 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576426934

Comment:
Yes, anything else I need to do when that happens?
Edit: Nevermind, I just read the CONTRIBUTING.md file and there's a part saying I need to revbump all dependent packages, will do that

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (2 preceding siblings ...)
  2020-01-20 20:54 ` voidlinux-github
@ 2020-01-20 21:01 ` voidlinux-github
  2020-01-20 21:02 ` voidlinux-github
                   ` (34 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 21:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 312 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

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: 3101 bytes --]

From 6c6ff6b3c98aeba8d2eda61a199c11feda5ebbe0 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Mon, 20 Jan 2020 21:33:03 +0100
Subject: [PATCH 1/2] 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 3bce50e520b51102522d0056294d4e351b77243d Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Mon, 20 Jan 2020 22:00:59 +0100
Subject: [PATCH 2/2] Revbumped packages due to soname bump

---
 srcpkgs/cage/template    | 2 +-
 srcpkgs/sway/template    | 2 +-
 srcpkgs/wayfire/template | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index eca84c1dacc..d26b924f867 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,7 +1,7 @@
 # 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"
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index a428a590d34..ca44f905709 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.2
-revision=2
+revision=3
 build_style=meson
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc git"
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c5e31d12414..1cba248b13a 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,7 +1,7 @@
 # Template file for 'wayfire'
 pkgname=wayfire
 version=0.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wlroots-devel glm cairo-devel wf-config-devel"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (3 preceding siblings ...)
  2020-01-20 21:01 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-20 21:02 ` voidlinux-github
  2020-01-20 21:37 ` voidlinux-github
                   ` (33 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 21:02 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576429317

Comment:
Revbumped all packages that xbps told me to when compiling with the old soname

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (4 preceding siblings ...)
  2020-01-20 21:02 ` voidlinux-github
@ 2020-01-20 21:37 ` voidlinux-github
  2020-01-20 21:39 ` voidlinux-github
                   ` (32 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 21:37 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576437466

Comment:
Please use the proper commit message format, eg

`cage: bump for wlroots update` or something along those lines.

See https://github.com/void-linux/void-packages/blob/master/Manual.md#contributing-via-git

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (5 preceding siblings ...)
  2020-01-20 21:37 ` voidlinux-github
@ 2020-01-20 21:39 ` voidlinux-github
  2020-01-20 21:47 ` voidlinux-github
                   ` (31 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 21:39 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576437976

Comment:
Also seems like the revbump for wayfire broke it... you'll need to look into that.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (6 preceding siblings ...)
  2020-01-20 21:39 ` voidlinux-github
@ 2020-01-20 21:47 ` voidlinux-github
  2020-01-20 22:06 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (30 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 21:47 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576439763

Comment:
Sorry about not using the proper commit message format.
As for breaking stuff it broke sway and cage too. I managed to compile sway-1.3-rc3 but since that's an rc I can't update it yet, I think it comes down to packages adding compatibility for newer versions of wlroots so nothing I can do right now. Should I close this pull request and make another one when new versions of mentioned packages will be released or just wait and update this pull request?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (7 preceding siblings ...)
  2020-01-20 21:47 ` voidlinux-github
@ 2020-01-20 22:06 ` voidlinux-github
  2020-01-20 22:32 ` [WIP] " voidlinux-github
                   ` (29 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 22:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 312 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

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: 1607 bytes --]

From 6c6ff6b3c98aeba8d2eda61a199c11feda5ebbe0 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Mon, 20 Jan 2020 21:33:03 +0100
Subject: [PATCH] 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

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (8 preceding siblings ...)
  2020-01-20 22:06 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-20 22:32 ` voidlinux-github
  2020-01-20 22:32 ` voidlinux-github
                   ` (28 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 22:32 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576449622

Comment:
Okay, so I did my research, compiled everything a bunch of times and I can confirm that we have to wait for new versions of sway and cage. A new version of wayfire has been already released and it compiles fine with wlroots 0.9.1, the question is can I update it in this pull request or do I have to make another one?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (9 preceding siblings ...)
  2020-01-20 22:32 ` [WIP] " voidlinux-github
@ 2020-01-20 22:32 ` voidlinux-github
  2020-01-20 22:33 ` voidlinux-github
                   ` (27 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 22:32 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576439763

Comment:
Sorry about not using the proper commit message format.
As for breaking stuff it broke sway and cage too. I managed to compile sway-1.3-rc3 but since that's an rc I can't update it yet, I think it comes down to packages adding compatibility for newer versions of wlroots so nothing I can do right now.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (10 preceding siblings ...)
  2020-01-20 22:32 ` voidlinux-github
@ 2020-01-20 22:33 ` voidlinux-github
  2020-01-21  0:48 ` voidlinux-github
                   ` (26 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-20 22:33 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576449622

Comment:
Okay, so I did my research, compiled everything a bunch of times and I can confirm that we have to wait for new versions of sway and cage. A new version of wayfire has been already released and it compiles fine with wlroots 0.9.1, the question is can I update it in this pull request or do I have to make another one? And should I close this pull request and make another one when new versions of mentioned packages will be released or just wait and update this pull request?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (11 preceding siblings ...)
  2020-01-20 22:33 ` voidlinux-github
@ 2020-01-21  0:48 ` voidlinux-github
  2020-01-21  8:41 ` voidlinux-github
                   ` (25 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21  0:48 UTC (permalink / raw)
  To: ml

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

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576472934

Comment:
Yep, do the ones you can. Leave it open so that people know it's being worked on while you wait.

However there are some patches already avaliable in master which you can add to the patches/ subdirectory for each package:
- Sway: https://github.com/swaywm/sway/commit/ed02261551ac7748d38af4a0bcdeeab0437571fe -- adding .patch to the end gives you a patch you can use https://github.com/swaywm/sway/commit/ed02261551ac7748d38af4a0bcdeeab0437571fe.patch
- Cage: https://github.com/Hjdskes/cage/commit/51e6c760da51e2b885737d61a61cdc965bb9269d and https://github.com/Hjdskes/cage/commit/bfd7d605b89fc5436505611ad01806fc11aa9a08.

For future reference, I found these by going to the github repositories and searching for wlroots in commits.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (12 preceding siblings ...)
  2020-01-21  0:48 ` voidlinux-github
@ 2020-01-21  8:41 ` voidlinux-github
  2020-01-21  8:41 ` voidlinux-github
                   ` (24 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21  8:41 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576575946

Comment:
Thank you for the patches, but it's not as easy as it seems. I had to add new packages to makedepends and also use a few more patches from upstream but I managed to compile cage using wlroots 0.9.1, I'll test compiling sway next and when everything will be good I will push the changes here.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (13 preceding siblings ...)
  2020-01-21  8:41 ` voidlinux-github
@ 2020-01-21  8:41 ` voidlinux-github
  2020-01-21 12:58 ` voidlinux-github
                   ` (23 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21  8:41 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576575946

Comment:
Thank you for the patches, but it's not as easy as it seems. I had to add new packages to makedepends and also use a few more patches from upstream but I managed to compile cage using wlroots 0.9.1, I'll test compiling sway next and when everything will be good I will push those changes here.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (14 preceding siblings ...)
  2020-01-21  8:41 ` voidlinux-github
@ 2020-01-21 12:58 ` voidlinux-github
  2020-01-21 14:15 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (22 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21 12:58 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576669682

Comment:
As it turns out making sway-1.2 work (compile) with wlroots-0.9.1 is a lot more compilacted because a lot of files were changed a lot (and I really mean it) before updating it to work with newer versions of wlroots. Patching it would require me to make a frankenstein mix between sway-1.2 and sway-1.3 and I don't think that's a good option. All we need is to wait for sway-1.3 to be released and then it will work out of the box (well kinda, new makedends are required but it's not a big problem). For now I can update this pull request with new version of wayfire and patches for cage, then we have to wait for sway-1.3.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (15 preceding siblings ...)
  2020-01-21 12:58 ` voidlinux-github
@ 2020-01-21 14:15 ` voidlinux-github
  2020-01-21 16:07 ` voidlinux-github
                   ` (21 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21 14:15 UTC (permalink / raw)
  To: ml

[-- 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: 7202 bytes --]

From 6c6ff6b3c98aeba8d2eda61a199c11feda5ebbe0 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
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 <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 3bce50e520b51102522d0056294d4e351b77243d Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Mon, 20 Jan 2020 22:00:59 +0100
Subject: [PATCH 2/3] Revbumped packages due to soname bump

---
 srcpkgs/cage/template    | 2 +-
 srcpkgs/sway/template    | 2 +-
 srcpkgs/wayfire/template | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index eca84c1dacc..d26b924f867 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,7 +1,7 @@
 # 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"
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index a428a590d34..ca44f905709 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.2
-revision=2
+revision=3
 build_style=meson
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc git"
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c5e31d12414..1cba248b13a 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,7 +1,7 @@
 # Template file for 'wayfire'
 pkgname=wayfire
 version=0.3.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wlroots-devel glm cairo-devel wf-config-devel"

From 7c95b698d11da24368697ac0134e32d847cf3d5a Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Tue, 21 Jan 2020 15:14:52 +0100
Subject: [PATCH 3/3] cage: revbumb and fix for wlroots update

---
 ....1.1-fix-building-with-wlroots-0.9.1.patch | 77 +++++++++++++++++++
 srcpkgs/cage/template                         |  2 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 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 d26b924f867..8d933e7684a 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -4,7 +4,7 @@ version=0.1.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"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (16 preceding siblings ...)
  2020-01-21 14:15 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-21 16:07 ` voidlinux-github
  2020-01-21 16:15 ` voidlinux-github
                   ` (20 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21 16:07 UTC (permalink / raw)
  To: ml

[-- 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: 1607 bytes --]

From 6c6ff6b3c98aeba8d2eda61a199c11feda5ebbe0 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Mon, 20 Jan 2020 21:33:03 +0100
Subject: [PATCH] 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

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (17 preceding siblings ...)
  2020-01-21 16:07 ` voidlinux-github
@ 2020-01-21 16:15 ` voidlinux-github
  2020-01-21 16:20 ` voidlinux-github
                   ` (19 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21 16:15 UTC (permalink / raw)
  To: ml

[-- 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: 1607 bytes --]

From 9bd607748e899a9cb0df44be5d1b8328ca574298 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Mon, 20 Jan 2020 21:33:03 +0100
Subject: [PATCH] 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

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (18 preceding siblings ...)
  2020-01-21 16:15 ` voidlinux-github
@ 2020-01-21 16:20 ` voidlinux-github
  2020-01-21 16:26 ` voidlinux-github
                   ` (18 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21 16:20 UTC (permalink / raw)
  To: ml

[-- 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: 7383 bytes --]

From 9bd607748e899a9cb0df44be5d1b8328ca574298 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
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 <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 0981f55ef3ddbf747656d20eb7936f4a007a7879 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
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 <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 cd76defce6df785af8256963e620ca159ffe6c03 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
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 <ishestakov@airmail.cc>"
 license="MIT"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (19 preceding siblings ...)
  2020-01-21 16:20 ` voidlinux-github
@ 2020-01-21 16:26 ` voidlinux-github
  2020-01-21 16:29 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (17 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21 16:26 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-576762222

Comment:
Sorry for the mess in the commits, I'll squash all of them into one when sway-1.3 will come out.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (20 preceding siblings ...)
  2020-01-21 16:26 ` voidlinux-github
@ 2020-01-21 16:29 ` voidlinux-github
  2020-01-22 20:14 ` voidlinux-github
                   ` (16 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-21 16:29 UTC (permalink / raw)
  To: ml

[-- 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: 8656 bytes --]

From 9bd607748e899a9cb0df44be5d1b8328ca574298 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 0981f55ef3ddbf747656d20eb7936f4a007a7879 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Mon, 20 Jan 2020 21:33:03 +0100
Subject: [PATCH 2/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 cd76defce6df785af8256963e620ca159ffe6c03 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Tue, 21 Jan 2020 17:17:36 +0100
Subject: [PATCH 3/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 9301874dcc72d79daf66f7f3e289e2392c131c53 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Tue, 21 Jan 2020 17:29:31 +0100
Subject: [PATCH 4/4] wayfire: update to 0.3.1 for it to compile with
 wlroots-0.9.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"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (21 preceding siblings ...)
  2020-01-21 16:29 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-22 20:14 ` voidlinux-github
  2020-01-22 20:40 ` voidlinux-github
                   ` (15 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 20:14 UTC (permalink / raw)
  To: ml

[-- 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: 1607 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] 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

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (22 preceding siblings ...)
  2020-01-22 20:14 ` voidlinux-github
@ 2020-01-22 20:40 ` voidlinux-github
  2020-01-22 20:44 ` voidlinux-github
                   ` (14 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 20:40 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [WIP] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (23 preceding siblings ...)
  2020-01-22 20:40 ` voidlinux-github
@ 2020-01-22 20:44 ` voidlinux-github
  2020-01-22 21:18 ` voidlinux-github
                   ` (13 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 20:44 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-577376897

Comment:
I redid all the comits to delete that empty one.
New version of sway was released but it changed the meson.build to require wlroots>0.10.0 so I patched it to work with 0.9.1 as 0.10.0 isn't released as of yet. I'd really appreciate if someone would go over this and see if everything is ok.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (24 preceding siblings ...)
  2020-01-22 20:44 ` voidlinux-github
@ 2020-01-22 21:18 ` voidlinux-github
  2020-01-22 21:23 ` voidlinux-github
                   ` (12 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 21:18 UTC (permalink / raw)
  To: ml

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

New comment by Wychmire on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-577390389

Comment:
wlroots 0.10.0 [has a release now](https://github.com/swaywm/wlroots/releases/tag/0.10.0) so you should be able to remove the patch.

Since you're updating sway in this PR as well, you should probably update swayidle to [1.6](https://github.com/swaywm/swayidle/releases/tag/1.6) and swaylock to [1.5](https://github.com/swaywm/swaylock/releases/tag/1.5).

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (25 preceding siblings ...)
  2020-01-22 21:18 ` voidlinux-github
@ 2020-01-22 21:23 ` voidlinux-github
  2020-01-22 21:25 ` voidlinux-github
                   ` (11 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 21:23 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-577392446

Comment:
Well it's a pre-release so I didn't know if I could use it or not. I'll update wlroots, swaylock and swayidle then.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (26 preceding siblings ...)
  2020-01-22 21:23 ` voidlinux-github
@ 2020-01-22 21:25 ` voidlinux-github
  2020-01-22 21:26 ` voidlinux-github
                   ` (10 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 21:25 UTC (permalink / raw)
  To: ml

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

New comment by Wychmire on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-577393008

Comment:
oh, sorry. Didn't check to see if it was a pre-release or not, just that it existed. Should probably stick with 0.9.1 and the patch for now I think

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (27 preceding siblings ...)
  2020-01-22 21:25 ` voidlinux-github
@ 2020-01-22 21:26 ` voidlinux-github
  2020-01-22 21:35 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (9 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 21:26 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-577393395

Comment:
Ok, just swaylock and swayidle will be updated then.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (28 preceding siblings ...)
  2020-01-22 21:26 ` voidlinux-github
@ 2020-01-22 21:35 ` voidlinux-github
  2020-01-22 22:07 ` voidlinux-github
                   ` (8 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 21:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 312 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

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: 11349 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/6] 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/6] 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/6] 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/6] 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"

From ef1846fe93e4b58c83d44b30038149b541dc823b Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Wed, 22 Jan 2020 22:34:44 +0100
Subject: [PATCH 5/6] swayidle: update to 1.6

---
 srcpkgs/swayidle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swayidle/template b/srcpkgs/swayidle/template
index 3fddfdb2408..b6f51f47927 100644
--- a/srcpkgs/swayidle/template
+++ b/srcpkgs/swayidle/template
@@ -1,6 +1,6 @@
 # Template file for 'swayidle'
 pkgname=swayidle
-version=1.5
+version=1.6
 revision=1
 build_style=meson
 configure_args="-Dlogind-provider=elogind"
@@ -11,7 +11,7 @@ maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=55dd706ea888db36e01f5c262ebf896fd62bd94f485506424217429bd242eead
+checksum=efb2f0878531ea5be0744063e6e31762a16b4ee3cfb22dbade49795fa53b130c
 
 post_install() {
 	vlicense LICENSE

From c921078112d5dcdba442e3f95e89a2b703772314 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Wed, 22 Jan 2020 22:35:25 +0100
Subject: [PATCH 6/6] swaylock: update to 1.5

---
 srcpkgs/swaylock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swaylock/template b/srcpkgs/swaylock/template
index f24f34fac6f..ea7556286cb 100644
--- a/srcpkgs/swaylock/template
+++ b/srcpkgs/swaylock/template
@@ -1,6 +1,6 @@
 # Template file for 'swaylock'
 pkgname=swaylock
-version=1.4
+version=1.5
 revision=1
 build_style=meson
 conf_files="/etc/pam.d/swaylock"
@@ -12,7 +12,7 @@ maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=8e6ad33d16370084f5242fd19e0ad631deaeb636cd9699cb8561ca9f18751440
+checksum=37b9c70e5698e8872b0b964a7454ecdb0f1a9e06b686eecf2b6c54f7f64a3f42
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (29 preceding siblings ...)
  2020-01-22 21:35 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-22 22:07 ` voidlinux-github
  2020-01-22 22:11 ` voidlinux-github
                   ` (7 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 22:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 312 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

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: 13415 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/7] 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/7] 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/7] 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/7] 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"

From ef1846fe93e4b58c83d44b30038149b541dc823b Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Wed, 22 Jan 2020 22:34:44 +0100
Subject: [PATCH 5/7] swayidle: update to 1.6

---
 srcpkgs/swayidle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swayidle/template b/srcpkgs/swayidle/template
index 3fddfdb2408..b6f51f47927 100644
--- a/srcpkgs/swayidle/template
+++ b/srcpkgs/swayidle/template
@@ -1,6 +1,6 @@
 # Template file for 'swayidle'
 pkgname=swayidle
-version=1.5
+version=1.6
 revision=1
 build_style=meson
 configure_args="-Dlogind-provider=elogind"
@@ -11,7 +11,7 @@ maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=55dd706ea888db36e01f5c262ebf896fd62bd94f485506424217429bd242eead
+checksum=efb2f0878531ea5be0744063e6e31762a16b4ee3cfb22dbade49795fa53b130c
 
 post_install() {
 	vlicense LICENSE

From c921078112d5dcdba442e3f95e89a2b703772314 Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Wed, 22 Jan 2020 22:35:25 +0100
Subject: [PATCH 6/7] swaylock: update to 1.5

---
 srcpkgs/swaylock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swaylock/template b/srcpkgs/swaylock/template
index f24f34fac6f..ea7556286cb 100644
--- a/srcpkgs/swaylock/template
+++ b/srcpkgs/swaylock/template
@@ -1,6 +1,6 @@
 # Template file for 'swaylock'
 pkgname=swaylock
-version=1.4
+version=1.5
 revision=1
 build_style=meson
 conf_files="/etc/pam.d/swaylock"
@@ -12,7 +12,7 @@ maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=8e6ad33d16370084f5242fd19e0ad631deaeb636cd9699cb8561ca9f18751440
+checksum=37b9c70e5698e8872b0b964a7454ecdb0f1a9e06b686eecf2b6c54f7f64a3f42
 
 post_install() {
 	vlicense LICENSE

From d2004485ef2fb1212a645ab491ed89985fb716bb Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Wed, 22 Jan 2020 23:07:34 +0100
Subject: [PATCH 7/7] cage: update patch

---
 ....1.1-fix-building-with-wlroots-0.9.1.patch | 36 -------------------
 1 file changed, 36 deletions(-)

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
index 313cfe90419..84f313ab4c3 100644
--- 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
@@ -10,42 +10,6 @@
  }
  
  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 @@

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (30 preceding siblings ...)
  2020-01-22 22:07 ` voidlinux-github
@ 2020-01-22 22:11 ` voidlinux-github
  2020-01-23  6:00 ` voidlinux-github
                   ` (6 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-22 22:11 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-577410042

Comment:
Revised the patch.
I guess I'll ask here, what does it take to become a maintainer of a package? wlroots is currently orphaned and I'd like to take over the maintainership, thanks in advance.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (31 preceding siblings ...)
  2020-01-22 22:11 ` voidlinux-github
@ 2020-01-23  6:00 ` voidlinux-github
  2020-01-23  7:43 ` voidlinux-github
                   ` (5 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-23  6:00 UTC (permalink / raw)
  To: ml

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

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-577518612

Comment:
the freerdp stuff in `makedepends` is wrong. freerdp support is removed from wlroots (0.10.0).
swaylock and swayidle do not depend on wlroots, so you don't need to update them in this PR.

pretty much anyone can be maintainer of a package, but the actual "maintainership" of packages is loosely held in Void

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.9.1
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (32 preceding siblings ...)
  2020-01-23  6:00 ` voidlinux-github
@ 2020-01-23  7:43 ` voidlinux-github
  2020-01-23  8:01 ` [PR PATCH] [Updated] (WIP) wlroots: update to 0.10.0 voidlinux-github
                   ` (4 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-23  7:43 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-577554087

Comment:
Now (0.10.0) it's removed, but when bulding against wlroots 0.9.1 it would fail, will redo.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] (WIP) wlroots: update to 0.10.0
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (33 preceding siblings ...)
  2020-01-23  7:43 ` voidlinux-github
@ 2020-01-23  8:01 ` voidlinux-github
  2020-01-23  8:25 ` voidlinux-github
                   ` (3 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-23  8:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 319 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.10.0


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: 2056 bytes --]

From 277800ffc9195f223706244ce44a15d02f8ae41b Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Thu, 23 Jan 2020 09:01:14 +0100
Subject: [PATCH] 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 60f082055a3..d7af712815b 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 75ddb338a15..d025e27f70d 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 <orphan@voidlinux.org>"
 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

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] (WIP) wlroots: update to 0.10.0
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (34 preceding siblings ...)
  2020-01-23  8:01 ` [PR PATCH] [Updated] (WIP) wlroots: update to 0.10.0 voidlinux-github
@ 2020-01-23  8:25 ` voidlinux-github
  2020-01-23  8:35 ` voidlinux-github
                   ` (2 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-23  8:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 319 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.10.0


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: 8764 bytes --]

From 277800ffc9195f223706244ce44a15d02f8ae41b Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
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 60f082055a3..d7af712815b 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 75ddb338a15..d025e27f70d 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 <orphan@voidlinux.org>"
 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 <damneq@disroot.org>
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 00000000000..111aa937dfb
--- /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 eca84c1dacc..49342bf81c7 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 <ishestakov@airmail.cc>"
 license="MIT"

From 7b604a7f756c2501b21626ba7df6fa53a5c059ec Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
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 00000000000..3cd4d3fe6f9
--- /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 c5e31d12414..cdcd900b67e 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 <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 735d31f1e11acfba1d616b9c257913fde211faac Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
Date: Thu, 23 Jan 2020 09:24:51 +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 a428a590d34..5e02b2734dc 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 <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"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] (WIP) wlroots: update to 0.10.0
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (35 preceding siblings ...)
  2020-01-23  8:25 ` voidlinux-github
@ 2020-01-23  8:35 ` voidlinux-github
  2020-01-23  8:54 ` voidlinux-github
  2020-01-25  7:51 ` [PR PATCH] [Merged]: wlroots: update to 0.10.0, cage: revbump, wayfire: update to 0.3.1, sway: update to 1.4 voidlinux-github
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-23  8:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 319 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.10.0


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: 8763 bytes --]

From 277800ffc9195f223706244ce44a15d02f8ae41b Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
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 60f082055a3..d7af712815b 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 75ddb338a15..d025e27f70d 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 <orphan@voidlinux.org>"
 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 <damneq@disroot.org>
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 00000000000..111aa937dfb
--- /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 eca84c1dacc..49342bf81c7 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 <ishestakov@airmail.cc>"
 license="MIT"

From 7b604a7f756c2501b21626ba7df6fa53a5c059ec Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
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 00000000000..3cd4d3fe6f9
--- /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 c5e31d12414..cdcd900b67e 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 <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 d6ee29e9fa6356a6195b0d3f510cda5a168c69fb Mon Sep 17 00:00:00 2001
From: damneq <damneq@disroot.org>
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 a428a590d34..964702f3948 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 <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"

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: wlroots: update to 0.10.0
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (36 preceding siblings ...)
  2020-01-23  8:35 ` voidlinux-github
@ 2020-01-23  8:54 ` voidlinux-github
  2020-01-25  7:51 ` [PR PATCH] [Merged]: wlroots: update to 0.10.0, cage: revbump, wayfire: update to 0.3.1, sway: update to 1.4 voidlinux-github
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-23  8:54 UTC (permalink / raw)
  To: ml

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

New comment by damneq on void-packages repository

https://github.com/void-linux/void-packages/pull/18432#issuecomment-577585594

Comment:
Everything should be good now and the pull request should be ready to merge.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Merged]: wlroots: update to 0.10.0, cage: revbump, wayfire: update to 0.3.1, sway: update to 1.4
  2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
                   ` (37 preceding siblings ...)
  2020-01-23  8:54 ` voidlinux-github
@ 2020-01-25  7:51 ` voidlinux-github
  38 siblings, 0 replies; 40+ messages in thread
From: voidlinux-github @ 2020-01-25  7:51 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

wlroots: update to 0.10.0, cage: revbump, wayfire: update to 0.3.1, sway: update to 1.4
https://github.com/void-linux/void-packages/pull/18432

Description:


^ permalink raw reply	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2020-01-25  7:51 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-20 20:34 [PR PATCH] wlroots: update to 0.9.1 voidlinux-github
2020-01-20 20:44 ` voidlinux-github
2020-01-20 20:52 ` voidlinux-github
2020-01-20 20:54 ` voidlinux-github
2020-01-20 21:01 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-20 21:02 ` voidlinux-github
2020-01-20 21:37 ` voidlinux-github
2020-01-20 21:39 ` voidlinux-github
2020-01-20 21:47 ` voidlinux-github
2020-01-20 22:06 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-20 22:32 ` [WIP] " voidlinux-github
2020-01-20 22:32 ` voidlinux-github
2020-01-20 22:33 ` voidlinux-github
2020-01-21  0:48 ` voidlinux-github
2020-01-21  8:41 ` voidlinux-github
2020-01-21  8:41 ` voidlinux-github
2020-01-21 12:58 ` voidlinux-github
2020-01-21 14:15 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-21 16:07 ` voidlinux-github
2020-01-21 16:15 ` voidlinux-github
2020-01-21 16:20 ` voidlinux-github
2020-01-21 16:26 ` voidlinux-github
2020-01-21 16:29 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-22 20:14 ` voidlinux-github
2020-01-22 20:40 ` voidlinux-github
2020-01-22 20:44 ` voidlinux-github
2020-01-22 21:18 ` voidlinux-github
2020-01-22 21:23 ` voidlinux-github
2020-01-22 21:25 ` voidlinux-github
2020-01-22 21:26 ` voidlinux-github
2020-01-22 21:35 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-22 22:07 ` voidlinux-github
2020-01-22 22:11 ` voidlinux-github
2020-01-23  6:00 ` voidlinux-github
2020-01-23  7:43 ` voidlinux-github
2020-01-23  8:01 ` [PR PATCH] [Updated] (WIP) wlroots: update to 0.10.0 voidlinux-github
2020-01-23  8:25 ` voidlinux-github
2020-01-23  8:35 ` voidlinux-github
2020-01-23  8:54 ` voidlinux-github
2020-01-25  7:51 ` [PR PATCH] [Merged]: wlroots: update to 0.10.0, cage: revbump, wayfire: update to 0.3.1, sway: update to 1.4 voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).