From nobody Sat Dec 17 22:12:28 2022 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 4NZKvw2zjSz1GGS1; Sat, 17 Dec 2022 22:12:28 +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 4NZKvw2Z0Bz3Fjw; Sat, 17 Dec 2022 22:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671315148; 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=YZDVTD7DCxK/0s8IfF5oFxArYrvEcBw76U44AVFI3/Y=; b=GbpZGGCGGrytt6juZfgUL0h6vMar1WNV8yTy3n5ldWN2x+L3Dt62akSShIMke8O8Q8+Bc7 V4h5WHuXQv5ZtE8Qqe0SUKEd3HdE/1kBr3ycBv7EcYefxcjc9ozei83dRtGH2cC0QcYCDT E71jKF1QXzVcnN1g8boowDxB2NFmVEINzhwuNsKQZ42ZPXtVjlD28/SIFLZV8iHHZSS2WZ yQwXLWn9NVx/q/NIPd1zKJD89s8+Aiqhl8Gtwrb2ThR/Qsp/1ropzvkyaqjw/1QaxQCsOQ O64sSnFYS2TFtAqtAw+p4ZytV38TfNHIRamt7IemJ3EHM3I9prww4sS+JeM/uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671315148; 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=YZDVTD7DCxK/0s8IfF5oFxArYrvEcBw76U44AVFI3/Y=; b=Hwalkbc1jGFnLyog24+Sg+B+79LXzfvZjNK2bQWQtuBYCp9FWk2BkqI1nRLkHEIMGdltw7 CBMhid7eSmcCgh0resomcLqrYA448AAB2OwJX3Akpr4xVL96xLtsXApsvzbWRThmEWbB5P 0HN76/bTIm5xjdhWF5WecHPWwL6KIMpzv4F3njSrAz6Da1fjaOK4JKXesd3FeYdVmJByPB zk0xVdRe/5PBacqePZQi9LGzJatWZPhYesUqqZ0rxMa05fNkdKE0kWc7MKcN4lxRoC7UeX yrnnXZUqbH7/3sk2YynIp7Eqrz+jQVuAFx5xJ9Ww9HCQ51iz4niY1/YdubCXiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671315148; a=rsa-sha256; cv=none; b=EqA3t9KEQJJonskluZNRPzHVvL95zIBKoriw9XfbwplQ1fxAhp+UTEVGHIvtgEmWDT0jcd V4gyx7UD4H0JOYOxepBOWl/p5Qsz0Z6wNiiqvotyARapiOjQkA/cLpRVUyfp7sMOE+xiTt 7Oz++T+G8jrA1m2Kf7HPpESzvdaKU4bayBAArWjnqVG2oz0N4jFr2awxiVIc0KVhEBqH+X V0kzBr+iA2KsF1He/Di4x+k28nQqjNhk+0GlMRXMZaVT6duMbOp2PT0jE4owSxTNta2ymz exGqmIfwqAnnjARnC9GlFug51vvxL8w8w0T8raI/HT10CzEoOrRfUjpMqKsPGQ== 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 4NZKvw1cnnz175y; Sat, 17 Dec 2022 22:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BHMCSs8029680; Sat, 17 Dec 2022 22:12:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BHMCSYB029672; Sat, 17 Dec 2022 22:12:28 GMT (envelope-from git) Date: Sat, 17 Dec 2022 22:12:28 GMT Message-Id: <202212172212.2BHMCSYB029672@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: ae1e7214c885 - main - x11/xdg-desktop-portal-hyprland: propagate -qt6 flavor from dependency 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: ae1e7214c885fbc2765d4d82873f0808bcaa1da3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae1e7214c885fbc2765d4d82873f0808bcaa1da3 commit ae1e7214c885fbc2765d4d82873f0808bcaa1da3 Author: Jan Beich AuthorDate: 2022-12-17 22:04:00 +0000 Commit: Jan Beich CommitDate: 2022-12-17 22:11:24 +0000 x11/xdg-desktop-portal-hyprland: propagate -qt6 flavor from dependency Avoids hyprland-share-picker-qt6 conflicting with xdg-desktop-portal-hyprland. This can be reverted once provides/requires arrive to Mk/* framework. --- x11/xdg-desktop-portal-hyprland/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index 359e2e7286a9..fefe21999457 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -18,7 +18,12 @@ LIB_DEPENDS= libbasu.so:devel/basu \ libwayland-client.so:graphics/wayland \ libpipewire-0.3.so:multimedia/pipewire RUN_DEPENDS= grim:x11/grim \ - hyprland-share-picker:x11/hyprland-share-picker + hyprland-share-picker:x11/hyprland-share-picker@${FLAVOR} + +FLAVORS= qt5 qt6 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 +qt6_CONFLICTS_INSTALL= ${PORTNAME} +qt6_PKGNAMESUFFIX= -qt6 USES= compiler:c11 gl meson pkgconfig USE_GITHUB= yes