git: 9e6312e21dc4 - main - x11-wm/hyprland: backport some fixes

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sat, 15 Apr 2023 19:14:09 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9e6312e21dc41631d22fbeaf6ec62d86d022db5d

commit 9e6312e21dc41631d22fbeaf6ec62d86d022db5d
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-04-15 18:49:18 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-04-15 19:13:52 +0000

    x11-wm/hyprland: backport some fixes
    
    - Add misc:swallow_exception_regex to work around patch conflict
    - Avoid misc:enable_swallow crash if misc:swallow_regex is unset
    - Avoid missing systemctl disabling dbus-update-activation-environment
---
 x11-wm/hyprland/Makefile | 7 ++++++-
 x11-wm/hyprland/distinfo | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index 68523208dd5b..3a998049edea 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -1,9 +1,14 @@
 PORTNAME=	hyprland
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.24.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm wayland
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	efee6a1cda27.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2026
+PATCHFILES+=	8944db49be38.patch:-p1 # https://github.com/hyprwm/Hyprland/issues/2065
+PATCHFILES+=	63841c8aac8c.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/2066
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #'
 WWW=		https://hyprland.org/
diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo
index 1d31f68e91bd..32e469043657 100644
--- a/x11-wm/hyprland/distinfo
+++ b/x11-wm/hyprland/distinfo
@@ -7,3 +7,9 @@ SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff
 SIZE (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 116938
 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
+SHA256 (efee6a1cda27.patch) = 56621b462066573098774bb5601595bda8b4f2f55faacd84e1b93fbfc22f4c31
+SIZE (efee6a1cda27.patch) = 4384
+SHA256 (8944db49be38.patch) = 402c84680f0d206a991d8e07aa032b6af626e21cbf0fa93f3f9feea9be01daa3
+SIZE (8944db49be38.patch) = 1805
+SHA256 (63841c8aac8c.patch) = 318869b055e0bce87723004f2da13922c4ff82791c70fa99554dd3ab53bc279b
+SIZE (63841c8aac8c.patch) = 2371