From nobody Fri Sep 08 15:17:20 2023 X-Original-To: dev-commits-ports-all@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 4Rj08c5bvmz4sTGq; Fri, 8 Sep 2023 15:17:20 +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 4Rj08c4yN4z3b2P; Fri, 8 Sep 2023 15:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694186240; 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=q95bz+44ahWrJI2uyAYeOMXib7M36Ri/2C7ZTmGtOCk=; b=f1LffIjpPH758xxN6JItWSOHJdl19+lkpZiV1D5/FwsGv4UVjzETLQa2l6+gn7eeZ1dsDV j9yLeMn6Tol4lb7lLuqriHokHuwjdZnfk2Y8ZSmrL5cOVVkrDoBopaDloU1vWIBNF6ujVs HKQ8kMpUGQAZD/LjWG21WhbIxPyscdXw5a+OsMq4OWzvtt+HB3Fe91fl/nb+5yUmplUuj0 tXOPTkY2EaTvobbeg8XiHqFrwWQnRkaSFfr4mGiq5HKMYZkPWeHHUVs+iEVTkb7jXgs2Qs vVlBRCsGhX3VzSH8lT+o/Eawo5QKJ6msuRSBN0Wi5QxPlebC32Vel4QUFlIA9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694186240; a=rsa-sha256; cv=none; b=GCB3AtjciZ/ZRJoCUG5Dz7nJGu7twQFMAtBCjSebGDjfkSuIYjt2jHHb1JhobhGGaVrsXl dCkFSNzXP7sZONUZOLH+TPXj5/ZLx2YOdTPCsySJLt3Qcmydo78cQa0PZUapvNBZJ3Q5Qu zX2eck5zILQKFdPdckD0+1BggmyUTJ9fTXpZvGslGRz3GCt+dJhmc087U0LjgkDxSJY+S4 9OzeR5AuZMfFpxK4yrJBfGOVcFuDmN87tiLDVQx7VjG3iKG6uKAGIrN9n0pOP2cOibPQ4F Ssqk6rdcFGpN9eiv06XzIgp3/o2ihXIHh5oJEMzf5zkn8pT2grdo1CsyOQ7ckA== 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=1694186240; 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=q95bz+44ahWrJI2uyAYeOMXib7M36Ri/2C7ZTmGtOCk=; b=mcXQPUJKdICo4g2c5sxKc0Q/tXhd/NPobRoMWmlfnKyjENTSWAvrV1nNDv5LF+a9ufqpar YGL6P5ZHpOisZ7BUCsPGv5Z+QtX4p0R7JX7a+y7uq/bkn4n5FCruE/RlBgIAeE6Y5P9HbL +eTO08ZAgDakzkLbG0QtEt76JioXfnnkcGRIRky5IFSmBM+zKfNVW2AwzjmZZFV4Go3Z89 MLERSOrosiS87kJsC7IypzSS3OTvY7Uhaq3Fh9XsAkiULiuHkuIbqKoR8qyYeBOy1Zn/0B 0XGCM9zTeUDkblthFnSw5OdMgD58/WGHVk4PtLJyee+18UOrtJz21ONnmxVSzg== 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 4Rj08c3wVQznKP; Fri, 8 Sep 2023 15:17:20 +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 388FHKxC045015; Fri, 8 Sep 2023 15:17:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388FHKtT045012; Fri, 8 Sep 2023 15:17:20 GMT (envelope-from git) Date: Fri, 8 Sep 2023 15:17:20 GMT Message-Id: <202309081517.388FHKtT045012@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 0939c0751490 - 2023Q3 - x11/xdg-desktop-portal-wlr: always depend on slurp for Screenshot portal List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 0939c0751490729aa8862da996a473b2226a7d42 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0939c0751490729aa8862da996a473b2226a7d42 commit 0939c0751490729aa8862da996a473b2226a7d42 Author: Jan Beich AuthorDate: 2023-09-08 13:15:43 +0000 Commit: Jan Beich 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