From nobody Fri Mar 01 22:07:49 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 4TmhzT2kCCz5D8Mg; Fri, 1 Mar 2024 22:07:49 +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 4TmhzT1mmnz48vV; Fri, 1 Mar 2024 22:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709330869; 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=I9mNRhOWZosOI5R5Z5lvhZmhUStM0yV0M/M1VEKOILA=; b=dg2fAbzfNYkTAR9ZOnx5MbMf5H+w3yq6oeIz9SAmi6zjiPyic+NW78869R1iSquQoFB6Br K/GiwSCWZWD9evBbKUs9odP7Mbc7W3AgTjQdyRft5OXBA2eTd+jvZrzj6Irh5Vv6GqK6aE 6kJ8ah59FbxQibNYedfew56Ly252YxQRJBwRey9iM9B3gKK7ytSye5khXAk4Pgpc52QzT0 ckMo729w3WXjF2VIf1bvY4tExEXHrNRzd/rIrpHSDZdpkTtolYm0v5uOq9de2Ng33mIqyk /s6D9ecV6SLTMmXrijW7dSBobYIlxS7bwXUPqz7KwV9MKRfJcrk2u0TpPxNY+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709330869; a=rsa-sha256; cv=none; b=EynGbVdMDvmAdrmbmwDx6VSOREPXsK5mcDy4j29M1WjUOWddR8g9N4XKUIX/Uli6Vp1INf JOc+0AYx1lBiAUlP4PS16tTk+bkyA3FIvhqv+EB8IEiTpc0bFz2I9g5H93tNr68f9ugun+ 4os7MQGqzOkSe67C4hQYvuivyJfxVirEEWtYBVxQUckd3DXzk8jkmurwQfUA+2cRzKxJRO lX8AVvQ+VpNxyAU+U2rZ20E8BF6hoeBXte7nRkQf1wsfU5vmkqh/fsQ99FHB0xzVh5k8ZP 6n/yEG5i+Iaw7ZXrTZDKjl6Qptru2uootqugDlFUfKlD0lrq4IVsJZgJfi5Kgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709330869; 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=I9mNRhOWZosOI5R5Z5lvhZmhUStM0yV0M/M1VEKOILA=; b=fX7KhL5sTTj4ZNcKx5ZWiSitAcrPtvGWRNQfQ6mzK4VBLP7p1MNpeXJ3F0O/e9UVE+cqfz Tc4veyvED5FildKH5/tArnJjLM7BGsVbLlikOvJX5LrCCtk6Ik2rWjERKho63mO5usXmNN RN5Cs0+Zw5tA+2Rvl3bxPOUsF8WxIRUUOsTlLHDlulfBDH+tcobtDL7+DsPQrv6hXktLYv 5hHfYzaUwECLswcuciLdibcKqJqpybE5zcE0ZkU5s7htQEjGS4ThRqb5UKrbRvsWfX0ELX 26bFXXhaxTRUNDkpX3mCy7JgoKMoxgVo88RufHiXFbXQ++7OLbE+oVXSxOoUhA== 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 4TmhzT1N4TzkWb; Fri, 1 Mar 2024 22:07:49 +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 421M7n4L038052; Fri, 1 Mar 2024 22:07:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 421M7nT9038049; Fri, 1 Mar 2024 22:07:49 GMT (envelope-from git) Date: Fri, 1 Mar 2024 22:07:49 GMT Message-Id: <202403012207.421M7nT9038049@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: 1f50359f9cfb - main - x11-wm/hyprland: unbreak headers skip after 5b4195285473 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: 1f50359f9cfba875d45c32bbfced08f5968706a2 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f50359f9cfba875d45c32bbfced08f5968706a2 commit 1f50359f9cfba875d45c32bbfced08f5968706a2 Author: Jan Beich AuthorDate: 2024-03-01 22:01:49 +0000 Commit: Jan Beich CommitDate: 2024-03-01 22:06:34 +0000 x11-wm/hyprland: unbreak headers skip after 5b4195285473 $ hyprpm add [...] Headers corrupted. Please run hyprpm update to fix those. See also: 3a8517f68535 --- x11-wm/hyprland/files/patch-system-wlroots | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/x11-wm/hyprland/files/patch-system-wlroots b/x11-wm/hyprland/files/patch-system-wlroots index d466167166bd..cdd4e4d97185 100644 --- a/x11-wm/hyprland/files/patch-system-wlroots +++ b/x11-wm/hyprland/files/patch-system-wlroots @@ -36,3 +36,12 @@ Allow system wlroots to reduce maintenance (wlroots has tons of options) // 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()); +@@ -307,7 +304,7 @@ eHeadersErrors CPluginManager::headersValid() { + else + headers = ""; + +- if (PATH.ends_with("protocols") || PATH.ends_with("wlroots")) ++ if (PATH.ends_with("protocols") || PATH.contains("wlroots")) + continue; + + verHeader = removeBeginEndSpacesTabs(PATH.substr(2)) + "/hyprland/src/version.h";