Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libpff] Fix zlib import #23953

Merged
merged 4 commits into from
Apr 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/libpff/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 7 additions & 9 deletions ports/libpff/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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)
15 changes: 13 additions & 2 deletions ports/libpff/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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": "windows & !(static & windows) & !uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib"
]
}
6 changes: 0 additions & 6 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3850,7 +3850,7 @@
},
"libpff": {
"baseline": "2018-07-14",
"port-version": 2
"port-version": 3
},
"libplist": {
"baseline": "1.3.6",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libpff.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "24cc99a6c6ead368c4711dc67e8e7a7ae4444f09",
"version-date": "2018-07-14",
"port-version": 3
},
{
"git-tree": "fc83ea1c4fe9bd9731134772ff7df1c1f3ff6ab9",
"version-string": "2018-07-14",
Expand Down