git: ae1e7214c885 - main - x11/xdg-desktop-portal-hyprland: propagate -qt6 flavor from dependency
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 17 Dec 2022 22:12:28 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ae1e7214c885fbc2765d4d82873f0808bcaa1da3
commit ae1e7214c885fbc2765d4d82873f0808bcaa1da3
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-12-17 22:04:00 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-12-17 22:11:24 +0000
x11/xdg-desktop-portal-hyprland: propagate -qt6 flavor from dependency
Avoids hyprland-share-picker-qt6 conflicting with xdg-desktop-portal-hyprland.
This can be reverted once provides/requires arrive to Mk/* framework.
---
x11/xdg-desktop-portal-hyprland/Makefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile
index 359e2e7286a9..fefe21999457 100644
--- a/x11/xdg-desktop-portal-hyprland/Makefile
+++ b/x11/xdg-desktop-portal-hyprland/Makefile
@@ -18,7 +18,12 @@ LIB_DEPENDS= libbasu.so:devel/basu \
libwayland-client.so:graphics/wayland \
libpipewire-0.3.so:multimedia/pipewire
RUN_DEPENDS= grim:x11/grim \
- hyprland-share-picker:x11/hyprland-share-picker
+ hyprland-share-picker:x11/hyprland-share-picker@${FLAVOR}
+
+FLAVORS= qt5 qt6
+qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6
+qt6_CONFLICTS_INSTALL= ${PORTNAME}
+qt6_PKGNAMESUFFIX= -qt6
USES= compiler:c11 gl meson pkgconfig
USE_GITHUB= yes