From nobody Wed Nov 08 02:07:05 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 4SQ7kd4pPXz508vG; Wed, 8 Nov 2023 02:07:05 +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 4SQ7kd36Hqz3fCp; Wed, 8 Nov 2023 02:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699409225; 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=CU9E2i764jfLCJ+vU1IITPbswH+rKahBsE1oU8YupnA=; b=IFvESeSLQaGK4l14p8Tlb6DQJswImyj8QBVkCd02m74phShJX0ESMtQdlRPApBIoyXUKYt nNFFS2v60lnkTANJbQpbYWnhc0wo48Zf/oRRkEkNtWWYKCnCF/55XCpc2rC4WDijCysthj ltRk8+NcozHFDJqo4PwceCBRfxeJQbPihZY637xtUfqWK0gHMJprQOx5Ccyv6WVkRKBVyY 1MYca24zDeO7S2ZT+f/t0mdlE0SAZAfhYO1GGDXF2YnZtf0e6oHl2XV/v6g6dCqYaEonv+ HpCTBzhQtePXHlr67J9EIQHLM8ou8xzhOOArSsPKYXrbbQsueIgpAgQkM0vzeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699409225; 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=CU9E2i764jfLCJ+vU1IITPbswH+rKahBsE1oU8YupnA=; b=tBc0g3O64d3SdSG/32VGO8bmXPXyJTrzx1WV3y5WVVe66vMjeyYGnCl67kiUm9AKCMKed7 kMnFP8hgMeO5yFi4ZHjFFmYfAK6qT6krcCXISHrAmD5RvUZyqDQKraQIXxYkGz1t8hWafi 87VvMrxPKPl5Z/wuVjJy6zd84/hAZHT4hqTJm/y0i4dc6phRjrS5ixzphDUKnfJQoTCaFC 2O57xiLmRuQ8VrwWwM5+VPzceYvoBkHX0je6JXC+7PzcR0w24VjCXYAHAakyNdYrwzxzag 1+DRPEMfyxYDLuUHdY9t1GUEu59nI1XVMc87kCPoxM/Gb6X8jZse9qHyZr/PjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699409225; a=rsa-sha256; cv=none; b=DhyiCZw+6qsj2zqgdfAxw3KkBR0eN+ofBEWSUw1G39VYBmyUM5L9o+TOhjje03HaSNXKUb LTlj+4Y5FmtbSPBLdzyW8qkNoE2GjMRxsRgIDO+y6pFw/NOltt/4U9OJ4Ys5TvCGeJVLXF oOJB/SwKAs8/KpY5z1+pkYg1h3Nf7iNqulY3tn4neQnbaRuRG33QW7mUFDlDdtRs7L8UqK Z53ILDU7+fOjCQM/0ltEEqdvALM+cfZKOqwalsiC458y6LvEEBjMaJXrMwMzj5qi12wpwy PSTOyJXg6Z2d3iBE65qX0mcmRXyX14XEOLLUGf0IYUNdNLHPuMg3tIjySpjcvQ== 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 4SQ7kd1vkBzZx; Wed, 8 Nov 2023 02:07:05 +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 3A8275Dq006332; Wed, 8 Nov 2023 02:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8275XC006329; Wed, 8 Nov 2023 02:07:05 GMT (envelope-from git) Date: Wed, 8 Nov 2023 02:07:05 GMT Message-Id: <202311080207.3A8275XC006329@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: 7aa2fa7a427f - 2023Q4 - x11-wm/hyprland: unbreak after 239d3a1840f0 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 7aa2fa7a427f04f0c1b9915ec2ba301da80c0725 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7aa2fa7a427f04f0c1b9915ec2ba301da80c0725 commit 7aa2fa7a427f04f0c1b9915ec2ba301da80c0725 Author: Jan Beich AuthorDate: 2023-10-25 12:51:36 +0000 Commit: Jan Beich CommitDate: 2023-11-08 02:06:55 +0000 x11-wm/hyprland: unbreak after 239d3a1840f0 (cherry picked from commit 1adefe1cc7d6aee16781ff36ad2dde08823f706c) --- x11-wm/hyprland/Makefile | 13 +++++++++++-- x11-wm/hyprland/distinfo | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 8b0f71d4db69..a86c1975cebd 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,10 +1,12 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.31.0 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 913c8b81ad44.patch:-p1 # https://github.com/hyprwm/Hyprland/pull/3589 +PATCHFILES+= df00727310b8.patch:-p1 # wlroots 0.17 MAINTAINER= jbeich@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' @@ -13,13 +15,12 @@ WWW= https://hyprland.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build after https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/a289f812d620 BROKEN_FreeBSD_12= libc++ too old BUILD_DEPENDS= cmake:devel/cmake-core \ evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.25:graphics/wayland-protocols \ - wlroots>=0.16.0.739<0.17.0:x11-toolkits/wlroots + wlroots>=0.16.0.791<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ @@ -47,6 +48,14 @@ OPTIONS_DEFAULT=X11 X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland +post-extract: +.if defined(PATCHFILES) && ${PATCHFILES:Mdf00727310b8*} +# Pretend to be a regular file for vendor patch to apply as is + @${RMDIR} ${WRKSRC}/subprojects/wlroots + @${ECHO_CMD} "Subproject commit 3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc" \ + >${WRKSRC}/subprojects/wlroots +.endif + post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e "/GIT_BRANCH/s/run_command.*/'main'/" \ diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index daa3d5515a05..28e0e49d9f25 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -9,3 +9,5 @@ SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 SHA256 (913c8b81ad44.patch) = 13a150ee6cb0ee7c22b98946deae44cbbec23e642ab7c574514548641486e258 SIZE (913c8b81ad44.patch) = 1725 +SHA256 (df00727310b8.patch) = 0800ebe83c5265e888cd6f9bb5b6fc4231dfabf36c21d1236a81efbede702f64 +SIZE (df00727310b8.patch) = 5178