[vcpkg] fatal_error when patch fails to apply (#8087)

vcpkg will now fail on failure to apply patches except when using `--head`.

3 files changed, 74 insertions, 74 deletions

diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL
index fbcc3f536..d350c7fc4 100644
--- a/ports/fontconfig/CONTROL
+++ b/ports/fontconfig/CONTROL
@@ -1,5 +1,5 @@
-Source: fontconfig

-Version: 2.12.4-9

-Homepage: https://www.freedesktop.org/software/fontconfig/front.html

-Description: Library for configuring and customizing font access.

-Build-Depends: freetype, expat, libiconv, dirent

+Source: fontconfig
+Version: 2.12.4-10
+Homepage: https://www.freedesktop.org/software/fontconfig/front.html
+Description: Library for configuring and customizing font access.
+Build-Depends: freetype, expat, libiconv, dirent
diff --git a/ports/fontconfig/fcobjtypehash.patch b/ports/fontconfig/fcobjtypehash.patch
index bf86ca3b0..e0db68942 100644
--- a/ports/fontconfig/fcobjtypehash.patch
+++ b/ports/fontconfig/fcobjtypehash.patch
@@ -1,18 +1,18 @@
-diff --git a/src/fcobjs.c b/src/fcobjs.c

-index 33bba8d..e6b0808 100644

---- a/src/fcobjs.c

-+++ b/src/fcobjs.c

-@@ -24,11 +24,13 @@

- 

- #include "fcint.h"

- 

-+#if 0

- static unsigned int

- FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);

- 

- static const struct FcObjectTypeInfo *

- FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);

-+#endif

- 

- #include "fcobjshash.h"

- 

+diff --git a/src/fcobjs.c b/src/fcobjs.c
+index 33bba8d..e6b0808 100644
+--- a/src/fcobjs.c
++++ b/src/fcobjs.c
+@@ -24,11 +24,13 @@
+ 
+ #include "fcint.h"
+ 
++#if 0
+ static unsigned int
+ FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
+ 
+ static const struct FcObjectTypeInfo *
+ FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
++#endif
+ 
+ #include "fcobjshash.h"
+ 
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
index 772e741fd..db7692779 100644
--- a/ports/fontconfig/portfile.cmake
+++ b/ports/fontconfig/portfile.cmake
@@ -1,51 +1,51 @@
-

-include(vcpkg_common_functions)

-

-set(FONTCONFIG_VERSION 2.12.4)

-vcpkg_download_distfile(ARCHIVE

-    URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz"

-    FILENAME "fontconfig-${FONTCONFIG_VERSION}.tar.gz"

-    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d

-)

-

-vcpkg_extract_source_archive_ex(

-    OUT_SOURCE_PATH SOURCE_PATH

-    ARCHIVE ${ARCHIVE}

-    REF ${FONTCONFIG_VERSION}

-    PATCHES fcobjtypehash.patch

-)

-

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

-

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

-    OPTIONS

-        -DFC_INCLUDE_DIR=${CMAKE_CURRENT_LIST_DIR}/include

-    OPTIONS_DEBUG

-        -DFC_SKIP_TOOLS=ON

-        -DFC_SKIP_HEADERS=ON

-)

-

-vcpkg_install_cmake()

-

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-fontconfig TARGET_PATH share/unofficial-fontconfig)

-

-vcpkg_copy_pdbs()

-

-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

-    foreach(HEADER fcfreetype.h fontconfig.h)

-        file(READ ${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER} FC_HEADER)

-        if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

-            string(REPLACE "#define FcPublic" "#define FcPublic __declspec(dllimport)" FC_HEADER "${FC_HEADER}")

-        else()

-            string(REPLACE "#define FcPublic" "#define FcPublic __attribute__((visibility(\"default\")))" FC_HEADER "${FC_HEADER}")

-        endif()

-        file(WRITE ${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER} "${FC_HEADER}")

-    endforeach()

-endif()

-

-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fontconfig)

-file(RENAME ${CURRENT_PACKAGES_DIR}/share/fontconfig/COPYING ${CURRENT_PACKAGES_DIR}/share/fontconfig/copyright)

-

-vcpkg_test_cmake(PACKAGE_NAME unofficial-fontconfig)

+
+include(vcpkg_common_functions)
+
+set(FONTCONFIG_VERSION 2.12.4)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz"
+    FILENAME "fontconfig-${FONTCONFIG_VERSION}.tar.gz"
+    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${FONTCONFIG_VERSION}
+    PATCHES fcobjtypehash.patch
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DFC_INCLUDE_DIR=${CMAKE_CURRENT_LIST_DIR}/include
+    OPTIONS_DEBUG
+        -DFC_SKIP_TOOLS=ON
+        -DFC_SKIP_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-fontconfig TARGET_PATH share/unofficial-fontconfig)
+
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    foreach(HEADER fcfreetype.h fontconfig.h)
+        file(READ ${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER} FC_HEADER)
+        if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+            string(REPLACE "#define FcPublic" "#define FcPublic __declspec(dllimport)" FC_HEADER "${FC_HEADER}")
+        else()
+            string(REPLACE "#define FcPublic" "#define FcPublic __attribute__((visibility(\"default\")))" FC_HEADER "${FC_HEADER}")
+        endif()
+        file(WRITE ${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER} "${FC_HEADER}")
+    endforeach()
+endif()
+
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fontconfig)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/fontconfig/COPYING ${CURRENT_PACKAGES_DIR}/share/fontconfig/copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME unofficial-fontconfig)