From 9f9849d7c89d6fc536096bf2e417677252acd913 Mon Sep 17 00:00:00 2001
From: will-cern <will@cern.ch>
Date: Thu, 28 May 2026 16:51:51 +0100
Subject: [PATCH 1/2] Update CMakeLists.txt - ensure ftgl patches are relative
 to correct directory

this fixes issue where the build dir is somewhere underneath a git repo, which affects `git apply` behaviour
---
 builtins/ftgl/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtins/ftgl/CMakeLists.txt b/builtins/ftgl/CMakeLists.txt
index 1c06846261b84..c49f77b126f41 100644
--- a/builtins/ftgl/CMakeLists.txt
+++ b/builtins/ftgl/CMakeLists.txt
@@ -28,7 +28,7 @@ if (NOT DEFINED GIT_EXECUTABLE)
 endif()
 
 if(NOT EXISTS "${ROOT_FTGL_PREFIX}/src/BUILTIN_FTGL/._patched")
-  set(ROOT_FTGL_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace
+  set(ROOT_FTGL_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} init COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace
                 ${ROOT_FTGL_PATCH_FILE_1}
                 ${ROOT_FTGL_PATCH_FILE_2}
                 ${ROOT_FTGL_PATCH_FILE_3}

From f5d4b9067f88db0c1f643a01b12d3c511b2f7359 Mon Sep 17 00:00:00 2001
From: will-cern <will@cern.ch>
Date: Fri, 29 May 2026 09:44:58 +0100
Subject: [PATCH 2/2] git init before apply patches, to ensure are relative to
 the correct dir

---
 builtins/cfitsio/CMakeLists.txt | 2 +-
 builtins/gl2ps/CMakeLists.txt   | 2 +-
 builtins/libgif/CMakeLists.txt  | 2 +-
 builtins/xxhash/CMakeLists.txt  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builtins/cfitsio/CMakeLists.txt b/builtins/cfitsio/CMakeLists.txt
index d1f46267a8d8c..37a42d1c0056e 100644
--- a/builtins/cfitsio/CMakeLists.txt
+++ b/builtins/cfitsio/CMakeLists.txt
@@ -27,7 +27,7 @@ if(WIN32)
 endif()
 
 if(NOT EXISTS "${CFITSIO_PREFIX}/src/BUILTIN_CFITSIO/._patched")
-  set(CFITSIO_PATCH_COMMAND PATCH_COMMAND git apply ${patch_args}
+  set(CFITSIO_PATCH_COMMAND PATCH_COMMAND git init COMMAND git apply ${patch_args}
                 ${CMAKE_CURRENT_SOURCE_DIR}/cfitsio-no-find-zlib.diff
                 ${CMAKE_CURRENT_SOURCE_DIR}/no-fortran-wrapper.diff
                 ${CMAKE_CURRENT_SOURCE_DIR}/cfitsio-marker.diff)
diff --git a/builtins/gl2ps/CMakeLists.txt b/builtins/gl2ps/CMakeLists.txt
index ed54a1a711b9d..72ee0381c450d 100644
--- a/builtins/gl2ps/CMakeLists.txt
+++ b/builtins/gl2ps/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 
 # check if the patch has already been applied
 if(NOT EXISTS "${ROOT_GL2PS_PREFIX}/src/BUILTIN_GL2PS/._patched")
-  set(GL2PS_PATCH_COMMAND PATCH_COMMAND git apply ${patch_args} ${ROOT_GL2PS_PATCH_FILES})
+  set(GL2PS_PATCH_COMMAND PATCH_COMMAND git init COMMAND git apply ${patch_args} ${ROOT_GL2PS_PATCH_FILES})
 endif()
 
 ExternalProject_Add(
diff --git a/builtins/libgif/CMakeLists.txt b/builtins/libgif/CMakeLists.txt
index 9d2ad00fe748b..a9ad0531f7c18 100644
--- a/builtins/libgif/CMakeLists.txt
+++ b/builtins/libgif/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
 
 # check if the patch has already been applied
 if(NOT EXISTS "${ROOT_LIBGIF_PREFIX}/src/BUILTIN_LIBGIF/CMakeLists.txt")
-  set(LIBGIF_PATCH_COMMAND PATCH_COMMAND git apply ${patch_args} ${ROOT_LIBGIF_PATCH_FILE})
+  set(LIBGIF_PATCH_COMMAND PATCH_COMMAND git init COMMAND git apply ${patch_args} ${ROOT_LIBGIF_PATCH_FILE})
 endif()
 
 ExternalProject_Add(
diff --git a/builtins/xxhash/CMakeLists.txt b/builtins/xxhash/CMakeLists.txt
index e1eab188f9ece..8cead531279b5 100644
--- a/builtins/xxhash/CMakeLists.txt
+++ b/builtins/xxhash/CMakeLists.txt
@@ -20,7 +20,7 @@ if (NOT DEFINED GIT_EXECUTABLE)
 endif()
 # check if the patch has already been applied
 if(NOT EXISTS "${ROOT_XXHASH_PREFIX}/src/BUILTIN_XXHASH/CMakeLists.txt")
-  set(XXHASH_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace ${ROOT_XXHASH_PATCH_FILE})
+  set(XXHASH_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} init COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace ${ROOT_XXHASH_PATCH_FILE})
 endif()
 
 set(ROOT_XXHASH_LIBRARY ${ROOT_XXHASH_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}xxhash${CMAKE_STATIC_LIBRARY_SUFFIX})