git: 3566125e2739 - 2023Q2 - x11/xdg-desktop-portal-hyprland: pass --skip-subprojects from within ninja

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 28 Apr 2023 22:36:25 UTC

The branch 2023Q2 has been updated by jbeich:

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

commit 3566125e27397f461bfd5c257c21566cfd387328
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-04-28 22:15:35 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-04-28 22:36:17 +0000

    x11/xdg-desktop-portal-hyprland: pass --skip-subprojects from within ninja
    
    (cherry picked from commit fc5900ba928e491a670d1974b60b53771ea9e758)
---
 x11/xdg-desktop-portal-hyprland/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile
index 1a4da0938ca3..3683d9fa6fb7 100644
--- a/x11/xdg-desktop-portal-hyprland/Makefile
+++ b/x11/xdg-desktop-portal-hyprland/Makefile
@@ -43,10 +43,9 @@ SLURP_DESC=		Simple output chooser
 SLURP_RUN_DEPENDS=	slurp:x11/slurp
 
 .ifdef GH_TUPLE
-post-install:
-# XXX USES=meson invokes ninja directly, so doesn't support --skip-subprojects
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/hyprland-protocols
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
+post-configure:
+	@${REINPLACE_CMD} 's/meson install/& \
+		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
 .endif
 
 .include <bsd.port.mk>