From nobody Mon Feb 05 19:56:53 2024 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 4TTHFx4GNPz58t8R; Mon, 5 Feb 2024 19:56:53 +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 4TTHFx3mdQz4lVN; Mon, 5 Feb 2024 19:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707163013; 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=lhHuP1Qyh3XGyYE/bmtcOjvPbwf/h9VC+mGqNF5phVQ=; b=YYA0LFOnv11OC+KFBQ2GAp8pRUvHtwFfYRVnCHzyp30z5oMtVcVukZBHRlwYDJ7I+y/5sg 11Yh0JsfMsqTHXebqLrXROsSSVRYlJR65NDZsqC+hw6KEr6RM7lShwXg2DH0NaPfhQGEas s/O/6vzA2P8A6a2So+nSQcbClcbzaEvlcTZ7EVDpGa2/pCFW8DV7R4Mm21+Kz8QgcDNZKn FaIkJFFzGfKm2R1z1cdyKKLzOsSWCa3dyndm0HtDpOCPHn3ZYQ2B5HmxFAcKMR3HwK1ab2 O4KJMlVjxupuB48siOQcQfUwHyDtFqQdbU+ghOKBINZsQ96y5i0Uhxu65g8ulQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707163013; 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=lhHuP1Qyh3XGyYE/bmtcOjvPbwf/h9VC+mGqNF5phVQ=; b=m0qz6WMnn/HDFM9cvmGoOcFGG0k7Ih8LBryxnazstENVfHOUlRZg1jgeXNrFwKw4LElIG9 heegZjsechyBsKVhU+47x66q7c4KILEyNUsTKskHVNgL4t8DkdTyONe/SfN5Cccqv0+WQ9 zEI1iJBiPF+aX8mxrL7aWWLRjDssXo9uID0T/0Fm7dH8xix0pHU83PTmGzqIalnPtYVLk3 r+KLslgwyGYHMp6SmRkMXjpAqiukKvghoG39RmBN4f5UsR74ZmK6knELN4opJgTpernt1X 7DWUptQPXOf77SdtFc6SDELCe09dvi0cfE0qXu4pd0zXtnjxfmXArWMHTFET7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707163013; a=rsa-sha256; cv=none; b=kS55Hg6F1tHfqSuVOyiB0rX2s9Tm/UGaNBiO6dLXSOSVwDCT2zuIFPj+eLAMuEiOoYcYRJ Lyl23MeWZaMv+bnXmTxyuMwKvva3+1jZita36lQTi+bMQ7sEzThkIQY8BBZ+iK5GcF9/qy Y+SiD1h46dWjjDNmzWymkpQNdjjJGnh2c3y//dH5YmEQMXn6sAqlqDPLiLvmp8xJFFUy8c V6RiYkcdJBVbWxrqiTaY74VtAO9UnznuV/Fy5fOr/6mCKedphJg/YHgZL3B7f+hSDi1sJJ rSCQ/8Tv99QdBNCaVa807sT1sR2l5V1gR8Ml5/mwy2mXBP5ojk56S3ChxndKZw== 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 4TTHFx2qJZztmt; Mon, 5 Feb 2024 19:56:53 +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 415Jur3M000801; Mon, 5 Feb 2024 19:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415JurRb000798; Mon, 5 Feb 2024 19:56:53 GMT (envelope-from git) Date: Mon, 5 Feb 2024 19:56:53 GMT Message-Id: <202402051956.415JurRb000798@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: 5afc9718499d - 2024Q1 - x11-wm/hyprland: skip updating headers after 47721ef8e32b 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/2024Q1 X-Git-Reftype: branch X-Git-Commit: 5afc9718499d1a40bd57d57db49d54087db2c2f3 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5afc9718499d1a40bd57d57db49d54087db2c2f3 commit 5afc9718499d1a40bd57d57db49d54087db2c2f3 Author: Jan Beich AuthorDate: 2024-02-05 19:15:50 +0000 Commit: Jan Beich CommitDate: 2024-02-05 19:56:32 +0000 x11-wm/hyprland: skip updating headers after 47721ef8e32b - Avoid ABI mismatch between bundled and system wlroots - Building Hyprland on FreeBSD outside of ports/ may fail Disables https://github.com/hyprwm/Hyprland/commit/3656045ad887 (cherry picked from commit 3a8517f68535b7c4f67f93c07dfeaa4eeaf41610) --- x11-wm/hyprland/Makefile | 2 +- x11-wm/hyprland/files/patch-system-wlroots | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 58a69b8474a0..a6eead093521 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -32,7 +32,7 @@ GH_TUPLE= hyprwm:hyprland-protocols:v0.2-4-g0c2ce70:hyprland_protocols/subprojec canihavesomecoffee:udis86:1.7.2-186-g5336633:udis86/subprojects/udis86 MESON_ARGS= -Dsystemd=disabled -# Generated by "make update-hash" for "hyprpm update" (headersValid) +# Generated by "make update-hash" for commit_pins in hyprpm.toml GH_HASH= 84ab8d11e8951a6551d1e1bf87796a8589da6d47 # XXX Drop after FreeBSD 14.0 EOL around 2025-03-01 diff --git a/x11-wm/hyprland/files/patch-system-wlroots b/x11-wm/hyprland/files/patch-system-wlroots index 8eed6a0decae..1373e3aff497 100644 --- a/x11-wm/hyprland/files/patch-system-wlroots +++ b/x11-wm/hyprland/files/patch-system-wlroots @@ -24,3 +24,15 @@ Allow system wlroots to reduce maintenance (wlroots has tons of options) dependency('cairo'), dependency('libdrm'), dependency('egl'), +--- hyprpm/src/core/PluginManager.cpp.orig 2024-02-05 01:59:02 UTC ++++ hyprpm/src/core/PluginManager.cpp +@@ -285,9 +285,6 @@ eHeadersErrors CPluginManager::headersValid() { + eHeadersErrors CPluginManager::headersValid() { + const auto HLVER = getHyprlandVersion(); + +- if (!std::filesystem::exists(DataState::getHeadersPath() + "/share/pkgconfig/hyprland.pc")) +- return HEADERS_MISSING; +- + // find headers commit + std::string cmd = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkg-config --cflags --keep-system-cflags hyprland", DataState::getHeadersPath()); + auto headers = execAndGet(cmd.c_str());