From ff03947ba0aab28c8fadfef70d34c6b6f49408ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Kryger?= <pkryger@gmail.com>
Date: Wed, 23 Oct 2024 16:51:01 +0100
Subject: [PATCH] Use @@HOMEBREW_PREFIX@@ for replacements in external patches

---
 Library/Homebrew/patch.rb                                  | 2 +-
 Library/Homebrew/test/patching_spec.rb                     | 2 +-
 Library/Homebrew/test/support/fixtures/patches/noop-d.diff | 2 +-
 Library/Homebrew/test/support/lib/startup/config.rb        | 2 +-
 docs/Formula-Cookbook.md                                   | 4 +++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/patch.rb b/Library/Homebrew/patch.rb
index 510f4e0f9a216..488982bf8eaec 100644
--- a/Library/Homebrew/patch.rb
+++ b/Library/Homebrew/patch.rb
@@ -142,7 +142,7 @@ def apply
           patch_file = patch_dir/patch_file
           Utils.safe_popen_write("patch", "-g", "0", "-f", "-#{strip}") do |p|
             File.foreach(patch_file) do |line|
-              data = line.gsub("HOMEBREW_PREFIX", HOMEBREW_PREFIX)
+              data = line.gsub("@@HOMEBREW_PREFIX@@", HOMEBREW_PREFIX)
               p.write(data)
             end
           end
diff --git a/Library/Homebrew/test/patching_spec.rb b/Library/Homebrew/test/patching_spec.rb
index d4314021d59b1..c4818cc250928 100644
--- a/Library/Homebrew/test/patching_spec.rb
+++ b/Library/Homebrew/test/patching_spec.rb
@@ -47,7 +47,7 @@ def formula(name = "formula_name", path: Formulary.core_path(name), spec: :stabl
         formula.patch
         s = File.read("libexec/NOOP")
         expect(s).not_to include("NOOP"), "libexec/NOOP was not patched as expected"
-        expect(s).not_to include("HOMEBREW_PREFIX"), "libexec/NOOP was not patched as expected"
+        expect(s).not_to include("@@HOMEBREW_PREFIX@@"), "libexec/NOOP was not patched as expected"
         expect(s).to include(HOMEBREW_PREFIX.to_s), "libexec/NOOP was not patched as expected"
       end
     end
diff --git a/Library/Homebrew/test/support/fixtures/patches/noop-d.diff b/Library/Homebrew/test/support/fixtures/patches/noop-d.diff
index d83a684fe5d1e..5c40b3a7eabd7 100644
--- a/Library/Homebrew/test/support/fixtures/patches/noop-d.diff
+++ b/Library/Homebrew/test/support/fixtures/patches/noop-d.diff
@@ -6,5 +6,5 @@ index bfdda4c..e08d8f4 100755
  #!/bin/bash
 -echo NOOP
 \ No newline at end of file
-+echo HOMEBREW_PREFIX
++echo @@HOMEBREW_PREFIX@@
 \ No newline at end of file
diff --git a/Library/Homebrew/test/support/lib/startup/config.rb b/Library/Homebrew/test/support/lib/startup/config.rb
index 0b64947dd9609..a5c858723bceb 100644
--- a/Library/Homebrew/test/support/lib/startup/config.rb
+++ b/Library/Homebrew/test/support/lib/startup/config.rb
@@ -47,6 +47,6 @@
 TESTBALL_PATCHES_SHA256 = "799c2d551ac5c3a5759bea7796631a7906a6a24435b52261a317133a0bfb34d9"
 PATCH_A_SHA256 = "83404f4936d3257e65f176c4ffb5a5b8d6edd644a21c8d8dcc73e22a6d28fcfa"
 PATCH_B_SHA256 = "57958271bb802a59452d0816e0670d16c8b70bdf6530bcf6f78726489ad89b90"
-PATCH_D_SHA256 = "29946529088576919b0a56146c346e63692832ab3568cc34fed647c3e4dc2072"
+PATCH_D_SHA256 = "07c72c4463339e6e2ce235f3b26e316d4940017bf4b5236e27e757a44d67636c"
 
 TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md
index a4073ab4ae8f7..b62706023446d 100644
--- a/docs/Formula-Cookbook.md
+++ b/docs/Formula-Cookbook.md
@@ -639,7 +639,9 @@ Patches can also be embedded by passing a string. This makes it possible to prov
 patch :p0, "..."
 ```
 
-In patches, the string "HOMEBREW\_PREFIX" is replaced with the value of the constant `HOMEBREW_PREFIX` before the patch is applied.
+In embedded patches, the string "HOMEBREW\_PREFIX" is replaced with the value of the constant `HOMEBREW_PREFIX` before the patch is applied.
+
+In external patches, the string "@@HOMEBREW\_PREFIX@@" is replaced with the value of the constant `HOMEBREW_PREFIX` before the patch is applied.
 
 ### Creating the diff