Re: [PR PATCH] [Updated] wlroots: reduce the maintanance burden on future release

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

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

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

https://github.com/sgn/void-packages wlroots-devel-meta-conflicts
https://github.com/void-linux/void-packages/pull/48323

wlroots: reduce the maintanance burden on future release
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/48323.patch is attached

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

From 12d8d2ca152a5c7e067489bfd2e4e3db2d09de8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 22 Jan 2024 20:19:50 +0700
Subject: [PATCH 1/3] wlroots0.16-devel: provides & conflicts
 virtual-wlroots-devel

This will easy the future -devel' conflicts
---
 srcpkgs/wlroots0.16/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wlroots0.16/template b/srcpkgs/wlroots0.16/template
index ad4e17072172b..c670aa9b79ff2 100644
--- a/srcpkgs/wlroots0.16/template
+++ b/srcpkgs/wlroots0.16/template
@@ -1,7 +1,7 @@
 # Template file for 'wlroots0.16'
 pkgname=wlroots0.16
 version=0.16.2
-revision=1
+revision=2
 build_style=meson
 # Follow upstream packaging recommendations:
 # https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations
@@ -28,7 +28,8 @@ post_install() {
 
 wlroots0.16-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
-	conflicts="wlroots0.15-devel wlroots0.14-devel"
+	provides="virtual-wlroots-devel-${version}_${revision}"
+	conflicts="wlroots0.15-devel wlroots0.14-devel virtual-wlroots-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 0687a75396d67ee9447fb6884fde0bb535b14f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 22 Jan 2024 20:19:54 +0700
Subject: [PATCH 2/3] wlroots0.17-devel: provides & conflicts
 virtual-wlroots-devel

This will easy the future -devel' conflicts
---
 srcpkgs/wlroots0.17/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wlroots0.17/template b/srcpkgs/wlroots0.17/template
index 08686f163f5fd..a56848623db0b 100644
--- a/srcpkgs/wlroots0.17/template
+++ b/srcpkgs/wlroots0.17/template
@@ -1,7 +1,7 @@
 # Template file for 'wlroots0.17'
 pkgname=wlroots0.17
 version=0.17.1
-revision=2
+revision=3
 build_style=meson
 # Follow upstream packaging recommendations:
 # https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations
@@ -28,7 +28,9 @@ post_install() {
 
 wlroots0.17-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
-	conflicts="wlroots0.16-devel wlroots0.15-devel wlroots0.14-devel"
+	provides="virtual-wlroots-devel-${version}_${revision}"
+	conflicts="wlroots0.16-devel wlroots0.15-devel wlroots0.14-devel
+	 virtual-wlroots-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From ce19b2325ec5040d393ddbbdde13908560c57ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 23 Jan 2024 09:35:22 +0700
Subject: [PATCH 3/3] wlroots0.15-devel: provides and conflicts with
 virtual-wlroots-devel

---
 srcpkgs/wlroots0.15/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wlroots0.15/template b/srcpkgs/wlroots0.15/template
index 1cfd3c2a71c72..40d45967721fa 100644
--- a/srcpkgs/wlroots0.15/template
+++ b/srcpkgs/wlroots0.15/template
@@ -1,7 +1,7 @@
 # Template file for 'wlroots0.15'
 pkgname=wlroots0.15
 version=0.15.1
-revision=1
+revision=2
 build_style=meson
 # Follow upstream packaging recommendations:
 # https://github.com/swaywm/wlroots/wiki/Packaging-recommendations
@@ -28,7 +28,8 @@ post_install() {
 
 wlroots0.15-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
-	conflicts="wlroots0.14-devel"
+	provides="virtual-wlroots-devel-${version}_${revision}"
+	conflicts="wlroots0.14-devel virtual-wlroots-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include