From ce61d455251c31a7b3b8d00ef4dfd88c4c63e454 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 3 Apr 2022 00:32:40 +0200 Subject: [PATCH 1/4] [libpff] Fix Linux configure --- ports/libpff/CMakeLists.txt | 2 +- ports/libpff/portfile.cmake | 16 +++++++--------- ports/libpff/vcpkg.json | 15 +++++++++++++-- scripts/ci.baseline.txt | 6 ------ 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ports/libpff/CMakeLists.txt b/ports/libpff/CMakeLists.txt index 276db5d80a1f65..44317432d7dc96 100644 --- a/ports/libpff/CMakeLists.txt +++ b/ports/libpff/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12) project(libpff C) -find_package(zlib REQUIRED) +find_package(ZLIB REQUIRED) if(MSVC) add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) diff --git a/ports/libpff/portfile.cmake b/ports/libpff/portfile.cmake index 5a3e81388e18b3..00be14f6675b7e 100644 --- a/ports/libpff/portfile.cmake +++ b/ports/libpff/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 7207ba87607ea2fd4609a081c2f4b061344a783e188605e88df99fd473f2a8da1269b065e57b054f4622888d40aa8f2b8272dc4748334ddfe358b28d443d6ad1 ) - vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${LIB_VERSION} @@ -20,18 +20,16 @@ vcpkg_download_distfile(ARCHIVE file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libpff TARGET_PATH share/unofficial-libpff) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpff PACKAGE_NAME unofficial-libpff) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_copy_pdbs() -# License and man -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libpff" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libpff/vcpkg.json b/ports/libpff/vcpkg.json index 5480dbdaa84ffa..5637c3289b11de 100644 --- a/ports/libpff/vcpkg.json +++ b/ports/libpff/vcpkg.json @@ -1,9 +1,20 @@ { "name": "libpff", - "version-string": "2018-07-14", - "port-version": 2, + "version-date": "2018-07-14", + "port-version": 3, "description": "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.", + "homepage": "https://github.com/libyal/libpff", + "license": "LGPL-3.0", + "supports": "!(static & windows) & !uwp", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2597ccae1bbc4a..96581b199b7927 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -574,12 +574,6 @@ libmysql:arm64-windows=fail libopusenc:arm-uwp=fail libopusenc:x64-uwp=fail libosip2:x64-windows-static-md=fail -libpff:arm-uwp=fail -libpff:x64-linux=fail -libpff:x64-osx=fail -libpff:x64-uwp=fail -libpff:x64-windows-static=fail -libpff:x64-windows-static-md=fail libplist:x64-windows-static=fail libpng-apng:arm64-windows = skip libpng-apng:arm-uwp = skip From b04d43f1cfc749a3796ccdee1c80dbfbc297a98b Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 3 Apr 2022 00:33:08 +0200 Subject: [PATCH 2/4] version --- versions/baseline.json | 2 +- versions/l-/libpff.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 9b5c1056e7a70b..811005a0907cb4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3850,7 +3850,7 @@ }, "libpff": { "baseline": "2018-07-14", - "port-version": 2 + "port-version": 3 }, "libplist": { "baseline": "1.3.6", diff --git a/versions/l-/libpff.json b/versions/l-/libpff.json index ddaf67af575652..c9682d1d17345b 100644 --- a/versions/l-/libpff.json +++ b/versions/l-/libpff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fcb12dabc29797a4332c57ee6c8f6e835f24e098", + "version-date": "2018-07-14", + "port-version": 3 + }, { "git-tree": "fc83ea1c4fe9bd9731134772ff7df1c1f3ff6ab9", "version-string": "2018-07-14", From 4377f3dcba52a046af02e887045ce64b0e4a92c2 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 4 Apr 2022 21:25:31 +0200 Subject: [PATCH 3/4] unsupported on UNIX --- ports/libpff/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libpff/vcpkg.json b/ports/libpff/vcpkg.json index 5637c3289b11de..b8eaba407ed2ac 100644 --- a/ports/libpff/vcpkg.json +++ b/ports/libpff/vcpkg.json @@ -5,7 +5,7 @@ "description": "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.", "homepage": "https://github.com/libyal/libpff", "license": "LGPL-3.0", - "supports": "!(static & windows) & !uwp", + "supports": "windows & !(static & windows) & !uwp", "dependencies": [ { "name": "vcpkg-cmake", From 51f628fb9ced1da5e263e9deb91952a314686af6 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 4 Apr 2022 21:26:10 +0200 Subject: [PATCH 4/4] version --- versions/l-/libpff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libpff.json b/versions/l-/libpff.json index c9682d1d17345b..7d305a1681c936 100644 --- a/versions/l-/libpff.json +++ b/versions/l-/libpff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fcb12dabc29797a4332c57ee6c8f6e835f24e098", + "git-tree": "24cc99a6c6ead368c4711dc67e8e7a7ae4444f09", "version-date": "2018-07-14", "port-version": 3 },