From nobody Fri Sep 08 15:14:05 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj04s6n7Kz4sRch; Fri, 8 Sep 2023 15:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj04s3fmKz3YgH; Fri, 8 Sep 2023 15:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694186045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l7f1CNvpDTPZp8SqmCqXTfQviA5V8bOaJkxPGrDsPqE=; b=osGdj65nzB/WIDkNKs4vjrjJm5+YN0jdImKWjz3/pu/N3ojmp3FPIIYCVMJylY9SbDJpMs i5YWdZoiSIKGekhDjd0RWTXURak/pJdz6QsFtFAVqzlTt60/XVRu//tm2tu1aeamI3gQu/ JK4zoGYuTO100Le3j+Z2Xx6cjO28aabQgaHzRz0gBwU04ghtEEdqtA6PyEROa8OElvQlnT HPWhGrCqWJj28WdEKUK1e6rHLSg1BlP8oYi4vV3P5eD+W4AU1blaYByAsZtwdr83JrzyAN bLQHG4/dqN1SLy9x7zIJ6sSZZRsET5OLcdSIa7ShR+esHG3vn4lQSaO7USkJeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694186045; a=rsa-sha256; cv=none; b=tsZsPyupnnTCRefZ54Z721X08QNRVyTPlpKXKhp3rrZDXF5PaMr7QM32KTdjWIi+MitiNq 8FOcti1dEq0umJwQiljvkuE87341wB6rVkXny8zBMaeLyxMcVzNioQ4ZZK1v+uxCQfH2zL u6yOHGJ0Oe0iZB1I+zCe336ZcfkIw2XHurnGBGYByc0hQ6jmCzTyl38641OkmWHMRTuNwj IW9lSQ0T5VUt7vymqzvoyNCfpWI6LvMXXi7iC/m7LfYT4HnxsT1ZYsl58N03vYu9LI7C9L 9v194gwFjQFE8wXr8OaDkRKczGbGbfJv4UYxJJsa9e8rRWLa/6RM1Q8eijV/ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694186045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l7f1CNvpDTPZp8SqmCqXTfQviA5V8bOaJkxPGrDsPqE=; b=lZAivGpBUbMSf6w36sGl9E5Dks8YtqxCKHuyB49KUwn3tQAEyZqc/rnwVa73zHIxGqAXhc A/20k8RCjAjJDmEe2P/wO2BSxjjCb5VZC1sDoNfbe0s3b/+McE0M6FLkYRFizub9CcBkZF LbpacwBUDsIu6zdGDZwId5SHitovpxMqXrMTVJcrTa3G+CKALxkaNDout6U8cgNGjn+X6o W6aBdc2/FtZdlro0UMr8SqEQxgtp6owev6ENxY4++LSLxhP0+kjr/PMvOMt08pdw6ku4rr 2zpU046uNgU72ItxzXVXt61SxnkZvlpAGNS0lw0naNU3mpWHhDcBHgXEEEmcTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rj04s2m0lzn36; Fri, 8 Sep 2023 15:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388FE5of044137; Fri, 8 Sep 2023 15:14:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388FE5TH044134; Fri, 8 Sep 2023 15:14:05 GMT (envelope-from git) Date: Fri, 8 Sep 2023 15:14:05 GMT Message-Id: <202309081514.388FE5TH044134@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: ca30f80820a8 - main - x11/xdg-desktop-portal-wlr: always depend on slurp for Screenshot portal List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca30f80820a8bbb71e12cf6576fcbcb86783e755 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca30f80820a8bbb71e12cf6576fcbcb86783e755 commit ca30f80820a8bbb71e12cf6576fcbcb86783e755 Author: Jan Beich AuthorDate: 2023-09-08 13:15:43 +0000 Commit: Jan Beich 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 .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 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097