From nobody Fri Jan 06 08:09:41 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NpGGG0Ttkz2p1Q5; Fri, 6 Jan 2023 08:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NpGGF6w79z3j9p; Fri, 6 Jan 2023 08:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672992582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zwKWe2kHkw0m/CrCgqpkMVhS1bRoGG3pIq7BhyYbncM=; b=m4a5nWchHgVsqmos7T3S/R4oqweyHYanZNpULXDapfCmO4gNY2XCbipDADnB+fWBKTKyJ4 iB3gIYAwDl/w7a0/DsAMxNBaWRqRDObP+2zw9T8TAP5T9zSBPK21bUrFQ0OW+BI4H746B7 DY0XejJUSmbBPV0W8E/M9iKigUMk7BIQPTYBb6KK+EJzA+M/JVIIZZZUjn3h2ZrizO+cUo Xdjo5osQcekfgltEoIBcbYkYuj6uC2bI5mcOMIB70w3rO3W3z0qrcHgc8ZAwVj+/V9ALtC WBSZeeioJ8WsXAnQkuaVYAHuDF+LUrQvTGFWLDvdhyOhKWtXJrBjddfS/SQxUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672992582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zwKWe2kHkw0m/CrCgqpkMVhS1bRoGG3pIq7BhyYbncM=; b=XeKK2JJVytXvF8IlvpLHxJiNc+zSoJTm5aNPrACEOjH7LpBG7uiHrWpvENOdkmZl8cq35N /evZye/vfPpCUeG7iUuh4PpjPm82OP1xa1N7SUEuGs1JLQRdAK/Y81EqWM5ezu/0QjgfXY C0f1ivJeGLGMwDQO/ak5IoziGgoZpZysDdoRLF6kGhtpz7faW4gr6BevGmoc7Q8nHyi9IH iDQJfaKU9eh+5R3N0KUyNCJ4vVkDXjCidXZAkprfQmgr+1JuEhAWW7JOKLxUbYvic71PKB qDma1oqP/Qe9WET6aEdF6T6ZXyogF9TaYK25wMaW4ASNOUEk5md/kMqyuzup/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672992582; a=rsa-sha256; cv=none; b=Kz9MHn1qgQ2XfpgFrHCkCfEm5zg9CMqSP3aHZaKJ149JKVUs+P4riWkh+FnsEC1Ty+Se3Z JgeAHUBZzMt1dNw3j/M5iiu7LNeRPMvDtz6tF/7jVTnHxckyIjyOkZdlWC6fi3ylPprVZh LBnyPuuhAMyoIctv5GMj2XNr8t56VRd0O25zEZJoh+hqARR9U3GGFbu9Fr8Ry8FdiLSXaa x1dH+87ZtSpHzzaetyPpPu8BzBb5YY1fW0GI4TZDpxTcMHVml5aV/1NXvY49GC03Dadju9 H7NsA/V0F7vjP5XoL1IKfZu97IxFKZVwHGcfleb8ri2K3NCjS20SGOnOw8evXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NpGGF5skHzNYb; Fri, 6 Jan 2023 08:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30689fw6049316; Fri, 6 Jan 2023 08:09:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30689fSN049315; Fri, 6 Jan 2023 08:09:41 GMT (envelope-from git) Date: Fri, 6 Jan 2023 08:09:41 GMT Message-Id: <202301060809.30689fSN049315@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: e2f8595d7587 - main - x11-wm/hyprland: update to 0.20.0.b List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2f8595d7587a07a910fa11b3a63e1085e499ae8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2f8595d7587a07a910fa11b3a63e1085e499ae8 commit e2f8595d7587a07a910fa11b3a63e1085e499ae8 Author: Jan Beich AuthorDate: 2023-01-05 22:30:24 +0000 Commit: Jan Beich 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& 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); }