From nobody Mon Mar 11 05:53:31 2024 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 4TtQth1vhRz5Dkyw; Mon, 11 Mar 2024 05:53:32 +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 4TtQth0CJBz4QJv; Mon, 11 Mar 2024 05:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710136412; 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=Vk0yL2YveIpKgxn1GsucTtzhZBoAPPN14XinDnAHXeA=; b=I1fziafcgt9VilVFMu4mSwvX6VHgxhtjVsKNPhsGCCvFcaL/KVhnbM9IcnvVVB9LhmSmWt gUj7C3H/28ZNDxnCC5Rler+zV4ZYxHzJGAAXp96sj0HeBRVDapFvZ83VT4JtOTGYCH1NhE t3wZoXwSCuKCJ199NiSmcBXLDzc5b2eMFC2uW8Of31LeU4/W7tLIBTqnzt9ALgJKyemDtE t3TX7B/ec91XBYiK2TUJHNXKxXwItEFuba+bXIs3z7+XcVkYfFbll+a7tLgja8Apwyq0ll kBi58avq7Y+zlQPcCvCqt53lMDcfItc5rYYjJOs5azXn2QDPtBo275cdCcnQlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710136412; a=rsa-sha256; cv=none; b=M9VBEjDibZCGb+9lr3L4DjfOL5i0fH7+80/R4D2wRJWgmZEzwBc9vPaS39aIn2QiBMKH+V LIYV0UWg0c3u8gHfcfPzmpUMLr9ubwtrWIGp5e57vpifPusYkHxbDMy5VdcbuCHgrkMkeb eWiWnD3ufCFZXCzmNWGGNKHG1UT8X8U+NxyfsRDF9L+vuQg1ZO7k41RmnhlXqQIZyrvsVW aNr8dcOCjewZsfTBZK7IfHbxudAkS9cld59ipPvQxrmKoD9G5htPjrGE6As2su0Qqosfz3 Y34AlpWXJbvbRs36RWCMGkE0SsXHU89yEFUdIBK3VDaN1C5b6tvOlFsZtKaNYQ== 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=1710136412; 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=Vk0yL2YveIpKgxn1GsucTtzhZBoAPPN14XinDnAHXeA=; b=j/hecmUiwKzuNS3dooX1451VC/FZBRHl5x+BVnep/ulFYxCh62StJjHQhFDpzdQtqbIQtC CC6CGcT7I+RdwsEGgf+yQtRlLmNNbNBAHVgJZHFVE7PCbMW3wYVYmCa74yZhfyHhIEm1t1 A9R5LfpfzNIzWYhYvL8KtPh0So6qIGd5QlLW8uVlDUsg1yT0+DezFyCJnK8BnRmgc7TEuG qbTugQeVptJlBwAFPhqmwauJ7UmLeGT6iIDpc/sUEzmAUJH77QXmv8rRw/hjI/DRkn2chX mGeCiqw3fD9HSFZDhLOiP8JTpQurvOos9A3otaWcNXyjkxjjBQ4KczcUtqMFNw== 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 4TtQtg6kZnzJ3r; Mon, 11 Mar 2024 05:53:31 +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 42B5rVLk051505; Mon, 11 Mar 2024 05:53:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42B5rVut051502; Mon, 11 Mar 2024 05:53:31 GMT (envelope-from git) Date: Mon, 11 Mar 2024 05:53:31 GMT Message-Id: <202403110553.42B5rVut051502@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: 57069df09d4a - main - x11/xdg-desktop-portal-hyprland: prefer Qt6 after 163e26d8c6d7 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/main X-Git-Reftype: branch X-Git-Commit: 57069df09d4adbaa3e234c234296ec33c645b186 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=57069df09d4adbaa3e234c234296ec33c645b186 commit 57069df09d4adbaa3e234c234296ec33c645b186 Author: Jan Beich AuthorDate: 2024-03-10 23:19:27 +0000 Commit: Jan Beich CommitDate: 2024-03-11 05:52:38 +0000 x11/xdg-desktop-portal-hyprland: prefer Qt6 after 163e26d8c6d7 --- x11/xdg-desktop-portal-hyprland/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index 09cede4d4b88..9d4c647f68c4 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -1,7 +1,7 @@ PORTNAME= xdg-desktop-portal-hyprland DISTVERSIONPREFIX= v DISTVERSION= 1.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -24,15 +24,15 @@ LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ RUN_DEPENDS= grim:x11/grim \ slurp:x11/slurp -FLAVORS= qt5 qt6 -qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 -qt6_CONFLICTS_INSTALL= ${PORTNAME} -qt6_PKGNAMESUFFIX= -qt6 +FLAVORS= qt6 qt5 +qt5_PKGNAMESUFFIX= -qt5 +qt5_CONFLICTS_INSTALL= ${PORTNAME} +qt6_CONFLICTS_INSTALL= ${PORTNAME}-qt5 -USES= cmake compiler:c++11-lib gl pkgconfig qt:5 +USES= cmake compiler:c++11-lib gl pkgconfig qt:6 USE_GITHUB= yes USE_GL= gbm -USE_QT= qmake:build buildtools:build core gui wayland:run widgets +USE_QT= base wayland:run GH_ACCOUNT= hyprwm GH_TUPLE= hyprwm:hyprland-protocols:v0.2:hyprland_protocols/subprojects/hyprland-protocols LDFLAGS+= -Wl,--as-needed # GL, sdbus-cpp deps @@ -42,9 +42,9 @@ PLIST_FILES= bin/hyprland-share-picker \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \ share/xdg-desktop-portal/portals/hyprland.portal -.if ${FLAVOR:U} == qt6 -USES:= ${USES:S/qt:5/qt:6/} -USE_QT= base wayland:run +.if ${FLAVOR:U} == qt5 +USES:= ${USES:S/qt:6/qt:5/} +USE_QT= qmake:build buildtools:build core gui wayland:run widgets .endif # XXX Drop after FreeBSD 14.0 EOL around 2025-03-01