From nobody Wed Aug 28 10:32:15 2024 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 4Wv11q6yZRz5T0Z4; Wed, 28 Aug 2024 10:32:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wv11q5ryGz3wZs; Wed, 28 Aug 2024 10:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724841135; 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=fER45XyB54GhlTLn6eDRCPrN4CcEd8CbK1LKCx7fTOU=; b=mDctFzpEJMFue1TzPhaC9mhVOsB3E9tObrvjf5pPUKL+mEjnHJSN3zJi0Q7GbH7nqhy29Q InA5/5Bl87DIe40PLjawESZGxJYoagA+agnTOuMQy5ZH4hz7TVIDInSLLirlYTii/y4yaN 9IfCuKp5apKO4RhTJcH5LrZ8ibfiDntAYq5s5CYfIMCH8kJTtrMiv2F1JqWveqiLCZhhGK ++9QGknV60DBf0efJ/FNyJhxuPyR0iiz5NcMU3a8xUud4RDx9rwxwu7uevCxAR/hAR0joO rQwi/NF66/GRzyG+ATnc67msSyfpmmURB7Wr98NsadCOy6Bq+87Iv6P7cM98/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724841135; a=rsa-sha256; cv=none; b=dBQrKOHbEjDnx1Zy+8A1TgQZwWHuSjBsP//RB1oTPBZvS6rH843EC3G8UX988f2zAmSWW3 TbAfL7KDEpcJFz4epe4JVmYVVIUmt8viBipupVfEWcJwHjDokCwDYiF73fzNLSXFD43dAU dy3YokiKBrb2lwtYArirbrqWEceQpaA3wvqfe/X+a9hXorPg1SOiy9wCuo9+C1TEjaXifm h4qIJ6XSIllQoNaKqHuzXcNurNK5Na/pLNf0dMfEDLf+lCqx/+cSlBEDNwNclJPW/Rt92k TMnh7ZoDRmNTdMLDjpMkk1Zx/0Hx1mAMqdvJmCIypEDi8pMTiY3x4lPr4Pt78g== 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=1724841135; 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=fER45XyB54GhlTLn6eDRCPrN4CcEd8CbK1LKCx7fTOU=; b=gxoVKUCn6DBpINX3MMEgZfR119Xid5dnSYHN4zvCmxsABNr9EdXMYUH1cdlM8ciDskTBV9 JfcV3Oh1Aa6ZeZ1ku02fEpKvTkjv2i+5cFSxevC5Uh1iq0cG/jvl7MEJPTYXNBfcQqvvYJ SRWx54ZdsQx6RNgbzs4ANZjvZIoQ9JmAXuUsBDQyzPOYN6xqTPbkutv7auOZwwIZAYGKOJ 0FCokx8zQ4kcpoDmccDQWLDSFNzuEGt6FrajyoDv/UwtECY1D91t02NFnZoitjT3ESz2ch uqldTm/kjPxDRphgeYusfl1/ogHY9PkBXss+2Ei0pMDt6SLnkWd2L+b6BexELw== 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 4Wv11q5ShKzVym; Wed, 28 Aug 2024 10:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47SAWFdk071460; Wed, 28 Aug 2024 10:32:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47SAWFaE071457; Wed, 28 Aug 2024 10:32:15 GMT (envelope-from git) Date: Wed, 28 Aug 2024 10:32:15 GMT Message-Id: <202408281032.47SAWFaE071457@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Nagy Subject: git: 3b8a0e985946 - 2024Q3 - www/{*chromium,iridium}: revert hardcoded paths that sneaked in 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 3b8a0e985946a867277298c4fd7d5363f56bdfae Auto-Submitted: auto-generated The branch 2024Q3 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b8a0e985946a867277298c4fd7d5363f56bdfae commit 3b8a0e985946a867277298c4fd7d5363f56bdfae Author: Robert Nagy AuthorDate: 2024-08-28 10:30:18 +0000 Commit: Robert Nagy CommitDate: 2024-08-28 10:32:09 +0000 www/{*chromium,iridium}: revert hardcoded paths that sneaked in PR: 281104 (cherry picked from commit d0c3a2d4b6bfcdd482143cde1f7e459461482e40) --- www/chromium/files/patch-build_rust_rust__bindgen.gni | 6 +++--- www/iridium/files/patch-build_rust_rust__bindgen.gni | 6 +++--- www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/www/chromium/files/patch-build_rust_rust__bindgen.gni b/www/chromium/files/patch-build_rust_rust__bindgen.gni index 90a5d9c25aea..41ce8114edd8 100644 --- a/www/chromium/files/patch-build_rust_rust__bindgen.gni +++ b/www/chromium/files/patch-build_rust_rust__bindgen.gni @@ -1,11 +1,11 @@ ---- build/rust/rust_bindgen.gni.orig 2024-08-26 12:06:38 UTC +--- build/rust/rust_bindgen.gni.orig 2024-07-30 19:22:51 UTC +++ build/rust/rust_bindgen.gni @@ -11,14 +11,14 @@ if (is_win) { import("//build/toolchain/win/win_toolchain_data.gni") } -_bindgen_path = "${rust_bindgen_root}/bin/bindgen" -+_bindgen_path = "/usr/local/bin/bindgen" ++_bindgen_path = "${LOCALBASE}/bin/bindgen" if (host_os == "win") { _bindgen_path = "${_bindgen_path}.exe" } @@ -13,7 +13,7 @@ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in # ../lib. -_libclang_path = rust_bindgen_root -+_libclang_path = "/usr/local/llvm17" ++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" if (host_os == "win") { _libclang_path += "/bin" } else { diff --git a/www/iridium/files/patch-build_rust_rust__bindgen.gni b/www/iridium/files/patch-build_rust_rust__bindgen.gni index 75676be2d39c..e0d9446aeb7b 100644 --- a/www/iridium/files/patch-build_rust_rust__bindgen.gni +++ b/www/iridium/files/patch-build_rust_rust__bindgen.gni @@ -1,11 +1,11 @@ ---- build/rust/rust_bindgen.gni.orig 2024-08-27 06:28:16 UTC +--- build/rust/rust_bindgen.gni.orig 2024-08-01 05:47:53 UTC +++ build/rust/rust_bindgen.gni @@ -11,14 +11,14 @@ if (is_win) { import("//build/toolchain/win/win_toolchain_data.gni") } -_bindgen_path = "${rust_bindgen_root}/bin/bindgen" -+_bindgen_path = "/usr/local/bin/bindgen" ++_bindgen_path = "${LOCALBASE}/bin/bindgen" if (host_os == "win") { _bindgen_path = "${_bindgen_path}.exe" } @@ -13,7 +13,7 @@ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in # ../lib. -_libclang_path = rust_bindgen_root -+_libclang_path = "/usr/local/llvm17" ++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" if (host_os == "win") { _libclang_path += "/bin" } else { diff --git a/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni index 54ae139bec4d..92cb9517d705 100644 --- a/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni +++ b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni @@ -1,11 +1,11 @@ ---- build/rust/rust_bindgen.gni.orig 2024-08-26 14:40:28 UTC +--- build/rust/rust_bindgen.gni.orig 2024-07-31 14:19:23 UTC +++ build/rust/rust_bindgen.gni @@ -11,14 +11,14 @@ if (is_win) { import("//build/toolchain/win/win_toolchain_data.gni") } -_bindgen_path = "${rust_bindgen_root}/bin/bindgen" -+_bindgen_path = "/usr/local/bin/bindgen" ++_bindgen_path = "${LOCALBASE}/bin/bindgen" if (host_os == "win") { _bindgen_path = "${_bindgen_path}.exe" } @@ -13,7 +13,7 @@ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in # ../lib. -_libclang_path = rust_bindgen_root -+_libclang_path = "/usr/local/llvm17" ++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" if (host_os == "win") { _libclang_path += "/bin" } else {