[libplist/libusbmuxd/libimobiledevice/libideviceactivation/usbmuxd] Update version (#13811)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

3 files changed, 54 insertions, 11 deletions

diff --git a/ports/libplist/CMakeLists.txt b/ports/libplist/CMakeLists.txt
index 0752c2e5b..9feb69746 100644
--- a/ports/libplist/CMakeLists.txt
+++ b/ports/libplist/CMakeLists.txt
@@ -1,33 +1,75 @@
 cmake_minimum_required(VERSION 3.8)

-project(plist C)

+project(plist C CXX)

 

 file(GLOB_RECURSE PLIST_HEADER include/plist/*.h)

-file(GLOB_RECURSE PLIST_SRC src/*.c)

+

+set(PLIST_SRC

+    src/base64.c

+    src/bytearray.c

+    src/hashtable.c

+    src/ptrarray.c

+    src/time64.c

+    src/xplist.c

+    src/bplist.c

+    src/plist.c

+)

+

+set(PLISTPP_SRC

+    src/Node.cpp

+    src/Structure.cpp

+    src/Array.cpp

+    src/Boolean.cpp

+    src/Data.cpp

+    src/Date.cpp

+    src/Dictionary.cpp

+    src/Integer.cpp

+    src/Key.cpp

+    src/Real.cpp

+    src/String.cpp

+    src/Uid.cpp

+)

 

 file(GLOB_RECURSE LIBCNARY_HEADER libcnary/include/*.h)

 file(GLOB_RECURSE LIBCNARY_SRC libcnary/*c)

 

 add_library(plist ${PLIST_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER})

 target_include_directories(plist PRIVATE src include libcnary/include)

+set_target_properties(plist PROPERTIES OUTPUT_NAME plist-2.0)

+

+add_library(plist++ STATIC ${PLISTPP_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER})

+set_target_properties(plist++ PROPERTIES OUTPUT_NAME plist++-2.0)

+target_include_directories(plist++ PRIVATE src include libcnary/include)

 

-if(WIN32)

+if(WIN32 AND BUILD_SHARED_LIBS)

     target_compile_options(plist PRIVATE -W3 -WX- -sdl-)

     target_compile_definitions(plist PRIVATE -DLIBPLIST_EXPORTS)

+    target_compile_options(plist++ PRIVATE -W3 -WX- -sdl-)

+    target_compile_definitions(plist++ PRIVATE -DLIBPLIST_EXPORTS)

 endif()

+target_link_libraries(plist++ PRIVATE plist)

 

 install(

-    TARGETS plist

+    TARGETS plist plist++

     RUNTIME DESTINATION bin

     ARCHIVE DESTINATION lib

     LIBRARY DESTINATION lib

 )

+

+set(PACKAGE_NAME libplist)

+set(PACKAGE_VERSION 2.0)

+set(prefix ${CMAKE_INSTALL_PREFIX})

+set(exec_prefix \${prefix})

+set(libdir \${prefix}/lib)

+set(includedir \${prefix}/../include)

+foreach (PLIST_PKGCONFIG libplist-2.0.pc libplist++-2.0.pc)

 configure_file(

-    ${CMAKE_CURRENT_SOURCE_DIR}/src/libplist.pc.in

-    ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc

+    ${CMAKE_CURRENT_SOURCE_DIR}/src/${PLIST_PKGCONFIG}.in

+    ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}

     @ONLY

 )

 install(

-    FILES ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc

+    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLIST_PKGCONFIG}

     DESTINATION lib/pkgconfig)

+endforeach()

 

-install(FILES ${PLIST_HEADER} DESTINATION include/plist)
\ No newline at end of file
+install(FILES ${PLIST_HEADER} DESTINATION include/plist)

diff --git a/ports/libplist/CONTROL b/ports/libplist/CONTROL
index b7aa23a76..e6ba166f0 100644
--- a/ports/libplist/CONTROL
+++ b/ports/libplist/CONTROL
@@ -1,3 +1,3 @@
 Source: libplist

-Version: 1.2.185
+Version: 1.3.6
 Description: A library to handle Apple Property List format in binary or XML 

diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake
index 4e59e9081..5137b4046 100644
--- a/ports/libplist/portfile.cmake
+++ b/ports/libplist/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_CRT ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libimobiledevice-win32/libplist

-    REF efeba335a63110d9ce2b3cd2481743cb0028d9c7 # v1.2.185
-    SHA512 c2f742a60c7a6e0601d33eae03d934f2cdb01fdd121be33212955f261a6756c14753ff3c8e173375b228f44f007d7a96ff6833ae66b5a8a6c7c245017cdc9b07

+    REF bbba7cabb78aad180a7a982ada5e1f21ff0ba873 # v1.3.6
+    SHA512 4cd59ed87c647259d0da99a20a05e01aa880f01f6b5cecd29e4247029a3d29f0f68b4552571eb3fd3c5549b4cb357801ffe43338b8ff34d44d6be5393d2e6b9d

     HEAD_REF msvc-master

     PATCHES dllexport.patch

 )

@@ -18,6 +18,7 @@ vcpkg_configure_cmake(
 

 vcpkg_install_cmake()

 vcpkg_copy_pdbs()

+vcpkg_fixup_pkgconfig()

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)