diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/libpng-apng | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/libpng-apng')
| -rw-r--r-- | ports/libpng-apng/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpng-apng/portfile.cmake | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/ports/libpng-apng/CONTROL b/ports/libpng-apng/CONTROL index cb199b9fe..2c282cb93 100644 --- a/ports/libpng-apng/CONTROL +++ b/ports/libpng-apng/CONTROL @@ -1,5 +1,5 @@ Source: libpng-apng -Version: 1.6.37 +Version: 1.6.37-1 Build-Depends: zlib Homepage: https://github.com/glennrp/libpng Description: libpng-apng is a library implementing an interface for reading and writing (A)PNG ((Animated) Portable Network Graphics) format files. This is backward compatible with the regular libpng, both in library usage and format. diff --git a/ports/libpng-apng/portfile.cmake b/ports/libpng-apng/portfile.cmake index 948b0a2f3..7d0804420 100644 --- a/ports/libpng-apng/portfile.cmake +++ b/ports/libpng-apng/portfile.cmake @@ -8,6 +8,10 @@ vcpkg_from_github( REF v${LIBPNG_APNG_VERSION} SHA512 aeb00b48347c9e84d31995b3fe7e40580029734aa8103d774eee5745f5ca1fd1fd91a15f32d492277ab94346e4e7f731ee9bfea1783f930094f9f87eb3d9397d HEAD_REF master + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch + ${CMAKE_CURRENT_LIST_DIR}/skip-install-symlink.patch + ${CURRENT_BUILDTREES_DIR}/src/libpng-${LIBPNG_APNG_VERSION}-apng.patch ) vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE @@ -31,14 +35,6 @@ get_filename_component(GIT_EXE_PATH ${GIT} DIRECTORY) set(AWK_EXE_PATH "${GIT_EXE_PATH}/../usr/bin") set(ENV{PATH} "$ENV{PATH};${AWK_EXE_PATH}") -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch - ${CMAKE_CURRENT_LIST_DIR}/skip-install-symlink.patch - ${CURRENT_BUILDTREES_DIR}/src/libpng-${LIBPNG_APNG_VERSION}-apng.patch -) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(PNG_STATIC_LIBS OFF) set(PNG_SHARED_LIBS ON) |