From 726c11148105a97aef39bec024fdb7c140b1b154 Mon Sep 17 00:00:00 2001
From: Stefano Sinigardi <stesinigardi@hotmail.com>
Date: Mon, 7 Oct 2019 19:35:13 +0200
Subject: [vcpkg] fatal_error when patch fails to apply (#8087)

vcpkg will now fail on failure to apply patches except when using `--head`.
---
 ports/libsigcpp/CONTROL                   |  2 +-
 ports/libsigcpp/dont-import-symbols.patch | 13 -------------
 ports/libsigcpp/portfile.cmake            | 20 +++++++++++++-------
 3 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 ports/libsigcpp/dont-import-symbols.patch

(limited to 'ports/libsigcpp')

diff --git a/ports/libsigcpp/CONTROL b/ports/libsigcpp/CONTROL
index c0393066b..617328c7b 100644
--- a/ports/libsigcpp/CONTROL
+++ b/ports/libsigcpp/CONTROL
@@ -1,3 +1,3 @@
 Source: libsigcpp
-Version: 2.10-1
+Version: 2.10-3
 Description: Typesafe callback framework for C++
diff --git a/ports/libsigcpp/dont-import-symbols.patch b/ports/libsigcpp/dont-import-symbols.patch
deleted file mode 100644
index b031d3baf..000000000
--- a/ports/libsigcpp/dont-import-symbols.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sigc++config.h b/sigc++config.h
-index e212700..8d7366e 100644
---- a/sigc++config.h
-+++ b/sigc++config.h
-@@ -72,6 +72,8 @@
- 
- #endif /* !SIGC_MSC */
- 
-+#undef SIGC_DLL
-+
- #ifdef SIGC_DLL
- # if defined(SIGC_BUILD) && defined(_WINDLL)
- #  define SIGC_API __declspec(dllexport)
diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake
index c98a26717..707e59010 100644
--- a/ports/libsigcpp/portfile.cmake
+++ b/ports/libsigcpp/portfile.cmake
@@ -1,12 +1,17 @@
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libsigc++-2.10.0)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz"
     FILENAME "libsigc++-2.10.0.tar.xz"
-    SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae)
+    SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
-vcpkg_extract_source_archive(${ARCHIVE})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
@@ -18,10 +23,11 @@ vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
-        PATCHES
-            ${CMAKE_CURRENT_LIST_DIR}/dont-import-symbols.patch)
+    file(READ ${CURRENT_PACKAGES_DIR}/include/sigc++config.h SIGCPPCONFIG_H)
+    string(REPLACE "endif /* !SIGC_MSC */"
+    "endif /* !SIGC_MSC */
+#undef SIGC_DLL" SIGCPPCONFIG_H "${SIGCPPCONFIG_H}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/sigc++config.h "${SIGCPPCONFIG_H}")
 endif()
 
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsigcpp)
-- 
cgit v1.2.3