* [PR PATCH] wlroots: reduce the maintanance burden on future release
@ 2024-01-22 13:26 sgn
2024-01-22 13:27 ` [PR PATCH] [Updated] " sgn
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: sgn @ 2024-01-22 13:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1281 bytes --]
There is a new 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: 5453 bytes --]
From f9e9862b22efc3c4d398b43349db7e4e638796b1 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:16:31 +0700
Subject: [PATCH 1/3] wlroots0.15: remove package
---
srcpkgs/removed-packages/template | 2 ++
srcpkgs/wlroots0.15-devel | 1 -
srcpkgs/wlroots0.15/template | 38 -------------------------------
3 files changed, 2 insertions(+), 39 deletions(-)
delete mode 120000 srcpkgs/wlroots0.15-devel
delete mode 100644 srcpkgs/wlroots0.15/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 94feb99c0a862..f79a60175499a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -701,6 +701,8 @@ replaces="
wireshark-gtk<=3.0.7_1
wlroots0.14-devel<=0.14.1_1
wlroots0.14<=0.14.1_1
+ wlroots0.15<=0.15.1_1
+ wlroots0.15-devel<=0.15.1_1
wmii<=3.9.2_8
xcdroast<=1.19_1
xdebug8.0<=3.2.1_1
diff --git a/srcpkgs/wlroots0.15-devel b/srcpkgs/wlroots0.15-devel
deleted file mode 120000
index 2e1ce6ccc6241..0000000000000
--- a/srcpkgs/wlroots0.15-devel
+++ /dev/null
@@ -1 +0,0 @@
-wlroots0.15
\ No newline at end of file
diff --git a/srcpkgs/wlroots0.15/template b/srcpkgs/wlroots0.15/template
deleted file mode 100644
index 1cfd3c2a71c72..0000000000000
--- a/srcpkgs/wlroots0.15/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'wlroots0.15'
-pkgname=wlroots0.15
-version=0.15.1
-revision=1
-build_style=meson
-# Follow upstream packaging recommendations:
-# https://github.com/swaywm/wlroots/wiki/Packaging-recommendations
-configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
- -Db_ndebug=false"
-hostmakedepends="pkg-config wayland-devel glslang"
-_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel
- libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
- wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel
- xcb-util-wm-devel xcb-util-renderutil-devel "
-makedepends="${_devel_depends}
- libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
- xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
-short_desc="Modular Wayland compositor library"
-maintainer="Isaac Freund <mail@isaacfreund.com>"
-license="MIT"
-homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
-
-post_install() {
- vlicense LICENSE
-}
-
-wlroots0.15-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
- conflicts="wlroots0.14-devel"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
From aca754be99492bc6d84cefd001d0e74d78d535e2 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 2/3] wlroots0.16: -devel provides and conflicts with
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 027b7a3b684952185fc4608c30abcb6e384fc295 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 3/3] wlroots0.17: -devel provides and conflicts with
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] wlroots: reduce the maintanance burden on future release
2024-01-22 13:26 [PR PATCH] wlroots: reduce the maintanance burden on future release sgn
@ 2024-01-22 13:27 ` sgn
2024-01-22 15:46 ` ahesford
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2024-01-22 13:27 UTC (permalink / raw)
To: ml
[-- 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: 5444 bytes --]
From f9e9862b22efc3c4d398b43349db7e4e638796b1 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:16:31 +0700
Subject: [PATCH 1/3] wlroots0.15: remove package
---
srcpkgs/removed-packages/template | 2 ++
srcpkgs/wlroots0.15-devel | 1 -
srcpkgs/wlroots0.15/template | 38 -------------------------------
3 files changed, 2 insertions(+), 39 deletions(-)
delete mode 120000 srcpkgs/wlroots0.15-devel
delete mode 100644 srcpkgs/wlroots0.15/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 94feb99c0a862..f79a60175499a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -701,6 +701,8 @@ replaces="
wireshark-gtk<=3.0.7_1
wlroots0.14-devel<=0.14.1_1
wlroots0.14<=0.14.1_1
+ wlroots0.15<=0.15.1_1
+ wlroots0.15-devel<=0.15.1_1
wmii<=3.9.2_8
xcdroast<=1.19_1
xdebug8.0<=3.2.1_1
diff --git a/srcpkgs/wlroots0.15-devel b/srcpkgs/wlroots0.15-devel
deleted file mode 120000
index 2e1ce6ccc6241..0000000000000
--- a/srcpkgs/wlroots0.15-devel
+++ /dev/null
@@ -1 +0,0 @@
-wlroots0.15
\ No newline at end of file
diff --git a/srcpkgs/wlroots0.15/template b/srcpkgs/wlroots0.15/template
deleted file mode 100644
index 1cfd3c2a71c72..0000000000000
--- a/srcpkgs/wlroots0.15/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'wlroots0.15'
-pkgname=wlroots0.15
-version=0.15.1
-revision=1
-build_style=meson
-# Follow upstream packaging recommendations:
-# https://github.com/swaywm/wlroots/wiki/Packaging-recommendations
-configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false
- -Db_ndebug=false"
-hostmakedepends="pkg-config wayland-devel glslang"
-_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel
- libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
- wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel
- xcb-util-wm-devel xcb-util-renderutil-devel "
-makedepends="${_devel_depends}
- libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
- xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
-short_desc="Modular Wayland compositor library"
-maintainer="Isaac Freund <mail@isaacfreund.com>"
-license="MIT"
-homepage="https://gitlab.freedesktop.org/wlroots/wlroots"
-distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"
-checksum=5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373
-
-post_install() {
- vlicense LICENSE
-}
-
-wlroots0.15-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}"
- conflicts="wlroots0.14-devel"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
From 0ba5b474d922de6390f08367d50e4d09a0dd13f5 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 2/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 e9e5e681f2e14e2f7ec1cb699aa9471ca4da220d 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 3/3] wlroots0.17-devel: provides & conflicts 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: wlroots: reduce the maintanance burden on future release
2024-01-22 13:26 [PR PATCH] wlroots: reduce the maintanance burden on future release sgn
2024-01-22 13:27 ` [PR PATCH] [Updated] " sgn
@ 2024-01-22 15:46 ` ahesford
2024-01-22 15:49 ` ahesford
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ahesford @ 2024-01-22 15:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/48323#issuecomment-1904282682
Comment:
`hikari` still depends on `wlroots0.15`, so either `hikari` needs to go or `wlroots0.15` needs to stay.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: wlroots: reduce the maintanance burden on future release
2024-01-22 13:26 [PR PATCH] wlroots: reduce the maintanance burden on future release sgn
2024-01-22 13:27 ` [PR PATCH] [Updated] " sgn
2024-01-22 15:46 ` ahesford
@ 2024-01-22 15:49 ` ahesford
2024-01-23 2:36 ` [PR PATCH] [Updated] " sgn
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ahesford @ 2024-01-22 15:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/48323#issuecomment-1904288299
Comment:
Why not just use the existing `wlroots-devel` name for this?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] wlroots: reduce the maintanance burden on future release
2024-01-22 13:26 [PR PATCH] wlroots: reduce the maintanance burden on future release sgn
` (2 preceding siblings ...)
2024-01-22 15:49 ` ahesford
@ 2024-01-23 2:36 ` sgn
2024-01-23 15:11 ` sgn
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2024-01-23 2:36 UTC (permalink / raw)
To: ml
[-- 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: 3724 bytes --]
From 7e1fed923adb81a3dd939278964fb516edc7484f 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 060e9f1547c6991e3921d83acf4cc4a5b7da4c8b 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 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 9f84e2b5a83a3714c66bd4ce5b2505cec30f4f84 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: wlroots: reduce the maintanance burden on future release
2024-01-22 13:26 [PR PATCH] wlroots: reduce the maintanance burden on future release sgn
` (3 preceding siblings ...)
2024-01-23 2:36 ` [PR PATCH] [Updated] " sgn
@ 2024-01-23 15:11 ` sgn
2024-01-25 12:37 ` [PR PATCH] [Updated] " sgn
2024-01-27 4:52 ` [PR PATCH] [Merged]: " sgn
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2024-01-23 15:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 645 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/48323#issuecomment-1906256402
Comment:
> Why not just use the existing `wlroots-devel` name for this?
Because they'll conflict.
```
# xbps-install -R hostdir/binpkgs/ -R hostdir/binpkgs/debug wlroots-devel
CONFLICT: wlroots0.17-devel-0.17.1_3 with wlroots-devel-0.17_1 in transaction (matched by wlroots-devel>=0)
Transaction aborted due to conflicting packages.
```
In order to make it work, I think we may need to remove `wlroots-devel` completely from repo.
(Or `replaces=wlroots-devel>=0`, I didn't check this solution, though.)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] wlroots: reduce the maintanance burden on future release
2024-01-22 13:26 [PR PATCH] wlroots: reduce the maintanance burden on future release sgn
` (4 preceding siblings ...)
2024-01-23 15:11 ` sgn
@ 2024-01-25 12:37 ` sgn
2024-01-27 4:52 ` [PR PATCH] [Merged]: " sgn
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2024-01-25 12:37 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: wlroots: reduce the maintanance burden on future release
2024-01-22 13:26 [PR PATCH] wlroots: reduce the maintanance burden on future release sgn
` (5 preceding siblings ...)
2024-01-25 12:37 ` [PR PATCH] [Updated] " sgn
@ 2024-01-27 4:52 ` sgn
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2024-01-27 4:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]
There's a merged pull request on the void-packages repository
wlroots: reduce the maintanance burden on future release
https://github.com/void-linux/void-packages/pull/48323
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-01-27 4:52 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-22 13:26 [PR PATCH] wlroots: reduce the maintanance burden on future release sgn
2024-01-22 13:27 ` [PR PATCH] [Updated] " sgn
2024-01-22 15:46 ` ahesford
2024-01-22 15:49 ` ahesford
2024-01-23 2:36 ` [PR PATCH] [Updated] " sgn
2024-01-23 15:11 ` sgn
2024-01-25 12:37 ` [PR PATCH] [Updated] " sgn
2024-01-27 4:52 ` [PR PATCH] [Merged]: " sgn
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).