git: e2f8595d7587 - main - x11-wm/hyprland: update to 0.20.0.b

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 06 Jan 2023 08:09:41 UTC
The branch main has been updated by jbeich:

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

commit e2f8595d7587a07a910fa11b3a63e1085e499ae8
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-01-05 22:30:24 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-01-06 08:08:37 +0000

    x11-wm/hyprland: update to 0.20.0.b
    
    Changes:        https://github.com/hyprwm/Hyprland/releases/tag/v0.20.0beta
    Reported by:    GitHub (watch releases)
---
 x11-wm/hyprland/Makefile                   |  7 +------
 x11-wm/hyprland/distinfo                   | 12 +++---------
 x11-wm/hyprland/files/patch-system-wlroots |  6 +++---
 x11-wm/hyprland/files/patch-wlroots-0.16   | 12 ++++++------
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
index 6274aee8152a..1ee8b95e9b23 100644
--- a/x11-wm/hyprland/Makefile
+++ b/x11-wm/hyprland/Makefile
@@ -1,13 +1,8 @@
 PORTNAME=	hyprland
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.19.2beta
+DISTVERSION=	0.20.0beta
 CATEGORIES=	x11-wm wayland
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	62efcc4e1cc1.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/1251
-PATCHFILES+=	34d1def07dd1.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/1252
-PATCHFILES+=	afd5728d26a0.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/1252
-
 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 155815d0bb08..dcc2b81d26c6 100644
--- a/x11-wm/hyprland/distinfo
+++ b/x11-wm/hyprland/distinfo
@@ -1,11 +1,5 @@
-TIMESTAMP = 1670857002
-SHA256 (hyprwm-Hyprland-v0.19.2beta_GH0.tar.gz) = 4454220b67699b79825ae45efdded68856343a005e3f5c08a258ef918e7e10b1
-SIZE (hyprwm-Hyprland-v0.19.2beta_GH0.tar.gz) = 701944
+TIMESTAMP = 1672957824
+SHA256 (hyprwm-Hyprland-v0.20.0beta_GH0.tar.gz) = 366da4957e61ebc5c33e42f7eb7c73ab79566774f50494241349cc515a140ca3
+SIZE (hyprwm-Hyprland-v0.20.0beta_GH0.tar.gz) = 708221
 SHA256 (hyprwm-hyprland-protocols-301733a_GH0.tar.gz) = 3b3b4e948525f1d823313390b2551ea8969d0cbf82bd72e2a4a2ce2750552330
 SIZE (hyprwm-hyprland-protocols-301733a_GH0.tar.gz) = 4852
-SHA256 (62efcc4e1cc1.patch) = 232f6eeb64a0f52a07e5cd3ecc2ccaa453176c91c8c63556313f6f74dc6000f7
-SIZE (62efcc4e1cc1.patch) = 2519
-SHA256 (34d1def07dd1.patch) = 38527787eca37e886a353e371d30e41bfd397b87eb10858a84e09f210c012667
-SIZE (34d1def07dd1.patch) = 1052
-SHA256 (afd5728d26a0.patch) = f2e605c9dbe6e87dfe4b222b277f584a98a3834482fbe201c93decebdfbf75dc
-SIZE (afd5728d26a0.patch) = 551
diff --git a/x11-wm/hyprland/files/patch-system-wlroots b/x11-wm/hyprland/files/patch-system-wlroots
index aaf80e30da0c..21457e7c2728 100644
--- a/x11-wm/hyprland/files/patch-system-wlroots
+++ b/x11-wm/hyprland/files/patch-system-wlroots
@@ -13,7 +13,7 @@ Allow system wlroots to reduce maintenance (wlroots has tons of options)
  xcb_dep = dependency('xcb', required: get_option('xwayland'))
  
  if get_option('xwayland').enabled() and not have_xwlr
---- src/meson.build.orig	2022-11-07 12:16:30 UTC
+--- src/meson.build.orig	2023-01-05 22:30:24 UTC
 +++ src/meson.build
 @@ -7,7 +7,7 @@ executable('Hyprland', src,
      server_protos,
@@ -22,5 +22,5 @@ Allow system wlroots to reduce maintenance (wlroots has tons of options)
 -    wlroots.get_variable('wlroots'),
 +    wlroots,
      dependency('cairo'),
-     dependency('pango'),
-     dependency('pangocairo'),
+     dependency('libdrm'),
+     dependency('egl'),
diff --git a/x11-wm/hyprland/files/patch-wlroots-0.16 b/x11-wm/hyprland/files/patch-wlroots-0.16
index 1d488a5289f4..5c7f6318dc45 100644
--- a/x11-wm/hyprland/files/patch-wlroots-0.16
+++ b/x11-wm/hyprland/files/patch-wlroots-0.16
@@ -58,9 +58,9 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
  
      // XWayland
      LISTENER(readyXWayland);
---- src/events/Monitors.cpp.orig	2022-12-06 13:15:18 UTC
+--- src/events/Monitors.cpp.orig	2023-01-05 22:30:24 UTC
 +++ src/events/Monitors.cpp
-@@ -266,10 +266,11 @@ void Events::listener_monitorFrame(void* owner, void* 
+@@ -265,10 +265,11 @@ void Events::listener_monitorFrame(void* owner, void* 
                  damageBlinkCleanup = 0;
          }
  
@@ -76,15 +76,15 @@ https://github.com/hyprwm/Hyprland/commit/d6b3bfc48e22
      }
  
      g_pHyprOpenGL->end();
-@@ -354,11 +355,4 @@ void Events::listener_monitorDestroy(void* owner, void
-             pMostHzMonitor = pMonitorMostHz;
-         }
+@@ -339,11 +340,4 @@ void Events::listener_monitorDestroy(void* owner, void
+ 
+         std::erase_if(g_pCompositor->m_vRealMonitors, [&](std::shared_ptr<CMonitor>& el) { return el.get() == pMonitor; });
      }
 -}
 -
 -void Events::listener_monitorStateRequest(void* owner, void* data) {
 -    const auto PMONITOR = (CMonitor*)owner;
--    const auto E = (wlr_output_event_request_state*)data;
+-    const auto E        = (wlr_output_event_request_state*)data;
 -
 -    wlr_output_commit_state(PMONITOR->output, E->state);
  }