diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index b986334020cc..7e02844c8c8a 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,103 +1,103 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v -DISTVERSION= 0.53.1 +DISTVERSION= 0.53.3 CATEGORIES= x11-wm wayland MASTER_SITES= https://github.com/hyprwm/Hyprland/releases/download/${DISTVERSIONFULL}/ DISTNAME= source-${DISTVERSIONFULL} DIST_SUBDIR= ${PORTNAME} MAINTAINER= tagattie@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' WWW= https://hypr.land/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - glaze>0:devel/glaze \ + glaze>=7.0.0<8.0.0:devel/glaze \ hyprwayland-scanner>=0.3.10:devel/hyprwayland-scanner \ hyprland-protocols>=0.6.4:graphics/hyprland-protocols \ wayland-protocols>=1.45:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libhyprutils.so:devel/hyprutils \ libhyprwire.so:devel/hyprwire \ libre2.so:devel/re2 \ libtomlplusplus.so:devel/tomlplusplus \ libhyprgraphics.so:graphics/hyprgraphics \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libmuparser.so:math/muparser \ libuuid.so:misc/libuuid \ libaquamarine.so:x11-toolkits/aquamarine \ libhyprcursor.so:x11/hyprcursor \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hyprland-dialog:x11/hyprland-guiutils USES= cmake:testing compiler:c++23-lang gl gnome pkgconfig xorg USE_GL= egl gbm opengl USE_GNOME= cairo glib20 pango USE_XORG= pixman xcursor CMAKE_ON= NO_SYSTEMD CMAKE_OFF= CMAKE_CXX_SCAN_FOR_MODULES # avoid devel/llvm* LDFLAGS+= -Wl,--as-needed # GL, pango deps LDFLAGS+= -pthread WRKSRC= ${WRKDIR}/${PORTNAME}-source # XXX Drop after FreeBSD 13.5 EOL around 2026-04-30 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim .endif # XXX Drop after FreeBSD 14.* EOL around 2028-11-30 # https://cgit.freebsd.org/src/commit/?id=3965de642c29 .if !exists(/usr/include/sys/inotify.h) LIB_DEPENDS+= libinotify.so:devel/libinotify .endif OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-icccm.so:x11/xcb-util-wm X11_USE= XORG=xcb X11_CMAKE_BOOL_OFF= NO_XWAYLAND .include post-patch: # Respect consolekit2 as XDG_RUNTIME_DIR fallback @${REINPLACE_CMD} 's|/run/user|/var&|' \ ${WRKSRC}/hyprctl/src/main.cpp \ ${WRKSRC}/hyprpm/src/core/HyprlandSocket.cpp \ ${WRKSRC}/hyprtester/src/hyprctlCompat.cpp \ ${WRKSRC}/src/Compositor.cpp # Respect PREFIX for wallpapers @${REINPLACE_CMD} 's|/usr/share|${DATADIR:H}|' \ ${WRKSRC}/src/render/OpenGL.cpp # XXX Replace linprocfs(4) with sysctl(3) @${REINPLACE_CMD} -e 's|/proc|${LINUXBASE}&|g' \ ${WRKSRC}/hyprtester/src/tests/main/exec.cpp \ ${WRKSRC}/src/debug/HyprCtl.cpp \ ${WRKSRC}/src/debug/crash/CrashReporter.cpp \ ${WRKSRC}/src/desktop/view/Window.cpp \ ${WRKSRC}/src/helpers/MiscFunctions.cpp \ ${WRKSRC}/src/plugins/HookSystem.cpp \ ${WRKSRC}/src/plugins/PluginAPI.cpp post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/hyprland @${RLN} ${STAGEDIR}${PREFIX}/bin/Hyprland ${STAGEDIR}${PREFIX}/bin/hyprland .include # XXX COMPILER_TYPE is defined after USES was already parsed .if ${CHOSEN_COMPILER_TYPE} == clang && ${_CCVERSION:M+assertions} llvm_ARGS= build .include "${USESDIR}/llvm.mk" .endif diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index b3eaf5a743f4..08f4dfebd329 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1767516818 -SHA256 (hyprland/source-v0.53.1.tar.gz) = 1d9d22cfa34d2a559b2be37735adb1f70eef4fd8bbaf226ebf1d20b09fcb0861 -SIZE (hyprland/source-v0.53.1.tar.gz) = 54355159 +TIMESTAMP = 1770149000 +SHA256 (hyprland/source-v0.53.3.tar.gz) = 7bbf653dc9978a3c200241ea02af603970edf50f8b737c0aa0df88c16493ee1f +SIZE (hyprland/source-v0.53.3.tar.gz) = 54358285 diff --git a/x11-wm/hyprland/files/patch-hyprpm_CMakeLists.txt b/x11-wm/hyprland/files/patch-hyprpm_CMakeLists.txt new file mode 100644 index 000000000000..2b8122682857 --- /dev/null +++ b/x11-wm/hyprland/files/patch-hyprpm_CMakeLists.txt @@ -0,0 +1,14 @@ +--- hyprpm/CMakeLists.txt.orig 2026-02-04 00:10:26 UTC ++++ hyprpm/CMakeLists.txt +@@ -11,9 +11,9 @@ pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET + + pkg_check_modules(hyprpm_deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0.7.0) + +-find_package(glaze 6.0.0 QUIET) ++find_package(glaze 7.0.0 QUIET) + if (NOT glaze_FOUND) +- set(GLAZE_VERSION v6.1.0) ++ set(GLAZE_VERSION v7.0.0) + message(STATUS "glaze dependency not found, retrieving ${GLAZE_VERSION} with FetchContent") + include(FetchContent) + FetchContent_Declare( diff --git a/x11-wm/hyprland/files/patch-hyprpm_src_core_PluginManager.cpp b/x11-wm/hyprland/files/patch-hyprpm_src_core_PluginManager.cpp index 7c4c70022032..8f2f9fcc0bc9 100644 --- a/x11-wm/hyprland/files/patch-hyprpm_src_core_PluginManager.cpp +++ b/x11-wm/hyprland/files/patch-hyprpm_src_core_PluginManager.cpp @@ -1,14 +1,14 @@ Avoid hyprpm rebuilding Hyprland outside of ports ---- hyprpm/src/core/PluginManager.cpp.orig 2026-01-02 21:24:24 UTC +--- hyprpm/src/core/PluginManager.cpp.orig 2026-01-24 20:04:36 UTC +++ hyprpm/src/core/PluginManager.cpp @@ -385,9 +385,6 @@ eHeadersErrors CPluginManager::headersValid() { eHeadersErrors CPluginManager::headersValid() { const auto HLVER = getHyprlandVersion(false); - if (!std::filesystem::exists(DataState::getHeadersPath() + "/share/pkgconfig/hyprland.pc")) - return HEADERS_MISSING; - // find headers commit - const std::string& cmd = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkgconf --cflags --keep-system-cflags hyprland", DataState::getHeadersPath()); + const std::string& cmd = std::format("PKG_CONFIG_PATH='{}' pkgconf --cflags --keep-system-cflags hyprland", getPkgConfigPath()); auto headers = execAndGet(cmd); diff --git a/x11-wm/hyprland/files/patch-hyprtester_clients_child-window.cpp b/x11-wm/hyprland/files/patch-hyprtester_clients_child-window.cpp deleted file mode 100644 index b5108229cf0a..000000000000 --- a/x11-wm/hyprland/files/patch-hyprtester_clients_child-window.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- hyprtester/clients/child-window.cpp.orig 2026-01-04 11:44:08 UTC -+++ hyprtester/clients/child-window.cpp -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -332,4 +333,4 @@ int main(int argc, char** argv) { - - wl_display_disconnect(display); - return 0; --} -\ No newline at end of file -+} diff --git a/x11-wm/hyprland/files/patch-hyprtester_clients_pointer-scroll.cpp b/x11-wm/hyprland/files/patch-hyprtester_clients_pointer-scroll.cpp deleted file mode 100644 index 19dbbea76153..000000000000 --- a/x11-wm/hyprland/files/patch-hyprtester_clients_pointer-scroll.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- hyprtester/clients/pointer-scroll.cpp.orig 2026-01-04 11:43:28 UTC -+++ hyprtester/clients/pointer-scroll.cpp -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/x11-wm/hyprland/files/patch-hyprtester_clients_pointer-warp.cpp b/x11-wm/hyprland/files/patch-hyprtester_clients_pointer-warp.cpp deleted file mode 100644 index 490bcbb1521d..000000000000 --- a/x11-wm/hyprland/files/patch-hyprtester_clients_pointer-warp.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- hyprtester/clients/pointer-warp.cpp.orig 2026-01-04 11:42:28 UTC -+++ hyprtester/clients/pointer-warp.cpp -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/x11-wm/hyprland/files/patch-hyprtester_src_tests_clients_child-window.cpp b/x11-wm/hyprland/files/patch-hyprtester_src_tests_clients_child-window.cpp deleted file mode 100644 index 47ba77e24fc4..000000000000 --- a/x11-wm/hyprland/files/patch-hyprtester_src_tests_clients_child-window.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- hyprtester/src/tests/clients/child-window.cpp.orig 2026-01-04 11:41:28 UTC -+++ hyprtester/src/tests/clients/child-window.cpp -@@ -7,6 +7,7 @@ - #include - #include - -+#include - #include - #include - #include -@@ -120,4 +121,4 @@ static bool test() { - return !ret; - } - --REGISTER_CLIENT_TEST_FN(test); -\ No newline at end of file -+REGISTER_CLIENT_TEST_FN(test); diff --git a/x11-wm/hyprland/files/patch-hyprtester_src_tests_clients_pointer-scroll.cpp b/x11-wm/hyprland/files/patch-hyprtester_src_tests_clients_pointer-scroll.cpp deleted file mode 100644 index 311f360a716b..000000000000 --- a/x11-wm/hyprland/files/patch-hyprtester_src_tests_clients_pointer-scroll.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- hyprtester/src/tests/clients/pointer-scroll.cpp.orig 2026-01-04 11:40:44 UTC -+++ hyprtester/src/tests/clients/pointer-scroll.cpp -@@ -7,6 +7,7 @@ - #include - #include - -+#include - #include - #include - #include diff --git a/x11-wm/hyprland/files/patch-hyprtester_src_tests_clients_pointer-warp.cpp b/x11-wm/hyprland/files/patch-hyprtester_src_tests_clients_pointer-warp.cpp deleted file mode 100644 index 90bad2155f7a..000000000000 --- a/x11-wm/hyprland/files/patch-hyprtester_src_tests_clients_pointer-warp.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- hyprtester/src/tests/clients/pointer-warp.cpp.orig 2026-01-04 11:37:16 UTC -+++ hyprtester/src/tests/clients/pointer-warp.cpp -@@ -7,6 +7,7 @@ - #include - #include - -+#include - #include - #include - #include diff --git a/x11-wm/hyprland/files/patch-hyprtester_src_tests_main_window.cpp b/x11-wm/hyprland/files/patch-hyprtester_src_tests_main_window.cpp deleted file mode 100644 index ec7540aa6bfc..000000000000 --- a/x11-wm/hyprland/files/patch-hyprtester_src_tests_main_window.cpp +++ /dev/null @@ -1,7 +0,0 @@ ---- hyprtester/src/tests/main/window.cpp.orig 2026-01-04 11:45:09 UTC -+++ hyprtester/src/tests/main/window.cpp -@@ -1,3 +1,4 @@ -+#include - #include - #include - #include diff --git a/x11-wm/hyprland/files/patch-start_src_core_Instance.cpp b/x11-wm/hyprland/files/patch-start_src_core_Instance.cpp deleted file mode 100644 index 17173cb355a4..000000000000 --- a/x11-wm/hyprland/files/patch-start_src_core_Instance.cpp +++ /dev/null @@ -1,41 +0,0 @@ ---- start/src/core/Instance.cpp.orig 2026-01-04 09:38:22 UTC -+++ start/src/core/Instance.cpp -@@ -7,11 +7,17 @@ - #include - #include - #include --#include - #include - #include - #include - -+#if defined(__linux__) -+#include -+#elif defined(__FreeBSD__) -+#include -+#include -+#endif -+ - #include - - using namespace Hyprutils::OS; -@@ -41,7 +47,12 @@ void CHyprlandInstance::runHyprlandThread(bool safeMod - int forkRet = fork(); - if (forkRet == 0) { - // Make hyprland die on our SIGKILL -+#if defined(__linux__) - prctl(PR_SET_PDEATHSIG, SIGKILL); -+#elif defined(__FreeBSD__) -+ int sig = SIGKILL; -+ procctl(P_PID, getpid(), PROC_PDEATHSIG_CTL, &sig); -+#endif - - execvp(g_state->customPath.value_or("Hyprland").c_str(), args.data()); - -@@ -164,4 +175,4 @@ bool CHyprlandInstance::run(bool safeMode) { - m_hlThread.join(); - - return !m_hyprlandInitialized || m_hyprlandExiting; --} -\ No newline at end of file -+}