From nobody Tue Dec 05 02:19:28 2023 X-Original-To: dev-commits-ports-main@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 4SkkkS5pPLz537Ww; Tue, 5 Dec 2023 02:19:28 +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 4SkkkS5JnDz3Kcm; Tue, 5 Dec 2023 02:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701742768; 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=Yo212nNGSep/Wpk+tSWFZWDsblxbmks/uF9iPQkMEgU=; b=DdyOcxni1qFzK52DekU9lTV7MEilS4jMWeBRSBpA/Ilr1Npm3GexAv2Ze5rnv/Mp5v+BoD od0mugIxaHU62L5Z1kvJgoelzGEhaU0/UGQz2sYynG8hKkmtmKxvq+uFFSB0+bNSzOW2g5 UPwO7sFhgbOMDbDvaRWujSBPJ+abi6Ks+CdnNqGVSziU9tULR+N0U6ZxXsWB3PPfSn5CUC EumItPT9tGOuB8PwHUZdySqOZnAyCCeEau1c0GUNf6+4TCZuxWRKH+1PJsBlFDzGkHuark X0bLMCZK1L/Ne/8FkIUkAt9p03Hzep/UblJU6u7MHTVBhQMoq8ip8vH5qsl0Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701742768; 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=Yo212nNGSep/Wpk+tSWFZWDsblxbmks/uF9iPQkMEgU=; b=MrZ57ENN+o1mKjhTfNCPXhq1AjEdiZ8UCp6v4qzXaLFJLMDniKucGF2xZB6ZDO7z5nh+v4 Ou7eaa0MlKe/ymeFLtOUP33xCo7dvJXi1fMS0liYvfpMJ5Fnj9Y6lyMJfXUl+8wIpnx/Od K7bq1fONpuFKYp/6wUwttYYD+uZ4g4nhkhu6xtjKSVM5tMI0Ayd/JC/tzrTtlYy/oR1I21 e6BndM5mCUWamH7DEq4oFW2jtE+U9acZOnVcZMDtNRMeQKGLzuhcZejkjHIbNVc/08ud9P XOE/P6ffXPjOEOZjJdN799joNNvVzyFmjCU0ksWlkfjnqFkHUR2Mi+8flRqX8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701742768; a=rsa-sha256; cv=none; b=Zxn86ka6Xo7R7lelsXwg6tgUISbL8WzIEg3Zo60oYueMs0FWav3XShDH4aQXWF3Ilr5KTv xxHbsQ0ebyLbNLJJaBts7OEGNXAxtWZ2dXqoP5IFXMuc68bD6M/oE8wF55wQe5i34FBMzP xA020AyhNhcNWXmIa+I1mz99yyEvA1GsR9AT5Co451XGq2b+jY0U+wTMPGlh1zPgn0N3ta 2Bga5fGuW95/rkad+s7/txvltj40hZVMtNJf0nSl/v/+0fPjwIJUxKll5kU8n94jv7UdkV jA+Ky/zfGD7RR7nxhf6aFlnP2J2i+WFoFF3zMdGVQVmXoRCLZmaN/paiaaTzHw== 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 4SkkkS48N3zrNK; Tue, 5 Dec 2023 02:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B52JSKq082535; Tue, 5 Dec 2023 02:19:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B52JSZT082532; Tue, 5 Dec 2023 02:19:28 GMT (envelope-from git) Date: Tue, 5 Dec 2023 02:19:28 GMT Message-Id: <202312050219.3B52JSZT082532@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: ca9b785803a6 - main - x11-wm/hyprland: update to 0.33.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: ca9b785803a65687f4ec1ee2dbc28f33f7868239 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca9b785803a65687f4ec1ee2dbc28f33f7868239 commit ca9b785803a65687f4ec1ee2dbc28f33f7868239 Author: Jan Beich AuthorDate: 2023-12-05 00:52:16 +0000 Commit: Jan Beich CommitDate: 2023-12-05 02:19:03 +0000 x11-wm/hyprland: update to 0.33.0 Changes: https://github.com/hyprwm/Hyprland/releases/tag/v0.33.0 Reported by: GitHub (watch releases) --- x11-wm/hyprland/Makefile | 3 +- x11-wm/hyprland/distinfo | 6 ++-- x11-wm/hyprland/files/patch-wlroots-0.17 | 54 ++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 5 deletions(-) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 1d3661038ca8..a64c2cfa3f94 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,7 +1,6 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v -DISTVERSION= 0.32.3 -PORTREVISION= 3 +DISTVERSION= 0.33.0 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index e1de3673c29d..febfb06c462b 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1699726486 -SHA256 (hyprwm-Hyprland-v0.32.3_GH0.tar.gz) = 880d5496ec0352983579398f3e202fa2b9bd3808a4e3f2420cdde5d2ddc41a9c -SIZE (hyprwm-Hyprland-v0.32.3_GH0.tar.gz) = 7343127 +TIMESTAMP = 1701737536 +SHA256 (hyprwm-Hyprland-v0.33.0_GH0.tar.gz) = 802bba6ba638fc841ee9b7e05258a78db91f103be26bd00ef5bcf5da295df1c0 +SIZE (hyprwm-Hyprland-v0.33.0_GH0.tar.gz) = 7350504 SHA256 (hyprwm-hyprland-protocols-v0.2-4-g0c2ce70_GH0.tar.gz) = d8eb9712d66a167a22a0dae829b6dba2b85814b566d0a87918c944e7c0388d1b SIZE (hyprwm-hyprland-protocols-v0.2-4-g0c2ce70_GH0.tar.gz) = 6478 SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff6247b375b92e797221dbd8e078eabbf1366280b0532617e7fb8 diff --git a/x11-wm/hyprland/files/patch-wlroots-0.17 b/x11-wm/hyprland/files/patch-wlroots-0.17 new file mode 100644 index 000000000000..f489a10606b1 --- /dev/null +++ b/x11-wm/hyprland/files/patch-wlroots-0.17 @@ -0,0 +1,54 @@ +Revert to wlroots 0.17 API as 0.18 is a moving target, so hard to +use as system package with more than one consumer. + +https://github.com/hyprwm/hyprland/commit/2ebfd0c7456e +https://github.com/hyprwm/hyprland/commit/d2c3b23ace74 + +--- src/Compositor.cpp.orig 2023-11-30 15:20:08 UTC ++++ src/Compositor.cpp +@@ -190,7 +190,7 @@ void CCompositor::initServer() { + + m_sWLRGammaCtrlMgr = wlr_gamma_control_manager_v1_create(m_sWLDisplay); + +- m_sWLROutputLayout = wlr_output_layout_create(m_sWLDisplay); ++ m_sWLROutputLayout = wlr_output_layout_create(); + + m_sWLROutputPowerMgr = wlr_output_power_manager_v1_create(m_sWLDisplay); + +@@ -282,7 +282,7 @@ void CCompositor::initAllSignals() { + + void CCompositor::initAllSignals() { + addWLSignal(&m_sWLRBackend->events.new_output, &Events::listen_newOutput, m_sWLRBackend, "Backend"); +- addWLSignal(&m_sWLRXDGShell->events.new_toplevel, &Events::listen_newXDGToplevel, m_sWLRXDGShell, "XDG Shell"); ++ addWLSignal(&m_sWLRXDGShell->events.new_surface, &Events::listen_newXDGToplevel, m_sWLRXDGShell, "XDG Shell"); + addWLSignal(&m_sWLRCursor->events.motion, &Events::listen_mouseMove, m_sWLRCursor, "WLRCursor"); + addWLSignal(&m_sWLRCursor->events.motion_absolute, &Events::listen_mouseMoveAbsolute, m_sWLRCursor, "WLRCursor"); + addWLSignal(&m_sWLRCursor->events.button, &Events::listen_mouseButton, m_sWLRCursor, "WLRCursor"); +--- src/events/Windows.cpp.orig 2023-11-30 15:20:08 UTC ++++ src/events/Windows.cpp +@@ -1171,10 +1171,12 @@ void Events::listener_newXDGToplevel(wl_listener* list + + void Events::listener_newXDGToplevel(wl_listener* listener, void* data) { + // A window got opened +- const auto XDGTOPLEVEL = (wlr_xdg_toplevel*)data; +- const auto XDGSURFACE = XDGTOPLEVEL->base; ++ const auto XDGSURFACE = (wlr_xdg_surface*)data; + +- Debug::log(LOG, "New XDG Toplevel created. (class: {})", XDGSURFACE->toplevel->app_id ? XDGSURFACE->toplevel->app_id : "null"); ++ if (XDGSURFACE->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) ++ return; ++ ++ Debug::log(LOG, "New XDG Surface created. (class: {})", XDGSURFACE->toplevel->app_id ? XDGSURFACE->toplevel->app_id : "null"); + + const auto PNEWWINDOW = g_pCompositor->m_vWindows.emplace_back(std::make_unique()).get(); + PNEWWINDOW->m_uSurface.xdg = XDGSURFACE; +--- src/includes.hpp.orig 2023-11-30 15:20:08 UTC ++++ src/includes.hpp +@@ -105,7 +105,6 @@ extern "C" { + #include + #include + #include +-#include + #include + #include +