git: 5afc9718499d - 2024Q1 - x11-wm/hyprland: skip updating headers after 47721ef8e32b
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Feb 2024 19:56:53 UTC
The branch 2024Q1 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5afc9718499d1a40bd57d57db49d54087db2c2f3
commit 5afc9718499d1a40bd57d57db49d54087db2c2f3
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-02-05 19:15:50 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-02-05 19:56:32 +0000
x11-wm/hyprland: skip updating headers after 47721ef8e32b
- Avoid ABI mismatch between bundled and system wlroots
- Building Hyprland on FreeBSD outside of ports/ may fail
Disables https://github.com/hyprwm/Hyprland/commit/3656045ad887
(cherry picked from commit 3a8517f68535b7c4f67f93c07dfeaa4eeaf41610)
---
x11-wm/hyprland/Makefile | 2 +-
x11-wm/hyprland/files/patch-system-wlroots | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index 58a69b8474a0..a6eead093521 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -32,7 +32,7 @@ GH_TUPLE= hyprwm:hyprland-protocols:v0.2-4-g0c2ce70:hyprland_protocols/subprojec
canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86
MESON_ARGS= -Dsystemd=disabled
-# Generated by "make update-hash" for "hyprpm update" (headersValid)
+# Generated by "make update-hash" for commit_pins in hyprpm.toml
GH_HASH= 84ab8d11e8951a6551d1e1bf87796a8589da6d47
# XXX Drop after FreeBSD 14.0 EOL around 2025-03-01
diff --git a/x11-wm/hyprland/files/patch-system-wlroots b/x11-wm/hyprland/files/patch-system-wlroots
index 8eed6a0decae..1373e3aff497 100644
--- a/x11-wm/hyprland/files/patch-system-wlroots
+++ b/x11-wm/hyprland/files/patch-system-wlroots
@@ -24,3 +24,15 @@ Allow system wlroots to reduce maintenance (wlroots has tons of options)
dependency('cairo'),
dependency('libdrm'),
dependency('egl'),
+--- hyprpm/src/core/PluginManager.cpp.orig 2024-02-05 01:59:02 UTC
++++ hyprpm/src/core/PluginManager.cpp
+@@ -285,9 +285,6 @@ eHeadersErrors CPluginManager::headersValid() {
+ eHeadersErrors CPluginManager::headersValid() {
+ const auto HLVER = getHyprlandVersion();
+
+- if (!std::filesystem::exists(DataState::getHeadersPath() + "/share/pkgconfig/hyprland.pc"))
+- return HEADERS_MISSING;
+-
+ // find headers commit
+ std::string cmd = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkg-config --cflags --keep-system-cflags hyprland", DataState::getHeadersPath());
+ auto headers = execAndGet(cmd.c_str());