diff --git a/ports/vanillapdf/disable-autosubscribe.diff b/ports/vanillapdf/disable-autosubscribe.diff deleted file mode 100644 index d362b70f78..0000000000 --- a/ports/vanillapdf/disable-autosubscribe.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/vanillapdf/utils/util.h b/src/vanillapdf/utils/util.h -index aae1052..d695e49 100644 ---- a/src/vanillapdf/utils/util.h -+++ b/src/vanillapdf/utils/util.h -@@ -50,6 +50,7 @@ private: - ScopeGuardFactory(); - }; - -+#if 0 - // The AutoSubscribe concept is something I was thinking about for a long time. - // Unfortunately I am still not able to create a working POC, however I want to keep the code. - // In case I will be thinking about such functionality in the future, this could be the starting point. -@@ -102,6 +103,7 @@ private: - T _observable; - U* _observer = nullptr; - }; -+#endif - - #if (__cplusplus < 201402L) && !defined(COMPILER_MICROSOFT_VISUAL_STUDIO) - // Use custom implementation if not diff --git a/ports/vanillapdf/fix-missing-header.patch b/ports/vanillapdf/fix-missing-header.patch deleted file mode 100644 index c37f4466ca..0000000000 --- a/ports/vanillapdf/fix-missing-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/vanillapdf/utils/buffer.h b/src/vanillapdf/utils/buffer.h -index f2bcba10..32a238b6 100644 ---- a/src/vanillapdf/utils/buffer.h -+++ b/src/vanillapdf/utils/buffer.h -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - namespace vanillapdf { - diff --git a/ports/vanillapdf/portfile.cmake b/ports/vanillapdf/portfile.cmake index 03cee68bcd..ffa21408bd 100644 --- a/ports/vanillapdf/portfile.cmake +++ b/ports/vanillapdf/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vanillapdf/vanillapdf REF "v${VERSION}" - SHA512 7e8e555901ea8c60d0bbd69933b284b88930c8bff771363d83228302832f43e3ae560f9666b1410ce388e60285c4a41b297a2d99fa465cbe23b406afd0647612 - PATCHES - disable-autosubscribe.diff - fix-missing-header.patch + SHA512 2d076c6acf159e4fd9ea998053afe2600d2261233aa5e9e7275334044bbaf5fdd519f4774751e83ac1c444a378b40eb6a06bb2ba87c12296c0539075bd31930f + HEAD_REF main ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" VANILLAPDF_USE_STATIC_CRT) @@ -14,13 +12,21 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DVANILLAPDF_INTERNAL_VCPKG=OFF - -DVANILLAPDF_ENABLE_TESTS=OFF - -DVANILLAPDF_ENABLE_BENCHMARK=OFF -DVANILLAPDF_USE_STATIC_CRT=${VANILLAPDF_USE_STATIC_CRT} ) vcpkg_cmake_install() +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/vanillapdf/c_export.h" + "#if defined(VANILLAPDF_CONFIGURATION_DLL) && defined(COMPILER_MICROSOFT_VISUAL_STUDIO)" + "#if defined(COMPILER_MICROSOFT_VISUAL_STUDIO)" + ) +endif() + vcpkg_cmake_config_fixup( PACKAGE_NAME "vanillapdf" CONFIG_PATH "lib/cmake/vanillapdf" @@ -28,9 +34,7 @@ vcpkg_cmake_config_fixup( file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/debug") vcpkg_install_copyright( FILE_LIST diff --git a/ports/vanillapdf/usage b/ports/vanillapdf/usage deleted file mode 100644 index e1895c865e..0000000000 --- a/ports/vanillapdf/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package vanillapdf provides the following CMake targets: - - find_package(vanillapdf CONFIG REQUIRED) - target_link_libraries(myapp PRIVATE vanillapdf::vanillapdf) \ No newline at end of file diff --git a/ports/vanillapdf/vcpkg.json b/ports/vanillapdf/vcpkg.json index f20bfabee4..9ea48ab56a 100644 --- a/ports/vanillapdf/vcpkg.json +++ b/ports/vanillapdf/vcpkg.json @@ -1,14 +1,13 @@ { "name": "vanillapdf", - "version": "2.2.1", - "port-version": 1, + "version": "2.3.0", "description": "Vanilla.PDF is a cross-platform SDK for creating and modifying PDF documents.", "homepage": "https://github.com/vanillapdf/vanillapdf", - "documentation": "https://vanillapdf.github.io/vanillapdf", + "documentation": "https://vanillapdf.readthedocs.io/", "license": "Apache-2.0", "dependencies": [ + "fmt", "libjpeg-turbo", - "nlohmann-json", "openjpeg", "openssl", "spdlog", diff --git a/versions/baseline.json b/versions/baseline.json index 758b8b8d1c..12617a6d76 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10609,8 +10609,8 @@ "port-version": 5 }, "vanillapdf": { - "baseline": "2.2.1", - "port-version": 1 + "baseline": "2.3.0", + "port-version": 0 }, "variant-lite": { "baseline": "3.0.0", diff --git a/versions/v-/vanillapdf.json b/versions/v-/vanillapdf.json index fd0a51f604..5329ff94cb 100644 --- a/versions/v-/vanillapdf.json +++ b/versions/v-/vanillapdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fca82648d789ce28ddee5aea32285e925ac63e1e", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "48975bd730fb424b7cb9d0bb332a9d88d50d0633", "version": "2.2.1",