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 @@ -1,74 +1,64 @@ PORTNAME= xdg-desktop-portal-hyprland DISTVERSIONPREFIX= v DISTVERSION= 1.3.2 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= xdg-desktop-portal backend for hyprland WWW= https://github.com/hyprwm/xdg-desktop-portal-hyprland LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.31:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libsdbus-c++.so:devel/sdbus-cpp \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ libpipewire-0.3.so:multimedia/pipewire 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 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 PLIST_FILES= bin/hyprland-share-picker \ lib/systemd/user/${PORTNAME}.service \ libexec/${PORTNAME} \ 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 .endif # XXX Drop after FreeBSD 13.2 EOL around 2024-07-01 (don't forget distinfo) .if ${CXX} == c++ && exists(/usr/lib/libc++.so) .if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch) USES+= llvm:min=16,build,export PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" # XXX Move into separate port and standardize via USES GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 # Don't link against new libc++ as it's not necessary #LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt pre-configure: bundled-libcxx bundled-libcxx: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build .endif .endif # exists(/usr/lib/libc++.so) .include 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