Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Sep 2023 15:14:05 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ca30f80820a8 - main - x11/xdg-desktop-portal-wlr: always depend on slurp for Screenshot portal
Message-ID:  <202309081514.388FE5TH044134@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ca30f80820a8bbb71e12cf6576fcbcb86783e755

commit ca30f80820a8bbb71e12cf6576fcbcb86783e755
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-09-08 13:15:43 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-09-08 15:13:53 +0000

    x11/xdg-desktop-portal-wlr: always depend on slurp for Screenshot portal
---
 x11/xdg-desktop-portal-hyprland/Makefile |  9 ++-------
 x11/xdg-desktop-portal-wlr/Makefile      | 10 ++++------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile
index 2f33fe1a3d01..ddca69c72f33 100644
--- a/x11/xdg-desktop-portal-hyprland/Makefile
+++ b/x11/xdg-desktop-portal-hyprland/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	libbasu.so:devel/basu \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libpipewire-0.3.so:multimedia/pipewire
 RUN_DEPENDS=	grim:x11/grim \
-		hyprland-share-picker:x11/hyprland-share-picker@${FLAVOR}
+		hyprland-share-picker:x11/hyprland-share-picker@${FLAVOR} \
+		slurp:x11/slurp
 
 FLAVORS=	qt5 qt6
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt6
@@ -44,12 +45,6 @@ PLIST_FILES=	libexec/${PORTNAME} \
 LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
 .endif
 
-OPTIONS_DEFINE=	SLURP
-OPTIONS_DEFAULT=SLURP
-
-SLURP_DESC=		Simple output chooser
-SLURP_RUN_DEPENDS=	slurp:x11/slurp
-
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097
diff --git a/x11/xdg-desktop-portal-wlr/Makefile b/x11/xdg-desktop-portal-wlr/Makefile
index 11b6bbe2aad4..0007c79c55e4 100644
--- a/x11/xdg-desktop-portal-wlr/Makefile
+++ b/x11/xdg-desktop-portal-wlr/Makefile
@@ -20,7 +20,8 @@ LIB_DEPENDS=	libbasu.so:devel/basu \
 		libdrm.so:graphics/libdrm \
 		libwayland-client.so:graphics/wayland \
 		libpipewire-0.3.so:multimedia/pipewire
-RUN_DEPENDS=	grim:x11/grim
+RUN_DEPENDS=	grim:x11/grim \
+		slurp:x11/slurp
 
 USES=		compiler:c11 gl meson pkgconfig
 USE_GITHUB=	yes
@@ -37,16 +38,13 @@ PLIST_FILES=	libexec/${PORTNAME} \
 LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
 .endif
 
-OPTIONS_DEFINE=	MANPAGES SLURP
-OPTIONS_DEFAULT=MANPAGES SLURP
+OPTIONS_DEFINE=	MANPAGES
+OPTIONS_DEFAULT=MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man5/${PORTNAME}.5.gz
 
-SLURP_DESC=		Simple output chooser
-SLURP_RUN_DEPENDS=	slurp:x11/slurp
-
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309081514.388FE5TH044134>