Re: [PR PATCH] [Updated] wlroots: update to 0.14.0.

[ifreund <ifreund@users.noreply.github.com>]

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

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

https://github.com/ifreund/void-packages wlroots
https://github.com/void-linux/void-packages/pull/31628

wlroots: update to 0.14.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From ebf2e011e09a72eea8aa7b3fc77a1c992caff77c Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 23 Jun 2021 14:40:10 +0200
Subject: [PATCH 1/5] wlroots: update to 0.14.0.

---
 common/shlibs            | 2 +-
 srcpkgs/wlroots/template | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 71d099465be5..8a7eef8df8c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3507,7 +3507,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.8 wlroots-0.13.0_1
+libwlroots.so.9 wlroots-0.14.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 fd3a4b0b5aae..23323fe65eaf 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,12 +1,11 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=meson
 # Follow upstream packaging recommendations:
 # https://github.com/swaywm/wlroots/wiki/Packaging-recommendations
-configure_args="--auto-features=enabled -Dlogind=disabled
- -Dexamples=false -Dwerror=false -Db_ndebug=false"
+configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false"
 hostmakedepends="pkg-config wayland-devel"
 _devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
  libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
@@ -19,7 +18,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/swaywm/wlroots"
 distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
-checksum=f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3
+checksum=2a8435bf63681868699c4e3975df31cb111ad2d3f35740179036083f87382ac7
 
 post_install() {
 	vlicense LICENSE

From 0b92d638cc7e8dee4714c8237b563f1d7826b2ce Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sat, 26 Jun 2021 13:29:45 +0200
Subject: [PATCH 2/5] wayfire: update to 0.7.2.

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

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index c0fbbfd07089..0480204ed5c4 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,9 +1,9 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.7.1
+version=0.7.2
 revision=1
-_utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
-_touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
+_utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
+_touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 build_style=meson
 configure_args="-Dprint_trace=false"
 hostmakedepends="pkg-config wayland-devel"
@@ -17,9 +17,9 @@ homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
  https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz
  https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz"
-checksum="96cb7820cddbae962ca456fd1989cdaa00cd880b109bf8e9d667b9264a20c257
- d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
- 2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
+checksum="e45fddcc22b7149d793fea08763c5b3dc0edf7c0be9d094575a32cf847560fd4
+ bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f
+ 09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 
 # Optimization for nested STL calls
 CXXFLAGS="-O3"

From 641165fd6edbe8a83dac0f20abda46b3390e10d7 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sat, 26 Jun 2021 13:42:18 +0200
Subject: [PATCH 3/5] sway: update to 1.6.1.

---
 srcpkgs/sway/patches/primary_selection.diff | 25 ---------------------
 srcpkgs/sway/template                       |  6 ++---
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/sway/patches/primary_selection.diff

diff --git a/srcpkgs/sway/patches/primary_selection.diff b/srcpkgs/sway/patches/primary_selection.diff
deleted file mode 100644
index 5ca2b0e14d6e..000000000000
--- a/srcpkgs/sway/patches/primary_selection.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Sway 1.6 removed support for gtk-primary-selection, but some
-programs (e.g. Firefox ESR 78) still rely on it.
-Since wlroots will drop it in version 0.14, we can restore
-this feature on sway.
-https://github.com/swaywm/sway/pull/5788
-https://github.com/swaywm/wlroots/issues/2421
-https://github.com/swaywm/wlroots/pull/2460
---- a/sway/server.c
-+++ b/sway/server.c
-@@ -15,6 +15,7 @@
- #include <wlr/types/wlr_data_control_v1.h>
- #include <wlr/types/wlr_export_dmabuf_v1.h>
- #include <wlr/types/wlr_gamma_control_v1.h>
-+#include <wlr/types/wlr_gtk_primary_selection.h>
- #include <wlr/types/wlr_idle.h>
- #include <wlr/types/wlr_layer_shell_v1.h>
- #include <wlr/types/wlr_pointer_constraints_v1.h>
-@@ -75,6 +76,7 @@ bool server_init(struct sway_server *server) {
- 		wlr_data_device_manager_create(server->wl_display);
- 
- 	wlr_gamma_control_manager_v1_create(server->wl_display);
-+	wlr_gtk_primary_selection_device_manager_create(server->wl_display);
- 
- 	server->new_output.notify = handle_new_output;
- 	wl_signal_add(&server->backend->events.new_output, &server->new_output);
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 4a77658518e8..aa29ee172a4f 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.6
-revision=2
+version=1.6.1
+revision=1
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"
@@ -14,7 +14,7 @@ maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"
 homepage="https://swaywm.org"
 distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz"
-checksum=9ecfd2f38239f7e90922a13cd348fc95fc059e8fa0e4b75b8ffcc7b61685a5fb
+checksum=8b138867cd83217de07138144b1279fe58e0421eb10c91122aa33c8770fe7391
 
 post_install() {
 	vlicense LICENSE

From 08c31e9edaddb9958fcbedceb7ac0fa38085408f Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sat, 26 Jun 2021 13:45:53 +0200
Subject: [PATCH 4/5] cage: update to 0.1.4.

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

diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 1b447bcf2ba1..6b6c6044d945 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,6 +1,6 @@
 # Template file for 'cage'
 pkgname=cage
-version=0.1.3
+version=0.1.4
 revision=1
 build_style=meson
 configure_args="$(vopt_bool xwayland xwayland)"
@@ -12,7 +12,7 @@ maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"
 homepage="https://www.hjdskes.nl/projects/cage/"
 distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz"
-checksum=c28aa8230f937c89b564967748451c1eb15d8633a71a1ed6e22d532afa15462e
+checksum=dfe27fb0c7d43db72d6c82f01e2736580a0791a23ba69d7b56285d08af98ad90
 
 build_options="xwayland"
 build_options_default="xwayland"

From e35e182d9349f63337b1438261d0a9eb086600f0 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sat, 26 Jun 2021 13:55:11 +0200
Subject: [PATCH 5/5] hikari: revbump for wlroots 0.14.0

---
 srcpkgs/hikari/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 4d189cf0ae3e..a4010ad9609e 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,7 +1,7 @@
 # Template file for 'hikari'
 pkgname=hikari
 version=2.3.0
-revision=1
+revision=3
 build_style=gnu-makefile
 make_cmd=bmake
 make_use_env=yes