From nobody Mon Feb 05 19:56:24 2024 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 4TTHFN6fJMz58t8N; Mon, 5 Feb 2024 19:56:24 +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 4TTHFN4fPCz4lX3; Mon, 5 Feb 2024 19:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707162984; 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=PjT0OkN98vhEtAi/RSq3EU7qZ5NkD4m/qrKdGsgt6jQ=; b=NTyoZzDRCJSBcux3vjW6zjLyOT430b+/EcHIBdEatxZOBsGsz2MgMWMqEfXS88ekRMN/cb f/LBHDWefUWt8274Q3+CDNo9JNcNDI4vd6l9N5eb95eo2TXm+1Fhl908ovRZhU3qufY9Fv JsCRZ90mmyPZ5kME6wFvj1KNjDYo0zKXvvvDhLnP9YMvdTtrRT0sdIBV7FX9N7irbfAt5t rNZby536g8A/5qZmuX/mrCO1evsSlaflmdOG4YnTwNzNyBHlrTEduO3RdDljYIm5UpX/qg WqomcGozX/MT/l6ucaGMTI6esYSKqCbSXilKYaHbDz1QsZAq8QKId264zeqpFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707162984; 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=PjT0OkN98vhEtAi/RSq3EU7qZ5NkD4m/qrKdGsgt6jQ=; b=VFBGiog+twh/x17yb0eukmLj0wouCTESSprsqryd7kwkCB88wDZ0R4UkW/cHKj0h2jdArK monDGHdgZdEqZup2vF1qRszr+UOgZ/wudfZ8FGpcc04VMVW73p/UfNhoRkBFLPat1I3iNo zJeAmAaq5SepWGHD0/EugCyv31K4DOjZo/aeiRR1vpnSwwpLkPPJji7YMM9wxUMO6YK4NW Nu7SpjOtJSY53NtmODFZBZP3PqNlJ/4Q9godyzTO8yOEdZ3qIlyAVCtYnCPgZlciOLD3bs m+36YtdhEPyjQtwI/RR6QDbyxpKx7Pvkk1mx6jBlYXQl+ImbjVpe6m0SUG/iyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707162984; a=rsa-sha256; cv=none; b=PYqublKmhpRmOPJ5k3LDdhTWLGURq7dkCgvGkaXXdeWVtdEn1sHWP4/ChG9fyXwUlse1AW 7oG1mag0O0Fc6egfDZPBdIJfnPa6kSWq14BMUEdoLTpDzHcn+de8k/SFmFwcff7auV6b5s 8zSKs20jOpA9TRjOEr/Bkt5KG+/FccPZjCwxMIoDUg/MkMqnEsvXM6PHciFI2PxqebApmK BVIBuxXlFjyLfPLhlJTP9Qc/NJ/T4o13n7TMYR5dfknwlBLcvRUjJFvd78qdlzCql7VMvI KkS8uxtrYebWmPySwF9UtxpOOpkoKLY4wgTEsL2e5+OqLn42VMiWxASZiKFUyQ== 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 4TTHFN3k5nztjb; Mon, 5 Feb 2024 19:56:24 +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 415JuOQ3000607; Mon, 5 Feb 2024 19:56:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415JuOqj000604; Mon, 5 Feb 2024 19:56:24 GMT (envelope-from git) Date: Mon, 5 Feb 2024 19:56:24 GMT Message-Id: <202402051956.415JuOqj000604@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: 3a8517f68535 - main - x11-wm/hyprland: skip updating headers after 47721ef8e32b 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: 3a8517f68535b7c4f67f93c07dfeaa4eeaf41610 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a8517f68535b7c4f67f93c07dfeaa4eeaf41610 commit 3a8517f68535b7c4f67f93c07dfeaa4eeaf41610 Author: Jan Beich AuthorDate: 2024-02-05 19:15:50 +0000 Commit: Jan Beich CommitDate: 2024-02-05 19:55:48 +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 --- 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 80b64433494e..ccf095e227d9 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -31,7 +31,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());