Fix libpng fails to build with awk on path

.github/workflows/ci.yml

@@ -83,17 +83,8 @@ jobs:
  - name: Install dependencies
  run: |
  pip install tox tox-gh-actions
- # Temporarily move the preinstalled git, it causes errors related to cygwin.
- - name: Move git binary
- run: |
- Move-Item "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
- Move-Item "C:\Program Files\Git\bin" "C:\Program Files\Git\notbin"
  - name: Test with tox
  run: tox
- - name: Restore git binary
- run: |
- Move-Item "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
- Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
 
  build:
  needs: lint
@@ -131,11 +122,6 @@ jobs:
  poetry config virtualenvs.in-project true
  - name: Install Python Dependencies
  run: poetry install
- # Temporarily move the preinstalled git, it causes errors related to cygwin.
- - name: Move git binary
- run: |
- Move-Item "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
- Move-Item "C:\Program Files\Git\bin" "C:\Program Files\Git\notbin"
  - name: Build GTK3
  if: matrix.gtk-version == '3'
  run: >
@@ -146,10 +132,6 @@ jobs:
  run: > # Use -j2 option to prevent out of memory errors with GitHub Action runners
  poetry run gvsbuild build --ninja-opts -j2 --enable-gi --py-wheel gobject-introspection
  gtk4 libadwaita gtksourceview5 pygobject pycairo adwaita-icon-theme
- - name: Restore git binary
- run: |
- Move-Item "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
- Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
  - name: Copy wheel files
  if: github.event_name == 'release'
  run: |

gvsbuild/patches/libpng/001-fix-gawk-error.patch

@@ -0,0 +1,67 @@
+From 9353f26c41aec8d3cab04c63722c51c1a03c2d7c Mon Sep 17 00:00:00 2001
+From: Dan Rosser <[email protected]>
+Date: Fri, 16 Feb 2024 12:17:53 +1100
+Subject: [PATCH] CMake fix issues related to folder change for cmake.in
+
+---
+ CMakeLists.txt | 14 +++++++-------
+ scripts/cmake/genchk.cmake.in | 3 ++-
+ 2 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8bff18ff6e..112f05afe0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -386,7 +386,7 @@ else()
+ COMMAND "${CMAKE_COMMAND}"
+ "-DINPUT=${_GC_INPUT}"
+ "-DOUTPUT=${_GC_OUTPUT}"
+- -P "${CMAKE_CURRENT_BINARY_DIR}/genchk.cmake"
++ -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/genchk.cmake"
+ DEPENDS "${_GC_INPUT}" ${_GC_DEPENDS}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+ endfunction()
+@@ -409,7 +409,7 @@ else()
+ COMMAND "${CMAKE_COMMAND}"
+ "-DINPUT=${_GO_INPUT}"
+ "-DOUTPUT=${_GO_OUTPUT}"
+- -P "${CMAKE_CURRENT_BINARY_DIR}/genout.cmake"
++ -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/genout.cmake"
+ DEPENDS "${_GO_INPUT}" ${_GO_DEPENDS}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+ endfunction()
+@@ -428,7 +428,7 @@ else()
+ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_GSO_OUTPUT}"
+ COMMAND "${CMAKE_COMMAND}"
+ "-DOUTPUT=${_GSO_OUTPUT}"
+- -P "${CMAKE_CURRENT_BINARY_DIR}/gensrc.cmake"
++ -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/gensrc.cmake"
+ DEPENDS ${_GSO_DEPENDS}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+ endfunction()
+@@ -558,7 +558,7 @@ else()
+ add_custom_target(png_genprebuilt
+ COMMAND "${CMAKE_COMMAND}"
+ "-DOUTPUT=scripts/pnglibconf.h.prebuilt"
+- -P "${CMAKE_CURRENT_BINARY_DIR}/gensrc.cmake"
++ -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/gensrc.cmake"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+
+ # A single target handles generation of all generated files.
+@@ -1002,13 +1002,13 @@ endfunction()
+
+ # Create source generation scripts.
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/genchk.cmake.in
+- ${CMAKE_CURRENT_BINARY_DIR}/genchk.cmake
++ ${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/genchk.cmake
+ @ONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/genout.cmake.in
+- ${CMAKE_CURRENT_BINARY_DIR}/genout.cmake
++ ${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/genout.cmake
+ @ONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/gensrc.cmake.in
+- ${CMAKE_CURRENT_BINARY_DIR}/gensrc.cmake
++ ${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/gensrc.cmake
+ @ONLY)
+
+ # libpng is a library so default to 'lib'