Date: Sun, 8 Sep 2024 20:55:09 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: 3bda4edf25e3 - main - x11-wm/hyprland: update to 0.43.0 Message-ID: <202409082055.488Kt9OA087470@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=3bda4edf25e3b88bac7d3b46005a828862805441 commit 3bda4edf25e3b88bac7d3b46005a828862805441 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-08-19 02:35:39 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-09-08 20:52:53 +0000 x11-wm/hyprland: update to 0.43.0 Changes: https://github.com/hyprwm/Hyprland/releases/tag/v0.43.0 Reported by: GitHub (watch releases) --- x11-wm/hyprland/Makefile | 11 ++--------- x11-wm/hyprland/distinfo | 14 +++----------- x11-wm/hyprland/files/patch-libc++16 | 10 +++++----- x11-wm/hyprland/files/patch-libc++17 | 19 +++++++++++++++++++ x11-wm/hyprland/pkg-plist | 2 ++ 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index ab6ee6a4098c..54494abcb24b 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,15 +1,8 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v -DISTVERSION= 0.42.0 -PORTREVISION= 2 +DISTVERSION= 0.43.0 CATEGORIES= x11-wm wayland -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 4fdc0d55e4b4.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/6842 -PATCHFILES+= 118d4e1001d5.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/7281 -PATCHFILES+= ff3f41c9a5d1.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/7626 -PATCHFILES+= 89fa6a6a66e6.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/7626 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' WWW= https://hyprland.org/ @@ -44,7 +37,7 @@ CMAKE_ON= NO_SYSTEMD LDFLAGS+= -Wl,--as-needed # GL, pango deps # Generated by "make update-hash" for commit_pins in hyprpm.toml -GH_HASH= 9a09eac79b85c846e3a865a9078a3f8ff65a9259 +GH_HASH= 0f594732b063a90d44df8c5d402d658f27471dfe # 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) diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index 03e903516a1b..7c9f78600b93 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -1,15 +1,7 @@ -TIMESTAMP = 1723058230 -SHA256 (hyprwm-Hyprland-v0.42.0_GH0.tar.gz) = 70f67725c7a1745d0287a954790f323e75519a1a188a3bf4b21fd968be3f5e4a -SIZE (hyprwm-Hyprland-v0.42.0_GH0.tar.gz) = 48049320 +TIMESTAMP = 1725814101 +SHA256 (hyprwm-Hyprland-v0.43.0_GH0.tar.gz) = af9e4a3da2ea3d164a226d14a14c477ff47ea1e384d7fe20733f9dd64543943c +SIZE (hyprwm-Hyprland-v0.43.0_GH0.tar.gz) = 48216815 SHA256 (hyprwm-hyprland-protocols-v0.2-5-ge06482e_GH0.tar.gz) = 05055f71e1f08496320bab54daa190f2fafec1a0e019af244edf1d37cdbf9b8a SIZE (hyprwm-hyprland-protocols-v0.2-5-ge06482e_GH0.tar.gz) = 7424 SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff6247b375b92e797221dbd8e078eabbf1366280b0532617e7fb8 SIZE (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 116938 -SHA256 (4fdc0d55e4b4.patch) = 1f3e4cf9c33a37683127feca287318a5532eff95fdaa1a5b87aad8aaca1aa220 -SIZE (4fdc0d55e4b4.patch) = 970 -SHA256 (118d4e1001d5.patch) = 6dd03c7d36d1c06d9254ba0f8adacb299bff670a11647be81d05a77fa2be2503 -SIZE (118d4e1001d5.patch) = 768 -SHA256 (ff3f41c9a5d1.patch) = 942e5271c07c853ced50584179ffc89ee7a1e0269fed0c661e371be34b5dac58 -SIZE (ff3f41c9a5d1.patch) = 727 -SHA256 (89fa6a6a66e6.patch) = 2e3bc9a15a4de383976c41d3a0c80e3c44dc181adedf1ec843a867eb26c0a027 -SIZE (89fa6a6a66e6.patch) = 1103 diff --git a/x11-wm/hyprland/files/patch-libc++16 b/x11-wm/hyprland/files/patch-libc++16 index 52303c71d65d..2d1e3f7602f7 100644 --- a/x11-wm/hyprland/files/patch-libc++16 +++ b/x11-wm/hyprland/files/patch-libc++16 @@ -16,12 +16,12 @@ In file included from ../src/defines.hpp:2: static constexpr array<__format::__arg_t, sizeof...(_Args)> __types_{ ^ ---- src/debug/Log.hpp.orig 2024-06-05 16:30:46.000000000 +0000 +--- src/debug/Log.hpp.orig 2024-08-30 15:37:52 UTC +++ src/debug/Log.hpp -@@ -51,11 +51,12 @@ namespace Debug { - #ifndef _LIBCPP_VERSION - const auto zt = std::chrono::zoned_time{std::chrono::current_zone(), std::chrono::system_clock::now()}; - const auto hms = std::chrono::hh_mm_ss{zt.get_local_time() - std::chrono::floor<std::chrono::days>(zt.get_local_time())}; +@@ -58,11 +58,12 @@ namespace Debug { + static auto current_zone = std::chrono::current_zone(); + const auto zt = std::chrono::zoned_time{current_zone, std::chrono::system_clock::now()}; + const auto hms = std::chrono::hh_mm_ss{zt.get_local_time() - std::chrono::floor<std::chrono::days>(zt.get_local_time())}; + logMsg += std::format("[{}] ", hms); #else // TODO: current clang 17 does not support `zoned_time`, remove this once clang 19 is ready diff --git a/x11-wm/hyprland/files/patch-libc++17 b/x11-wm/hyprland/files/patch-libc++17 new file mode 100644 index 000000000000..f40126f4eebf --- /dev/null +++ b/x11-wm/hyprland/files/patch-libc++17 @@ -0,0 +1,19 @@ +Drop after FreeBSD 13.3 EOL around 2025-07-01 + +../src/debug/Log.cpp:13:26: error: no member named 'native_handle' in 'std::ofstream' + 13 | auto handle = logOfs.native_handle(); + | ~~~~~~ ^ + +--- src/debug/Log.cpp.orig 2024-08-18 21:21:59 UTC ++++ src/debug/Log.cpp +@@ -10,8 +10,10 @@ void Debug::init(const std::string& IS) { + void Debug::init(const std::string& IS) { + logFile = IS + (ISDEBUG ? "/hyprlandd.log" : "/hyprland.log"); + logOfs.open(logFile, std::ios::out | std::ios::app); ++#if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 180100 + auto handle = logOfs.native_handle(); + fcntl(handle, F_SETFD, FD_CLOEXEC); ++#endif + } + + void Debug::close() { diff --git a/x11-wm/hyprland/pkg-plist b/x11-wm/hyprland/pkg-plist index 656c69cb7ef6..418529e3c0eb 100644 --- a/x11-wm/hyprland/pkg-plist +++ b/x11-wm/hyprland/pkg-plist @@ -7,6 +7,8 @@ share/bash-completion/completions/hyprpm share/fish/vendor_completions.d/hyprctl.fish share/fish/vendor_completions.d/hyprpm.fish share/hypr/hyprland.conf +share/hypr/lockdead.png +share/hypr/lockdead2.png share/hypr/wall0.png share/hypr/wall1.png share/hypr/wall2.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409082055.488Kt9OA087470>