git: 0939c0751490 - 2023Q3 - x11/xdg-desktop-portal-wlr: always depend on slurp for Screenshot portal
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Sep 2023 15:17:20 UTC
The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0939c0751490729aa8862da996a473b2226a7d42 commit 0939c0751490729aa8862da996a473b2226a7d42 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:16:08 +0000 x11/xdg-desktop-portal-wlr: always depend on slurp for Screenshot portal (cherry picked from commit ca30f80820a8bbb71e12cf6576fcbcb86783e755) --- 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 c6c13c6d5c76..4ab9fcca5449 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -19,7 +19,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 @@ -36,12 +37,6 @@ PLIST_FILES= libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \ share/xdg-desktop-portal/portals/hyprland.portal -OPTIONS_DEFINE= SLURP -OPTIONS_DEFAULT=SLURP - -SLURP_DESC= Simple output chooser -SLURP_RUN_DEPENDS= slurp:x11/slurp - .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ diff --git a/x11/xdg-desktop-portal-wlr/Makefile b/x11/xdg-desktop-portal-wlr/Makefile index a3ce6ed7676c..2850cda5b968 100644 --- a/x11/xdg-desktop-portal-wlr/Makefile +++ b/x11/xdg-desktop-portal-wlr/Makefile @@ -18,7 +18,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 @@ -29,16 +30,13 @@ PLIST_FILES= libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.wlr.service \ share/xdg-desktop-portal/portals/wlr.portal -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 - post-patch: @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ ${WRKSRC}/${PORTNAME}.5.scd