From nobody Sat Apr 15 19:14:18 2023 X-Original-To: dev-commits-ports-branches@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 4PzNKQ44ZBz44tHT; Sat, 15 Apr 2023 19:14:18 +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 4PzNKQ3YzPz4HLX; Sat, 15 Apr 2023 19:14:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681586058; 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=gnA1NCI25Fg436xBdFpOTUULLuWFH8hA6pA1f7cemes=; b=pBESjqVwfUqZwskIzY5nSBzkTyHtBUaMAQ3nhbM1X2ZAQYUCh3IfWCBSdrLM7GaBJi7euM cAmSSvKwNDzzw/REfrndlNLLp48KJpe8YXvwxK3Vmx5SjX0dJ2uRgjt3Uv4ZSSYhN+bzVT VxSNsydQMEFxCrdzdwxxjNa43WjkbDi3xbCaw8JqJjTav4zCHTHcT37X88mWKJC4ntYBGC R5MQAX6NlQ5Dwi9wiR4bXU+ew++bRezdCjjEC2AbTC72TChOKmq9s5CZCuZdlaLweqmLwL fc24O6GUuziPzGhAQt2+g2SZFN0MhpUbFJEmFv22czIMOne1t4wkyFA13LPYBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681586058; 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=gnA1NCI25Fg436xBdFpOTUULLuWFH8hA6pA1f7cemes=; b=YAim3zeu/BNk37oFJM1fKYJK03w8VCC82pngFfgmmZHBPaXlo8cclAfz2T88+JcgVQ05vj Ox/0BNjwr5P8hlcBiBOFDzJkOL/Jf4FVMx8IhcYyTtby9ZvLr+CtZxWdDte2bX4+PmZThx bt9W0PwpH0wq45+D/BhAjiSwPOKcs4UOUVyXJgp4AuN9LqO+e8Vz1K5wJtsIZpSKVFtcaK 74m1u5fJh+ogcOBLjYSP3kTeGMajCu15+RfKMWsZhFVLHHa2gaokwbXEpRD6pive89reoA 6VtZX+tXa8EyrSB2Hy1v/nuplNkfkY+KQ3kdmd7E5VqyjCmr9gfXDmjT62ZdLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681586058; a=rsa-sha256; cv=none; b=F6LQIcuSPvYiK350oijDjODVwkFsu4Mcqf1cDHrRr83Q5oFM3CxT0tL5nrB5cXqQd/3u6r /bQPAvvQWbxGTwhDCF0HXIGcei9j+pXKZN7wtdO+CpxyqOzXa0SFsVbU8B6LYkdaZo+2QN 9jKhm/NlOfMA/Qm2WHrwBiu4u1rdVEmGQc2sVs4ObIfuLXvW9Xf/oIRCvGpkhQArUq+sWu geuENDliZ+po3kZTXu1ojJ6wY/QZYIijMXB/r6JcOuIb/AzGS74bD5bKtuwAlrelea9822 2ZldYMoy8te3wmYOmzKFUart9jRNRKhC4TaTfHAYZo3dHQ2YzU0ecKv5xjjQ+A== 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 4PzNKQ2Lp8zJDG; Sat, 15 Apr 2023 19:14:18 +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 33FJEICN073047; Sat, 15 Apr 2023 19:14:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FJEIBX073046; Sat, 15 Apr 2023 19:14:18 GMT (envelope-from git) Date: Sat, 15 Apr 2023 19:14:18 GMT Message-Id: <202304151914.33FJEIBX073046@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: e43430b63821 - 2023Q2 - x11-wm/hyprland: backport some fixes List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: e43430b63821eeea9d5e0c0044e537132b9c8b35 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e43430b63821eeea9d5e0c0044e537132b9c8b35 commit e43430b63821eeea9d5e0c0044e537132b9c8b35 Author: Jan Beich AuthorDate: 2023-04-15 18:49:18 +0000 Commit: Jan Beich CommitDate: 2023-04-15 19:14:15 +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 (cherry picked from commit 9e6312e21dc41631d22fbeaf6ec62d86d022db5d) --- 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