From b04b4feab06c608390949a1cd7c9e04da7bc8050 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 3 Oct 2023 11:24:45 +0800 Subject: [PATCH] [podofo] update to 0.10.1 (#34171) --- ports/podofo/install-cmake-config.patch | 52 ------------------------- ports/podofo/portfile.cmake | 4 +- ports/podofo/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/p-/podofo.json | 5 +++ 5 files changed, 9 insertions(+), 59 deletions(-) delete mode 100644 ports/podofo/install-cmake-config.patch diff --git a/ports/podofo/install-cmake-config.patch b/ports/podofo/install-cmake-config.patch deleted file mode 100644 index 90881aa726..0000000000 --- a/ports/podofo/install-cmake-config.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 597847b..da988ce 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -258,11 +258,6 @@ endif() - # To use these dependencies set PODOFO_DIR to the podofo BUILD directory in - # your build (eg -DPODOFO_DIR=/path/to/podofo when running cmake to configure - # the app that'll use podofo). See: find_package(...) in the cmake docs. --if(PODOFO_BUILD_SHARED) -- export(TARGETS podofo_shared FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake") --else() -- export(TARGETS podofo_static podofo_private FILE "${PROJECT_BINARY_DIR}/podofoConfig.cmake") --endif() - - # Enable packaging - set(CPACK_PACKAGE_DESCRIPTION "A C++ PDF manipulation library") -diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt -index 3a148fb..4ca1420 100644 ---- a/src/podofo/CMakeLists.txt -+++ b/src/podofo/CMakeLists.txt -@@ -77,11 +77,15 @@ if(PODOFO_BUILD_STATIC) - CLEAN_DIRECT_OUTPUT 1 - OUTPUT_NAME "podofo" - ) -- install(TARGETS podofo_static -+ install(TARGETS podofo_static podofo_private -+ EXPORT podofo-config - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+ install(EXPORT podofo-config -+ DESTINATION share/podofo -+ ) - set(PODOFO_LIBRARIES podofo_static podofo_private - CACHE INTERNAL "Which podofo library variant to depend on") - endif() -@@ -102,10 +106,14 @@ if(PODOFO_BUILD_SHARED) - # Since we're building a shared podofo, prefer to depend on this one for - # tests and tools over the static library (if built). - install(TARGETS podofo_shared -+ EXPORT podofo-config - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+ install(EXPORT podofo-config -+ DESTINATION share/podofo -+ ) - - # Create a pkg-config file for linking against shared library - # if pkg-config is available on the system. diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index ac7151ef69..0946b18fdd 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -3,9 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO podofo/podofo REF "${VERSION}" - SHA512 674024af031392253bc9ea02e392fa7b4a5c8894f3129e05f27133774ccf8b696e225789e886dedbe90bc2323c318b76e79857453a56d6014d7a5514e3f861a2 - PATCHES - install-cmake-config.patch + SHA512 cbbd183cd940345f9b077b7da140414c27badc70fdf754e2f3c6f0e51c25072de46d7fe312b014c0eab359bd03e9dca0283260db00f079c5014e268d5c5ef5c9 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index 3a9cb74016..23a158cc9f 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "podofo", - "version": "0.10.0", - "port-version": 2, + "version": "0.10.1", "description": "PoDoFo is a library to work with the PDF file format", "homepage": "https://github.com/podofo/podofo", "license": "LGPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 052fcc4b68..af8d292b59 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6509,8 +6509,8 @@ "port-version": 4 }, "podofo": { - "baseline": "0.10.0", - "port-version": 2 + "baseline": "0.10.1", + "port-version": 0 }, "poissonrecon": { "baseline": "2021-09-26", diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index 7b07cfe4be..b99596bc96 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75683a46d35cfff92866f9c559833c7d1962cc55", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "2b550a1cf9eabeb17534710cb767f971c57184c1", "version": "0.10.0",