diff --git a/ports/podofo/dependencies.diff b/ports/podofo/dependencies.diff deleted file mode 100644 index e7a5738238..0000000000 --- a/ports/podofo/dependencies.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt -index a539c776..7cc32371 100644 ---- a/3rdparty/CMakeLists.txt -+++ b/3rdparty/CMakeLists.txt -@@ -22,7 +22,11 @@ endif() - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/adobe/afdko/resource") - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/adobe/afdko/include") - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/chromium") --include_directories("${CMAKE_CURRENT_SOURCE_DIR}/tcbspan") - - add_library(podofo_3rdparty STATIC ${SOURCE_FILES}) - target_link_libraries(podofo_3rdparty LibXml2::LibXml2) -+if (PODOFO_DEVENDOR_TCBSPAN) -+ target_link_libraries(podofo_3rdparty "$") -+else() -+ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/tcbspan") -+endif() -diff --git a/src/podofo/auxiliary/span.h b/src/podofo/auxiliary/span.h -index d484b775..3a307747 100644 ---- a/src/podofo/auxiliary/span.h -+++ b/src/podofo/auxiliary/span.h -@@ -2,7 +2,7 @@ - #define AUX_SPAN_H - #pragma once - --#include -+#include - - namespace PoDoFo - { -diff --git a/src/podofo/podofo-config.cmake.in b/src/podofo/podofo-config.cmake.in -index 700619bb..87529246 100644 ---- a/src/podofo/podofo-config.cmake.in -+++ b/src/podofo/podofo-config.cmake.in -@@ -2,6 +2,9 @@ - - if("@PODOFO_BUILD_STATIC@") - include(CMakeFindDependencyMacro) -+ if("@PODOFO_DEVENDOR_UTF8PROC@") -+ find_dependency(utf8proc CONFIG) -+ endif() - if("@Fontconfig_FOUND@") - find_dependency(Fontconfig) - endif() diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index 953b1e5204..c1b244fdbd 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -2,9 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO podofo/podofo REF "${VERSION}" - SHA512 cb5608f7496974c0d546c73000d2551913e18a13319b991a7532a46dd04ee7305e0df4a1233156d0171cd965d0af1cf99a27b2400fcc6117a5d1f04c0ad8b364 - PATCHES - dependencies.diff + SHA512 429cce822d9b2a4158540d01c61ce7dd2e543413cd5b2d188a9b33d7aa063c138382568383b3bccda0d787495992d1cac10a6321b92a639661f60e241ac7c484 ) file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/date" @@ -18,7 +16,7 @@ file(REMOVE_RECURSE vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - fontconfig VCPKG_LOCK_FIND_PACKAGE_Fontconfig + fontconfig PODOFO_WITH_FONTMANAGER ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PODOFO_BUILD_STATIC) diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index 5e04e76e05..83bdd8cc88 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "podofo", - "version": "1.1.0", - "port-version": 1, + "version": "1.1.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 OR MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 46ea40d488..4fc235a0a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7889,8 +7889,8 @@ "port-version": 2 }, "podofo": { - "baseline": "1.1.0", - "port-version": 1 + "baseline": "1.1.1", + "port-version": 0 }, "poissonrecon": { "baseline": "2021-09-26", diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index fe227ec17c..154e35f4dc 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d3a02e3584621c50af834a8abfcf124a689203a", + "version": "1.1.1", + "port-version": 0 + }, { "git-tree": "571a8c0a07bc5ed3a4a4cf9a4e9e30573453cf5c", "version": "1.1.0",