From c520e1f3e072ae85454406bde4b15abae353d9a6 Mon Sep 17 00:00:00 2001 From: Maximilian Kruse Date: Fri, 6 Mar 2020 19:07:49 +0100 Subject: [tinyfiledialogs] download from archive, not temporary ref (#10111) * Update tinyfiledialogs to download from archive I have additionally messaged the original maintainer about a fixed-version download, so we will finally have some consistent building of this package. * Update ci.baseline.txt * Update CONTROL * Update portfile.cmake * Change download path to be version specific * Download Path now plain * Change position of Supports tag * Update package version * Update portfile.cmake Update portfile to download to a specified archive version name. --- ports/tinyfiledialogs/CONTROL | 3 ++- ports/tinyfiledialogs/portfile.cmake | 14 +++++++++++--- scripts/ci.baseline.txt | 6 ------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ports/tinyfiledialogs/CONTROL b/ports/tinyfiledialogs/CONTROL index 346c8f886..c4435bd77 100644 --- a/ports/tinyfiledialogs/CONTROL +++ b/ports/tinyfiledialogs/CONTROL @@ -1,4 +1,5 @@ Source: tinyfiledialogs -Version: 3.4.3 +Version: 3.4.3-1 Description: Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more Homepage: https://sourceforge.net/projects/tinyfiledialogs/ +Supports: !uwp diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake index bc9dff033..5deecdc71 100644 --- a/ports/tinyfiledialogs/portfile.cmake +++ b/ports/tinyfiledialogs/portfile.cmake @@ -1,9 +1,17 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_git( +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceforge.net/projects/tinyfiledialogs/files/v3.4/tinyfiledialogs-3.4.3.zip/download" + FILENAME "tinyfiledialogs-3.4.3.zip" + SHA512 b4a8c8fa5ff53a0972ce9dd1a4a473eaeb82689e5a47553b83e9220ea7e0ec582d87111728088ab6d314972e6531653b11fbd8c05c5e46fbe5bc4d29c7fe23fb +) + +vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - URL https://git.code.sf.net/p/tinyfiledialogs/code - REF f7789c57db4269495a6702625351a15e5ee17542 + ARCHIVE ${ARCHIVE} + REF v3.4.3 ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 31606af1a..bd6f10853 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1730,14 +1730,8 @@ tinkerforge:arm-uwp=fail tinkerforge:x64-uwp=fail tinyexif:arm-uwp=fail tinyexif:x64-uwp=fail -tinyfiledialogs:arm64-windows=fail tinyfiledialogs:arm-uwp=fail -tinyfiledialogs:x64-linux=fail tinyfiledialogs:x64-uwp=fail -tinyfiledialogs:x64-windows=fail -tinyfiledialogs:x64-windows-static=fail -tinyfiledialogs:x86-windows=fail -tinyfiledialogs:x64-osx=fail tinynpy:x64-linux=ignore tiny-process-library:arm-uwp=fail tiny-process-library:x64-uwp=fail -- cgit v1.2.3