From 8860894191163f25af9997e113dcbec71a092e94 Mon Sep 17 00:00:00 2001 From: migue07juegos Date: Thu, 7 Dec 2023 22:32:56 -0600 Subject: [PATCH 01/10] update wlroots to 0.17, move 0.16 to own pkg --- common/shlibs | 1 + srcpkgs/wlroots/template | 6 +++--- srcpkgs/wlroots0.17-devel | 1 + srcpkgs/wlroots0.17/template | 38 ++++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/wlroots0.17-devel create mode 100644 srcpkgs/wlroots0.17/template diff --git a/common/shlibs b/common/shlibs index f7046cbb6c206c..8d05b249a7549d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3490,6 +3490,7 @@ libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1 libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1 libwlroots.so.10 wlroots0.15-0.15.1_1 libwlroots.so.11 wlroots0.16-0.16.0_1 +libwlroots.so.12 wlroots0.17-0.17.0_1 libbaseencode.so.1 libbaseencode-1.0.9_1 libcotp.so.2 libcotp-2.0.1_1 libunarr.so.1 libunarr-1.0.1_1 diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index 1f7e668303eafe..2645643eba2ea7 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -2,17 +2,17 @@ # # On next bump, remove the .99 part pkgname=wlroots -version=0.16.99 +version=0.17 revision=1 build_style=meta -depends="wlroots${version%.99}" +depends="wlroots${version}" short_desc="Modular Wayland compositor library" maintainer="Đoàn Trần Công Danh " license="BSD-2-Clause" # no vlicense homepage="https://github.com/swaywm/wlroots" wlroots-devel_package() { - depends="wlroots${version%.99}-devel" + depends="wlroots${version}-devel" build_style=meta short_desc+=" - development files" } diff --git a/srcpkgs/wlroots0.17-devel b/srcpkgs/wlroots0.17-devel new file mode 120000 index 00000000000000..1c3af8082388e3 --- /dev/null +++ b/srcpkgs/wlroots0.17-devel @@ -0,0 +1 @@ +/home/mig/void-packages/srcpkgs/wlroots0.17 \ No newline at end of file diff --git a/srcpkgs/wlroots0.17/template b/srcpkgs/wlroots0.17/template new file mode 100644 index 00000000000000..1f26e036c3504b --- /dev/null +++ b/srcpkgs/wlroots0.17/template @@ -0,0 +1,38 @@ +# Template file for 'wlroots0.17' +pkgname=wlroots0.17 +version=0.17.0 +revision=1 +build_style=meson +# Follow upstream packaging recommendations: +# https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations +configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false + -Db_ndebug=false" +hostmakedepends="pkg-config wayland-devel glslang hwids" +_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 libdisplay-info-devel" +short_desc="Modular Wayland compositor library ${pkgname#wlroots}" +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=9da3475a6834a6a9a8fd93de84f4ef91f9ee48ff70c305aa9522bf0db9e61128 + +post_install() { + vlicense LICENSE +} + +wlroots0.17-devel_package() { + depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" + conflicts="wlroots0.16-devel wlroots0.15-devel wlroots0.14-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 62d795091ae1e15699c72289e3ee620d4730e349 Mon Sep 17 00:00:00 2001 From: migue07juegos <104018233+migue07juegos@users.noreply.github.com> Date: Fri, 8 Dec 2023 04:37:45 +0000 Subject: [PATCH 02/10] "fix -devel link" --- srcpkgs/wlroots0.17-devel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wlroots0.17-devel b/srcpkgs/wlroots0.17-devel index 1c3af8082388e3..26df7ad9d6bc6d 120000 --- a/srcpkgs/wlroots0.17-devel +++ b/srcpkgs/wlroots0.17-devel @@ -1 +1 @@ -/home/mig/void-packages/srcpkgs/wlroots0.17 \ No newline at end of file +wlroots0.17 \ No newline at end of file From e038c5e94e8e205f5fddfc22210928205f9ce059 Mon Sep 17 00:00:00 2001 From: migue07juegos Date: Fri, 8 Dec 2023 13:48:50 -0600 Subject: [PATCH 03/10] fix extra space in template --- srcpkgs/wlroots0.17/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wlroots0.17/template b/srcpkgs/wlroots0.17/template index 1f26e036c3504b..cef18749b92a7f 100644 --- a/srcpkgs/wlroots0.17/template +++ b/srcpkgs/wlroots0.17/template @@ -11,7 +11,7 @@ hostmakedepends="pkg-config wayland-devel glslang hwids" _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 " + 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 libdisplay-info-devel" From 289526c0dfd3ca81df774c2ea1f4a3bd3978f1d4 Mon Sep 17 00:00:00 2001 From: migue07juegos Date: Fri, 8 Dec 2023 15:40:19 -0600 Subject: [PATCH 04/10] cagebreak: update to 2.2.3 --- srcpkgs/cagebreak/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cagebreak/template b/srcpkgs/cagebreak/template index f1b8a4f56a7d45..cc85cffe2fceaf 100644 --- a/srcpkgs/cagebreak/template +++ b/srcpkgs/cagebreak/template @@ -1,12 +1,12 @@ # Template file for 'cagebreak' pkgname=cagebreak -version=2.2.1 +version=2.2.3 revision=1 build_style=meson configure_args="--buildtype=release -Dman-pages=true $(vopt_bool xwayland xwayland)" conf_files="/etc/xdg/cagebreak/config" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wlroots-devel cairo-devel pango-devel libevdev-devel" +makedepends="wlroots-devel libdisplay-info-devel cairo-devel pango-devel libevdev-devel" depends="$(vopt_if xwayland xorg-server-xwayland)" short_desc="Tiling wayland compositor based on cage inspired by ratpoison" maintainer="Jose G Perez Taveras " @@ -14,7 +14,7 @@ license="MIT" homepage="https://github.com/project-repo/cagebreak" changelog="https://raw.githubusercontent.com/project-repo/cagebreak/master/Changelog.md" distfiles="https://github.com/project-repo/cagebreak/releases/download/${version}/release_${version}.tar.gz" -checksum=b0f9ab3c406fefc2922ff30a98cf752b27c20b095766d45eb619ca5196df0f5c +checksum=37e5a3f4eb9fd2bc0a15d6ecb2fed7440b09a8ab116315a76659d0f10b41bfe8 build_options="xwayland" build_options_default="xwayland" From 5f7200334bb59b271b45df11d2919161e620000c Mon Sep 17 00:00:00 2001 From: migue07juegos Date: Fri, 8 Dec 2023 17:31:16 -0600 Subject: [PATCH 05/10] fix compositors for wlroots0.17 --- srcpkgs/river/template | 2 +- srcpkgs/sway/template | 2 +- srcpkgs/wayfire/template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/river/template b/srcpkgs/river/template index 24f9c53d45ea43..2aa96bbe2ed848 100644 --- a/srcpkgs/river/template +++ b/srcpkgs/river/template @@ -6,7 +6,7 @@ archs="~i686* ~armv6l* ~armv7l*" build_style=zig-build configure_args="$(vopt_if xwayland -Dxwayland) -Dpie" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wlroots-devel libevdev-devel pixman-devel +makedepends="wlroots0.16-devel libevdev-devel pixman-devel wayland-protocols libxkbcommon-devel wayland-devel" depends="$(vopt_if xwayland xorg-server-xwayland)" short_desc="Dynamic tiling Wayland compositor" diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index 6a735c82e88ff2..6cd6129e97ccdd 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -6,7 +6,7 @@ build_style=meson configure_args="-Dwerror=false -Db_ndebug=false" conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel +makedepends="wlroots0.16-devel pcre2-devel json-c-devel pango-devel cairo-devel gdk-pixbuf-devel libevdev-devel" depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1" short_desc="Tiling Wayland compositor compatible with i3" diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index 8419ee024a574f..ffd4f011946cf9 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -9,7 +9,7 @@ build_wrksrc="${pkgname}-${version}" build_style=meson configure_args="-Dprint_trace=false" hostmakedepends="pkg-config wayland-devel" -makedepends="wf-config-devel wlroots-devel cairo-devel pango-devel +makedepends="wf-config-devel wlroots0.16-devel cairo-devel pango-devel $(vopt_if image 'libjpeg-turbo-devel libpng-devel')" depends="xorg-server-xwayland" short_desc="3D wayland compositor" From 7e13564577655f4f75e97c98512784c1e81376d2 Mon Sep 17 00:00:00 2001 From: migue07juegos Date: Mon, 11 Dec 2023 10:45:25 -0600 Subject: [PATCH 06/10] Remove comment on wlroots template --- srcpkgs/wlroots/template | 2 -- 1 file changed, 2 deletions(-) diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index 2645643eba2ea7..a7feff03a2c6c2 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,6 +1,4 @@ # Template file for 'wlroots' -# -# On next bump, remove the .99 part pkgname=wlroots version=0.17 revision=1 From 33232f209513683afcfbd0caa9deba3f62f1158f Mon Sep 17 00:00:00 2001 From: migue07juegos Date: Mon, 11 Dec 2023 10:47:49 -0600 Subject: [PATCH 07/10] Add libdisplay-info-devel to wlroots0.17 _devel_depends dependencies --- srcpkgs/cagebreak/template | 2 +- srcpkgs/wlroots0.17/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cagebreak/template b/srcpkgs/cagebreak/template index cc85cffe2fceaf..3606797e1a9e11 100644 --- a/srcpkgs/cagebreak/template +++ b/srcpkgs/cagebreak/template @@ -6,7 +6,7 @@ build_style=meson configure_args="--buildtype=release -Dman-pages=true $(vopt_bool xwayland xwayland)" conf_files="/etc/xdg/cagebreak/config" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wlroots-devel libdisplay-info-devel cairo-devel pango-devel libevdev-devel" +makedepends="wlroots-devel cairo-devel pango-devel libevdev-devel" depends="$(vopt_if xwayland xorg-server-xwayland)" short_desc="Tiling wayland compositor based on cage inspired by ratpoison" maintainer="Jose G Perez Taveras " diff --git a/srcpkgs/wlroots0.17/template b/srcpkgs/wlroots0.17/template index cef18749b92a7f..962b32ce228fce 100644 --- a/srcpkgs/wlroots0.17/template +++ b/srcpkgs/wlroots0.17/template @@ -11,7 +11,7 @@ hostmakedepends="pkg-config wayland-devel glslang hwids" _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" + xcb-util-wm-devel xcb-util-renderutil-devel libdisplay-info-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 libdisplay-info-devel" From 3888ff578b0a4e8ef5a6d936554af63098634cb5 Mon Sep 17 00:00:00 2001 From: migue07juegos Date: Mon, 11 Dec 2023 10:48:58 -0600 Subject: [PATCH 08/10] Specify required wlroots version in cagebreak --- srcpkgs/cagebreak/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cagebreak/template b/srcpkgs/cagebreak/template index 3606797e1a9e11..27e45aae96f9d7 100644 --- a/srcpkgs/cagebreak/template +++ b/srcpkgs/cagebreak/template @@ -6,7 +6,7 @@ build_style=meson configure_args="--buildtype=release -Dman-pages=true $(vopt_bool xwayland xwayland)" conf_files="/etc/xdg/cagebreak/config" hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="wlroots-devel cairo-devel pango-devel libevdev-devel" +makedepends="wlroots0.17-devel cairo-devel pango-devel libevdev-devel" depends="$(vopt_if xwayland xorg-server-xwayland)" short_desc="Tiling wayland compositor based on cage inspired by ratpoison" maintainer="Jose G Perez Taveras " From f3a57cb3b1b84428fc155da7b5754ff68339ffe6 Mon Sep 17 00:00:00 2001 From: migue07juegos Date: Mon, 11 Dec 2023 10:50:21 -0600 Subject: [PATCH 09/10] Revbump wayfire --- srcpkgs/wayfire/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index ffd4f011946cf9..42caa0af15b160 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -1,7 +1,7 @@ # Template file for 'wayfire' pkgname=wayfire version=0.7.5 -revision=1 +revision=2 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403 create_wrksrc=yes From 2615978f374bd0be0229f3b5e3a70868cb22f54d Mon Sep 17 00:00:00 2001 From: migue07juegos <104018233+migue07juegos@users.noreply.github.com> Date: Mon, 11 Dec 2023 21:00:06 +0000 Subject: [PATCH 10/10] change wlroots0.17 maintainer Co-authored-by: Andrew J. Hesford <48421688+ahesford@users.noreply.github.com> --- srcpkgs/wlroots0.17/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wlroots0.17/template b/srcpkgs/wlroots0.17/template index 962b32ce228fce..348525e2e68efb 100644 --- a/srcpkgs/wlroots0.17/template +++ b/srcpkgs/wlroots0.17/template @@ -16,7 +16,7 @@ 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 libdisplay-info-devel" short_desc="Modular Wayland compositor library ${pkgname#wlroots}" -maintainer="Isaac Freund " +maintainer="Andrew J. Hesford " license="MIT" homepage="https://gitlab.freedesktop.org/wlroots/wlroots" distfiles="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${version}/downloads/wlroots-${version}.tar.gz"