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?= 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 " -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?= 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?= 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