Date: Mon, 11 Mar 2024 05:53:31 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 57069df09d4a - main - x11/xdg-desktop-portal-hyprland: prefer Qt6 after 163e26d8c6d7 Message-ID: <202403110553.42B5rVut051502@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=57069df09d4adbaa3e234c234296ec33c645b186 commit 57069df09d4adbaa3e234c234296ec33c645b186 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-03-10 23:19:27 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403110553.42B5rVut051502>