git: 7f3268508d7a - main - x11/xdg-desktop-portal-hyprland: drop -qt5 flavor after 6482a6db7b56
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Jun 2024 12:49:19 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7f3268508d7a9134263debe66a3b8bf13ba43468
commit 7f3268508d7a9134263debe66a3b8bf13ba43468
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-06-13 12:44:30 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-06-13 12:47:12 +0000
x11/xdg-desktop-portal-hyprland: drop -qt5 flavor after 6482a6db7b56
---
x11/xdg-desktop-portal-hyprland/Makefile | 10 ----------
x11/xdg-desktop-portal-hyprland/files/patch-qt5 | 24 ------------------------
2 files changed, 34 deletions(-)
diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile
index e2ea9df18f5f..62f7ce3cd02a 100644
--- a/x11/xdg-desktop-portal-hyprland/Makefile
+++ b/x11/xdg-desktop-portal-hyprland/Makefile
@@ -20,11 +20,6 @@ RUN_DEPENDS= xdg-desktop-portal>0:deskutils/xdg-desktop-portal \
grim:x11/grim \
slurp:x11/slurp
-FLAVORS= qt6 qt5
-qt5_PKGNAMESUFFIX= -qt5
-qt5_CONFLICTS_INSTALL= ${PORTNAME}
-qt6_CONFLICTS_INSTALL= ${PORTNAME}-qt5
-
USES= cmake compiler:c++11-lib gl pkgconfig qt:6
USE_GITHUB= yes
USE_GL= gbm
@@ -38,11 +33,6 @@ 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} == 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 2024-10-01
.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h)
CXXFLAGS+= -fexperimental-library
diff --git a/x11/xdg-desktop-portal-hyprland/files/patch-qt5 b/x11/xdg-desktop-portal-hyprland/files/patch-qt5
deleted file mode 100644
index f95bd0b8d56b..000000000000
--- a/x11/xdg-desktop-portal-hyprland/files/patch-qt5
+++ /dev/null
@@ -1,24 +0,0 @@
-Revert https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/2d2fb547178e
-
---- hyprland-share-picker/CMakeLists.txt.orig 2024-06-13 09:48:34 UTC
-+++ hyprland-share-picker/CMakeLists.txt
-@@ -2,8 +2,6 @@ project(hyprland-share-picker VERSION 0.1 LANGUAGES CX
-
- project(hyprland-share-picker VERSION 0.1 LANGUAGES CXX)
-
--set(QT_VERSION_MAJOR 6)
--
- set(CMAKE_AUTOUIC ON)
- set(CMAKE_AUTOMOC ON)
- set(CMAKE_AUTORCC ON)
-@@ -11,8 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
- set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
--find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets)
--find_package(Qt6 REQUIRED COMPONENTS Widgets)
-+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
-+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
-
- set(PROJECT_SOURCES
- main.cpp