From ba7450abdd7c6ccc29d8c4c7a56bbea62747beb9 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 13 May 2020 07:10:16 +0800 Subject: [PATCH] [idevicerestore] Fix libgen.h cannot be found (#11074) Co-authored-by: nicole mazzuca --- ports/idevicerestore/CONTROL | 10 +++--- .../fix-libgen.h-cannot-be-found.patch | 32 +++++++++++++++++++ ports/idevicerestore/portfile.cmake | 6 ++-- scripts/ci.baseline.txt | 2 ++ 4 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 ports/idevicerestore/fix-libgen.h-cannot-be-found.patch diff --git a/ports/idevicerestore/CONTROL b/ports/idevicerestore/CONTROL index 326c096f4..a8db4e250 100644 --- a/ports/idevicerestore/CONTROL +++ b/ports/idevicerestore/CONTROL @@ -1,5 +1,5 @@ -Source: idevicerestore -Version: 1.0.12-4 -Description: Restore/upgrade firmware of iOS devices -Build-Depends: libimobiledevice, curl, libirecovery, libzip -Supports: !(windows) +Source: idevicerestore +Version: 1.0.12-4 +Description: Restore/upgrade firmware of iOS devices +Build-Depends: libimobiledevice, curl, libirecovery, libzip +Supports: windows diff --git a/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch b/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch new file mode 100644 index 000000000..db7450eb2 --- /dev/null +++ b/ports/idevicerestore/fix-libgen.h-cannot-be-found.patch @@ -0,0 +1,32 @@ +diff --git a/src/common.c b/src/common.c +index afe1bc0..9219a8f 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -29,7 +29,9 @@ + #include + #include + #include ++#ifndef _MSC_VER + #include ++#endif + #include + + #include "common.h" +diff --git a/src/idevicerestore.c b/src/idevicerestore.c +index efa13c3..c17a2ba 100644 +--- a/src/idevicerestore.c ++++ b/src/idevicerestore.c +@@ -38,12 +38,12 @@ + #include + #ifndef _MSC_VER + #include ++#include + #endif + #include + #include + #include + #include +-#include + + #include + diff --git a/ports/idevicerestore/portfile.cmake b/ports/idevicerestore/portfile.cmake index 67aeb4c37..5cd1acef9 100644 --- a/ports/idevicerestore/portfile.cmake +++ b/ports/idevicerestore/portfile.cmake @@ -1,4 +1,4 @@ -include(vcpkg_common_functions) +vcpkg_fail_port_install(ON_TARGET "linux" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -6,7 +6,9 @@ vcpkg_from_github( REF 1.0.12 SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915 HEAD_REF msvc-master - PATCHES libcurl_d.patch + PATCHES + libcurl_d.patch + fix-libgen.h-cannot-be-found.patch ) vcpkg_install_msbuild( diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a366fb7d4..62c82e1b9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -621,6 +621,8 @@ hypre:x64-osx=fail icu:arm64-windows=fail icu:arm-uwp=fail icu:x64-uwp=fail +idevicerestore:x64-linux=fail +idevicerestore:x64-osx=fail ignition-common1:x64-linux=fail ignition-msgs1:arm64-windows=fail ignition-msgs1:arm-uwp=fail