diff --git a/ports/libideviceactivation/portfile.cmake b/ports/libideviceactivation/portfile.cmake index ad5bbfbcb25dfe..e438cba37ed8f1 100644 --- a/ports/libideviceactivation/portfile.cmake +++ b/ports/libideviceactivation/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libideviceactivation - REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.2.235 + REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.3.17 SHA512 18fdf1b42744da33e0f0f037e83a72b76cc0b63a0b712e78d9736adcde113582327f3712bc2bfa7b6fdb692465700a9106286f383fd7d11f9351ca7939b20e24 HEAD_REF msvc-master ) -configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libideviceactivation/vcpkg.json b/ports/libideviceactivation/vcpkg.json index 6a864bd005a584..7eadb89a3f17cb 100644 --- a/ports/libideviceactivation/vcpkg.json +++ b/ports/libideviceactivation/vcpkg.json @@ -1,12 +1,15 @@ { "name": "libideviceactivation", - "version-string": "1.2.235", - "port-version": 1, + "version": "1.3.17", "description": "A library to handle the activation process of iOS devices", "dependencies": [ "curl", "libimobiledevice", "libplist", - "libxml2" + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/libimobiledevice/portfile.cmake b/ports/libimobiledevice/portfile.cmake index cfba47859d26f5..b063154bccb9f1 100644 --- a/ports/libimobiledevice/portfile.cmake +++ b/ports/libimobiledevice/portfile.cmake @@ -1,23 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libimobiledevice - REF 348aec1f714f77c717141f70869ac7c996c3c6fb # v1.3.6 + patches - SHA512 fc7924667c3cb07025fd25ff94610ae57a90a8fd4502393e89993bfcd13c5e0c609efbf0343f344f59a8520ba4f7805925fea4c06d20ac1680f63f16aac12542 + REF 0d4a7e905baeadafa098e629a5241fac6fbf7d24 # v1.3.7 + SHA512 db6369b2fa8e7b659948602ac8c4cd568bf37c0f73e58150f61f1af7000de95aa1a6a9ae546d6a37de4cb08a8059127fe5ed067351c4092c01a45350586f755a HEAD_REF msvc-master ) -configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libimobiledevice/vcpkg.json b/ports/libimobiledevice/vcpkg.json index 2bef3413703104..48e63449b7d530 100644 --- a/ports/libimobiledevice/vcpkg.json +++ b/ports/libimobiledevice/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libimobiledevice", - "version-string": "1.3.6", - "port-version": 2, + "version": "1.3.17", "description": "A cross-platform protocol library to communicate with iOS devices", "homepage": "http://www.libimobiledevice.org", "dependencies": [ @@ -9,6 +8,10 @@ "getopt", "libplist", "libusbmuxd", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5307c8cc285464..e29760d93f1d9a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3405,8 +3405,8 @@ "port-version": 0 }, "libideviceactivation": { - "baseline": "1.2.235", - "port-version": 1 + "baseline": "1.3.17", + "port-version": 0 }, "libidn2": { "baseline": "2.3.0", @@ -3421,8 +3421,8 @@ "port-version": 1 }, "libimobiledevice": { - "baseline": "1.3.6", - "port-version": 2 + "baseline": "1.3.17", + "port-version": 0 }, "libirecovery": { "baseline": "1.0.25", diff --git a/versions/l-/libideviceactivation.json b/versions/l-/libideviceactivation.json index 8b94277fdd36eb..8d33991d9cc59d 100644 --- a/versions/l-/libideviceactivation.json +++ b/versions/l-/libideviceactivation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ff1d3dc1c70954efdb1b56ea38660c8e2817a68", + "version": "1.3.17", + "port-version": 0 + }, { "git-tree": "9c39284ebf51443f0dc6c3291bdb7cdca973a9d2", "version-string": "1.2.235", diff --git a/versions/l-/libimobiledevice.json b/versions/l-/libimobiledevice.json index c8c340dca0bd25..c249e19627911b 100644 --- a/versions/l-/libimobiledevice.json +++ b/versions/l-/libimobiledevice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bf3d6cdc93021dcc048d73d7153aebecd91c47e", + "version": "1.3.17", + "port-version": 0 + }, { "git-tree": "5b4e580b28caaf03bbe46030bf612af191eb800a", "version-string": "1.3.6",