From 6e9e8e64577d5c1dbc8b22d45248b54337440342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 24 Jul 2020 00:03:29 -0300 Subject: [PATCH 1/7] wlroots: provide all dependencies in wlroots-devel. These dependencies are all required when building applications that use wlroots, so it doesn't make sense to include them individually into each application's template. Also remove libcap, which was dropped by upstream. --- srcpkgs/wlroots/template | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index 5a171277978..8968bba8cef 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,17 +1,18 @@ # Template file for 'wlroots' pkgname=wlroots version=0.11.0 -revision=1 +revision=2 build_style=meson -configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind +configure_args="-Dlogind=enabled -Dlogind-provider=elogind -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled -Dx11-backend=enabled -Dexamples=false" hostmakedepends="pkg-config wayland-devel" -makedepends="elogind-devel libcap-devel wayland-devel wayland-protocols - MesaLib-devel libinput-devel libxkbcommon-devel libdrm-devel pixman-devel +_devel_depends="MesaLib-devel elogind-devel eudev-libudev-devel libdrm-devel + libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols + xcb-util-errors-devel xcb-util-wm-devel" +makedepends="${_devel_depends} libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel - xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel - xcb-util-errors-devel xcb-util-xrm-devel" + xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-xrm-devel" short_desc="Modular Wayland compositor library" maintainer="Isaac Freund " license="MIT" @@ -24,9 +25,7 @@ post_install() { } wlroots-devel_package() { - depends="MesaLib-devel elogind-devel eudev-libudev-devel libcap-devel - libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel - wayland-protocols wlroots-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" short_desc+=" - development files" pkg_install() { vmove usr/include From f0503e925b2f67ab170929dde605d1dbe0d7f61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 24 Jul 2020 00:05:24 -0300 Subject: [PATCH 2/7] sway: clean up makedepends. --- srcpkgs/sway/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index 6e191ba70e5..af50ab91379 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -5,9 +5,8 @@ revision=2 build_style=meson conf_files="/etc/sway/config" hostmakedepends="pkg-config wayland-devel scdoc git" -makedepends="xcb-util-wm-devel xcb-util-errors-devel wlroots-devel - wayland-devel wayland-protocols pcre-devel - json-c-devel pango-devel cairo-devel gdk-pixbuf-devel" +makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel + gdk-pixbuf-devel" depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)" short_desc="Tiling Wayland compositor compatible with i3" maintainer="Érico Nogueira " From 096bad8251a6be01801d9ef6029071171687fbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 24 Jul 2020 00:05:47 -0300 Subject: [PATCH 3/7] hikari: clean up makedepends. Removed the dependencies provided by wlroots, removed libevdev-devel, which isn't required, and put wayland-devel unconditionally in hostmakedepends, to follow the pattern of the other templates. --- srcpkgs/hikari/template | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template index 754f052de2f..76c77eb795a 100644 --- a/srcpkgs/hikari/template +++ b/srcpkgs/hikari/template @@ -8,10 +8,8 @@ make_use_env=yes make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX=" make_install_args="ETC_PREFIX=" -hostmakedepends="bmake pkg-config" -makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel - libinput-devel xcb-util-errors-devel xcb-util-wm-devel libucl-devel - libxkbcommon-devel pixman-devel libevdev-devel" +hostmakedepends="bmake pkg-config wayland-devel" +makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel" short_desc="Stacking Wayland compositor with tiling features" maintainer="Andrew J. Hesford " license="BSD-2-Clause" @@ -21,11 +19,6 @@ distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz" checksum=6a1f14a73119b227b7d2c364c0627aade2630b080fe730bb11e9854d3408b59b conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf" -if [ "$CROSS_BUILD" ]; then - # Makefile executes wayland-scanner - hostmakedepends+=" wayland-devel" -fi - pre_build() { # The hikari Makefile appends to the CFLAGS and LDFLAGS variables; # bmake ignores these appends altogether when passing variables on the From 777189011596723e83247af941c7fc25a2764d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 24 Jul 2020 00:06:55 -0300 Subject: [PATCH 4/7] cage: clean up makedepends. --- srcpkgs/cage/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template index 76ba731cc58..2857720b73f 100644 --- a/srcpkgs/cage/template +++ b/srcpkgs/cage/template @@ -4,7 +4,7 @@ version=0.1.2.1 revision=1 build_style=meson hostmakedepends="pkg-config wayland-devel scdoc" -makedepends="xcb-util-wm-devel xcb-util-errors-devel libxkbcommon-devel pixman-devel wayland-devel wlroots-devel" +makedepends="wlroots-devel" short_desc="Kiosk compositor for Wayland" maintainer="Illia Shestakov " license="MIT" From 95219360601d63d35a31556da50994367a3ef8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 24 Jul 2020 00:12:36 -0300 Subject: [PATCH 5/7] wf-config: include correct devel deps. --- srcpkgs/wf-config/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template index 0da874c532a..075f283d6a4 100644 --- a/srcpkgs/wf-config/template +++ b/srcpkgs/wf-config/template @@ -1,7 +1,7 @@ # Template file for 'wf-config' pkgname=wf-config version=0.4.0 -revision=3 +revision=4 build_style=meson hostmakedepends="pkg-config" makedepends="glm libevdev-devel libxml2-devel" @@ -17,8 +17,7 @@ post_install() { } wf-config-devel_package() { - depends="libevdev-devel wlroots-devel libxml2-devel - ${sourcepkg}>=${version}_${revision}" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From ba88813814235dc8a6e010e1d6ecddb218225d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 24 Jul 2020 00:13:48 -0300 Subject: [PATCH 6/7] wayfire: clean up makedepends. --- srcpkgs/wayfire/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template index ee4f3199a00..df2b9d9db8f 100644 --- a/srcpkgs/wayfire/template +++ b/srcpkgs/wayfire/template @@ -4,8 +4,7 @@ version=0.4.0 revision=3 build_style=meson hostmakedepends="pkg-config wayland-devel" -makedepends="xcb-util-wm-devel xcb-util-errors-devel glm cairo-devel - wf-config-devel wlroots-devel" +makedepends="cairo-devel wf-config-devel wlroots-devel" depends="xorg-server-xwayland" short_desc="3D wayland compositor" maintainer="Young Jin Park " From e96063d2ac979b9a24f0b3d0b44501bfb22e7a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 24 Jul 2020 00:37:03 -0300 Subject: [PATCH 7/7] wf-shell: clean up makedepends. --- srcpkgs/wf-shell/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template index af62c3c5207..d5568edf252 100644 --- a/srcpkgs/wf-shell/template +++ b/srcpkgs/wf-shell/template @@ -5,10 +5,8 @@ revision=3 build_style=meson build_helper="gir" hostmakedepends="gobject-introspection pkg-config wayland-devel" -makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel - gtk+3-devel libevdev-devel wlroots-devel wf-config-devel - xcb-util-errors-devel xcb-util-wm-devel gtk-layer-shell-devel - glm wayfire" +makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel wayfire + gtk+3-devel wlroots-devel wf-config-devel gtk-layer-shell-devel" short_desc="Wayfire shell with GTK-based panel and background client" maintainer="Young Jin Park " license="MIT"