Date: Mon, 01 Dec 2025 06:22:23 +0000 From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ee44f36ed04b - main - x11-toolkits/hyprtoolkit: Update to 0.4.0 Message-ID: <692d341f.f5c4.1010f7ec@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee44f36ed04b70e26b8c71afe0612f3477b3cd19 commit ee44f36ed04b70e26b8c71afe0612f3477b3cd19 Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2025-12-01 06:20:23 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2025-12-01 06:22:15 +0000 x11-toolkits/hyprtoolkit: Update to 0.4.0 Changelog: https://github.com/hyprwm/hyprtoolkit/releases/tag/v0.4.0 Reported by: GitHub (watch releases) --- x11-toolkits/hyprtoolkit/Makefile | 7 +++--- x11-toolkits/hyprtoolkit/distinfo | 6 ++--- .../hyprtoolkit/files/patch-CMakeLists.txt | 28 ---------------------- .../patch-include_hyprtoolkit_palette_Palette.hpp | 11 --------- .../hyprtoolkit/files/patch-src_core_Backend.cpp | 10 -------- .../patch-src_core_platforms_WaylandPlatform.cpp | 10 -------- .../files/patch-src_element_Element.cpp | 11 --------- .../patch-src_element_scrollArea_ScrollArea.cpp | 11 --------- .../files/patch-src_layout_Positioner.cpp | 11 +++++++++ .../files/patch-src_palette_ConfigManager.cpp | 11 --------- .../files/patch-src_renderer_gl_OpenGL.cpp | 11 --------- .../patch-src_sessionLock_WaylandSessionLock.cpp | 11 +++++++++ .../files/patch-src_window_WaylandPopup.cpp | 11 --------- .../files/patch-tests_SimpleSessionLock.cpp | 10 ++++++++ x11-toolkits/hyprtoolkit/pkg-plist | 5 ++-- 15 files changed, 41 insertions(+), 123 deletions(-) diff --git a/x11-toolkits/hyprtoolkit/Makefile b/x11-toolkits/hyprtoolkit/Makefile index 42fa5c98e16a..eb3df6c22be0 100644 --- a/x11-toolkits/hyprtoolkit/Makefile +++ b/x11-toolkits/hyprtoolkit/Makefile @@ -1,7 +1,6 @@ PORTNAME= hyprtoolkit DISTVERSIONPREFIX= v -DISTVERSION= 0.3.0 -PORTREVISION= 2 +DISTVERSION= 0.4.0 CATEGORIES= x11-toolkits MAINTAINER= tagattie@FreeBSD.org @@ -35,8 +34,8 @@ USE_XORG= pixman LDFLAGS+= -pthread -PLIST_SUB= SOVERSION_MAJOR=3 \ - SOVERSION_FULL=${DISTVERSION} +PLIST_SUB= SOVERSION_FULL=${DISTVERSION} \ + SOVERSION_MAJOR=4 # XXX Drop after FreeBSD 13.5 EOL around 2026-04-30 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 diff --git a/x11-toolkits/hyprtoolkit/distinfo b/x11-toolkits/hyprtoolkit/distinfo index 93159b74f145..d875478ef862 100644 --- a/x11-toolkits/hyprtoolkit/distinfo +++ b/x11-toolkits/hyprtoolkit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762933997 -SHA256 (hyprwm-hyprtoolkit-v0.3.0_GH0.tar.gz) = 9f7e1a0a7bfe31ef769bfa9dfaef211f193f38b10e0823320336578ecee13d55 -SIZE (hyprwm-hyprtoolkit-v0.3.0_GH0.tar.gz) = 559745 +TIMESTAMP = 1764565110 +SHA256 (hyprwm-hyprtoolkit-v0.4.0_GH0.tar.gz) = 3e51f7d1bd76a947af5e505ecf78808f69c2bc96ef3930c6ac3f3e343bd467af +SIZE (hyprwm-hyprtoolkit-v0.4.0_GH0.tar.gz) = 564895 diff --git a/x11-toolkits/hyprtoolkit/files/patch-CMakeLists.txt b/x11-toolkits/hyprtoolkit/files/patch-CMakeLists.txt deleted file mode 100644 index 5a16eafbc215..000000000000 --- a/x11-toolkits/hyprtoolkit/files/patch-CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ ---- CMakeLists.txt.orig 2025-11-10 12:58:11 UTC -+++ CMakeLists.txt -@@ -82,9 +82,15 @@ if(NOT HAS_TIMERFD AND epoll_FOUND) - check_include_file("sys/timerfd.h" HAS_TIMERFD) - pkg_check_modules(epoll IMPORTED_TARGET epoll-shim) - if(NOT HAS_TIMERFD AND epoll_FOUND) -- target_link_libraries(hyprtoolkit PkgConfig::epoll) -+ target_link_libraries(hyprtoolkit PUBLIC PkgConfig::epoll) - endif() - -+check_include_file("sys/inotify.h" HAS_INOTIFY) -+pkg_check_modules(inotify IMPORTED_TARGET libinotify) -+if(NOT HAS_INOTIFY AND inotify_FOUND) -+ target_link_libraries(hyprtoolkit PUBLIC PkgConfig::inotify) -+endif() -+ - if (NOT DISABLE_TESTS) - enable_testing() - -@@ -111,7 +117,7 @@ if (NOT DISABLE_TESTS) - target_compile_options(hyprtoolkit_inline_tests PRIVATE --coverage) - target_link_options(hyprtoolkit_inline_tests PRIVATE --coverage) - target_include_directories(hyprtoolkit_inline_tests PUBLIC "./include" PRIVATE "./src" "./src/include" "./protocols" "${CMAKE_BINARY_DIR}") -- target_link_libraries(hyprtoolkit_inline_tests PRIVATE GTest::gtest_main OpenGL::EGL OpenGL::OpenGL PkgConfig::deps) -+ target_link_libraries(hyprtoolkit_inline_tests PRIVATE GTest::gtest_main OpenGL::EGL OpenGL::OpenGL PkgConfig::deps PkgConfig::epoll PkgConfig::inotify) - gtest_discover_tests(hyprtoolkit_inline_tests) - endif() - diff --git a/x11-toolkits/hyprtoolkit/files/patch-include_hyprtoolkit_palette_Palette.hpp b/x11-toolkits/hyprtoolkit/files/patch-include_hyprtoolkit_palette_Palette.hpp deleted file mode 100644 index f69244d0d8aa..000000000000 --- a/x11-toolkits/hyprtoolkit/files/patch-include_hyprtoolkit_palette_Palette.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- include/hyprtoolkit/palette/Palette.hpp.orig 2025-11-12 08:32:18 UTC -+++ include/hyprtoolkit/palette/Palette.hpp -@@ -4,6 +4,8 @@ - - #include "Color.hpp" - -+#include <string> -+ - namespace Hyprtoolkit { - - class CPalette { diff --git a/x11-toolkits/hyprtoolkit/files/patch-src_core_Backend.cpp b/x11-toolkits/hyprtoolkit/files/patch-src_core_Backend.cpp deleted file mode 100644 index 87108a81019b..000000000000 --- a/x11-toolkits/hyprtoolkit/files/patch-src_core_Backend.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/Backend.cpp.orig 2025-11-12 08:07:15 UTC -+++ src/core/Backend.cpp -@@ -19,6 +19,7 @@ - #include <sys/poll.h> - - #include <print> -+#include <unistd.h> - - using namespace Hyprtoolkit; - using namespace Hyprutils::Memory; diff --git a/x11-toolkits/hyprtoolkit/files/patch-src_core_platforms_WaylandPlatform.cpp b/x11-toolkits/hyprtoolkit/files/patch-src_core_platforms_WaylandPlatform.cpp deleted file mode 100644 index 15f595daa055..000000000000 --- a/x11-toolkits/hyprtoolkit/files/patch-src_core_platforms_WaylandPlatform.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/platforms/WaylandPlatform.cpp.orig 2025-11-12 08:07:51 UTC -+++ src/core/platforms/WaylandPlatform.cpp -@@ -15,6 +15,7 @@ - #include <cstring> - #include <sys/mman.h> - #include <fcntl.h> -+#include <unistd.h> - - using namespace Hyprtoolkit; - using namespace Hyprutils::Math; diff --git a/x11-toolkits/hyprtoolkit/files/patch-src_element_Element.cpp b/x11-toolkits/hyprtoolkit/files/patch-src_element_Element.cpp deleted file mode 100644 index b749e5845853..000000000000 --- a/x11-toolkits/hyprtoolkit/files/patch-src_element_Element.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/element/Element.cpp.orig 2025-11-12 08:13:02 UTC -+++ src/element/Element.cpp -@@ -7,6 +7,8 @@ - #include "../window/ToolkitWindow.hpp" - #include "../layout/Positioner.hpp" - -+#include <algorithm> -+ - using namespace Hyprtoolkit; - using namespace Hyprutils::Math; - diff --git a/x11-toolkits/hyprtoolkit/files/patch-src_element_scrollArea_ScrollArea.cpp b/x11-toolkits/hyprtoolkit/files/patch-src_element_scrollArea_ScrollArea.cpp deleted file mode 100644 index f3acbfb3d474..000000000000 --- a/x11-toolkits/hyprtoolkit/files/patch-src_element_scrollArea_ScrollArea.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/element/scrollArea/ScrollArea.cpp.orig 2025-11-12 08:23:14 UTC -+++ src/element/scrollArea/ScrollArea.cpp -@@ -118,7 +118,7 @@ void SScrollAreaImpl::clampMaxScroll() { - data.scrollX ? 99999999999 : self->impl->position.w, - data.scrollY ? 99999999999 : self->impl->position.h, - }) -- .value_or({99999999, 99999999}) - -+ .value_or(Vector2D{99999999, 99999999}) - - self->impl->position.size()) - .clamp({0, 0}); - diff --git a/x11-toolkits/hyprtoolkit/files/patch-src_layout_Positioner.cpp b/x11-toolkits/hyprtoolkit/files/patch-src_layout_Positioner.cpp new file mode 100644 index 000000000000..28d140a3b255 --- /dev/null +++ b/x11-toolkits/hyprtoolkit/files/patch-src_layout_Positioner.cpp @@ -0,0 +1,11 @@ +--- src/layout/Positioner.cpp.orig 2025-12-01 05:02:26 UTC ++++ src/layout/Positioner.cpp +@@ -96,7 +96,7 @@ void CPositioner::repositionNeeded(SP<IElement> elemen + if (!element->impl->parent->impl->positionerData || element->impl->parent->impl->positionerData->baseBox.empty()) { + if (force) { + initElementIfNeeded(element); +- position(element, CBox{Vector2D{}, element->preferredSize(Vector2D{}).value_or({})}); ++ position(element, CBox{Vector2D{}, element->preferredSize(Vector2D{}).value_or(Vector2D{})}); + } else if (element->impl->window) // full reflow needed + element->impl->window->scheduleReposition(element->impl->window->m_rootElement); + return; diff --git a/x11-toolkits/hyprtoolkit/files/patch-src_palette_ConfigManager.cpp b/x11-toolkits/hyprtoolkit/files/patch-src_palette_ConfigManager.cpp deleted file mode 100644 index e17c3beeec3f..000000000000 --- a/x11-toolkits/hyprtoolkit/files/patch-src_palette_ConfigManager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/palette/ConfigManager.cpp.orig 2025-11-12 08:27:37 UTC -+++ src/palette/ConfigManager.cpp -@@ -4,6 +4,8 @@ - - #include "../core/InternalBackend.hpp" - -+#include <unistd.h> -+ - using namespace Hyprtoolkit; - - CConfigManager::CConfigManager() : m_inotifyFd(inotify_init()) { diff --git a/x11-toolkits/hyprtoolkit/files/patch-src_renderer_gl_OpenGL.cpp b/x11-toolkits/hyprtoolkit/files/patch-src_renderer_gl_OpenGL.cpp deleted file mode 100644 index a42cb29d84a4..000000000000 --- a/x11-toolkits/hyprtoolkit/files/patch-src_renderer_gl_OpenGL.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/renderer/gl/OpenGL.cpp.orig 2025-11-12 08:29:16 UTC -+++ src/renderer/gl/OpenGL.cpp -@@ -447,7 +447,7 @@ COpenGLRenderer::COpenGLRenderer(int drmFD) : m_drmFD( - - g_logger->log(HT_LOG_DEBUG, "DRM syncobj timeline support: {}", m_syncobjSupported ? "yes" : "no"); - #else -- Debug::log(LOG, "DRM syncobj timeline support: no (not linux)"); -+ g_logger->log(HT_LOG_DEBUG, "DRM syncobj timeline support: no (not linux)"); - #endif - - #ifdef HYPRTOOLKIT_DEBUG diff --git a/x11-toolkits/hyprtoolkit/files/patch-src_sessionLock_WaylandSessionLock.cpp b/x11-toolkits/hyprtoolkit/files/patch-src_sessionLock_WaylandSessionLock.cpp new file mode 100644 index 000000000000..1326a13ffe76 --- /dev/null +++ b/x11-toolkits/hyprtoolkit/files/patch-src_sessionLock_WaylandSessionLock.cpp @@ -0,0 +1,11 @@ +--- src/sessionLock/WaylandSessionLock.cpp.orig 2025-12-01 05:05:45 UTC ++++ src/sessionLock/WaylandSessionLock.cpp +@@ -3,6 +3,8 @@ + #include "../core/platforms/WaylandPlatform.hpp" + #include "../window/WaylandLockSurface.hpp" + ++#include <algorithm> ++ + using namespace Hyprtoolkit; + + CWaylandSessionLockState::CWaylandSessionLockState(SP<CCExtSessionLockV1> lock) : m_lock(lock) { diff --git a/x11-toolkits/hyprtoolkit/files/patch-src_window_WaylandPopup.cpp b/x11-toolkits/hyprtoolkit/files/patch-src_window_WaylandPopup.cpp deleted file mode 100644 index 9090cbba3ee3..000000000000 --- a/x11-toolkits/hyprtoolkit/files/patch-src_window_WaylandPopup.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/window/WaylandPopup.cpp.orig 2025-11-12 08:33:32 UTC -+++ src/window/WaylandPopup.cpp -@@ -59,7 +59,7 @@ void CWaylandPopup::open() { - m_wlPopupState.xdgPositioner->sendSetAnchorRect(m_creationData.pos.x, m_creationData.pos.y, 1, 1); - m_wlPopupState.xdgPositioner->sendSetAnchor(XDG_POSITIONER_ANCHOR_TOP_LEFT); - m_wlPopupState.xdgPositioner->sendSetGravity(XDG_POSITIONER_GRAVITY_BOTTOM_RIGHT); -- m_wlPopupState.xdgPositioner->sendSetSize(m_creationData.preferredSize.value_or({200, 200}).x, m_creationData.preferredSize.value_or({200, 200}).y); -+ m_wlPopupState.xdgPositioner->sendSetSize(m_creationData.preferredSize.value_or(Vector2D{200, 200}).x, m_creationData.preferredSize.value_or(Vector2D{200, 200}).y); - m_wlPopupState.xdgPositioner->sendSetConstraintAdjustment( - (xdgPositionerConstraintAdjustment)(XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_Y | XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X)); - diff --git a/x11-toolkits/hyprtoolkit/files/patch-tests_SimpleSessionLock.cpp b/x11-toolkits/hyprtoolkit/files/patch-tests_SimpleSessionLock.cpp new file mode 100644 index 000000000000..a22d0cd31a0c --- /dev/null +++ b/x11-toolkits/hyprtoolkit/files/patch-tests_SimpleSessionLock.cpp @@ -0,0 +1,10 @@ +--- tests/SimpleSessionLock.cpp.orig 2025-12-01 05:13:48 UTC ++++ tests/SimpleSessionLock.cpp +@@ -12,6 +12,7 @@ + #include <hyprutils/memory/SharedPtr.hpp> + #include <hyprutils/memory/UniquePtr.hpp> + ++#include <algorithm> + #include <print> + + using namespace Hyprutils::Memory; diff --git a/x11-toolkits/hyprtoolkit/pkg-plist b/x11-toolkits/hyprtoolkit/pkg-plist index 740343e45d29..d70d5e2d6b7c 100644 --- a/x11-toolkits/hyprtoolkit/pkg-plist +++ b/x11-toolkits/hyprtoolkit/pkg-plist @@ -2,6 +2,8 @@ include/hyprtoolkit/core/Backend.hpp include/hyprtoolkit/core/CoreMacros.hpp include/hyprtoolkit/core/Input.hpp include/hyprtoolkit/core/LogTypes.hpp +include/hyprtoolkit/core/Output.hpp +include/hyprtoolkit/core/SessionLock.hpp include/hyprtoolkit/core/Timer.hpp include/hyprtoolkit/element/Button.hpp include/hyprtoolkit/element/Checkbox.hpp @@ -20,13 +22,12 @@ include/hyprtoolkit/element/Text.hpp include/hyprtoolkit/element/Textbox.hpp include/hyprtoolkit/palette/Color.hpp include/hyprtoolkit/palette/Palette.hpp -include/hyprtoolkit/palette/Palette.hpp.orig include/hyprtoolkit/system/Icons.hpp include/hyprtoolkit/types/FontTypes.hpp include/hyprtoolkit/types/PointerShape.hpp include/hyprtoolkit/types/SizeType.hpp include/hyprtoolkit/window/Window.hpp lib/libhyprtoolkit.so -lib/libhyprtoolkit.so.%%SOVERSION_MAJOR%% lib/libhyprtoolkit.so.%%SOVERSION_FULL%% +lib/libhyprtoolkit.so.%%SOVERSION_MAJOR%% libdata/pkgconfig/hyprtoolkit.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?692d341f.f5c4.1010f7ec>