diff --git a/ports/advobfuscator/cmake_export.patch b/ports/advobfuscator/cmake_export.patch deleted file mode 100644 index 11dcf5a336..0000000000 --- a/ports/advobfuscator/cmake_export.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 673ddbf..c0a736c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,24 +20,25 @@ install(TARGETS advobfuscator EXPORT advobfuscatorTargets) - install(EXPORT advobfuscatorTargets - FILE advobfuscatorTargets.cmake - NAMESPACE advobfuscator:: -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/advobfuscator -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/advobfuscator - ) - - include(CMakePackageConfigHelpers) - write_basic_package_version_file( -- "${CMAKE_CURRENT_BINARY_DIR}/mylibConfigVersion.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/advobfuscatorConfigVersion.cmake" - VERSION ${PROJECT_VERSION} - COMPATIBILITY SameMajorVersion -+ ARCH_INDEPENDENT - ) - configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/AdvobfuscatorConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/advobfuscatorConfig.cmake" -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/advobfuscator -+ INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/advobfuscator - ) - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/advobfuscatorConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/advobfuscatorConfigVersion.cmake" -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/advobfuscator -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/advobfuscator - ) - - if(BUILD_TESTING) diff --git a/ports/advobfuscator/portfile.cmake b/ports/advobfuscator/portfile.cmake index a0c696bc5b..f1145990cf 100644 --- a/ports/advobfuscator/portfile.cmake +++ b/ports/advobfuscator/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andrivet/ADVobfuscator REF "v${VERSION}" - SHA512 904d42c034e95770c3d2c6bff9ca80f92fdcf097f00a32a60f236e022342e60977395bb27791a24794d1e9f2c3cabf183b0faf5a1545799aa412f00a9868b715 + SHA512 da8396304e45be018e878ef09e063f4f21383d0093973eaa5abaf5c6f0e391cb69b5d71b0c08cd88c732cf038d0395e876e5933f1e1cd369e6b4ac9df0139814 HEAD_REF main - PATCHES - cmake_export.patch # https://github.com/andrivet/ADVobfuscator/pull/43 ) vcpkg_cmake_configure( @@ -20,5 +18,4 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/advobfuscator/usage b/ports/advobfuscator/usage deleted file mode 100644 index 182e8bb8ce..0000000000 --- a/ports/advobfuscator/usage +++ /dev/null @@ -1,4 +0,0 @@ -advobfuscator provides CMake targets: - - find_package(advobfuscator CONFIG REQUIRED) - target_link_libraries(main PRIVATE advobfuscator::advobfuscator) diff --git a/ports/advobfuscator/vcpkg.json b/ports/advobfuscator/vcpkg.json index 54f5f8cb04..3c310655c3 100644 --- a/ports/advobfuscator/vcpkg.json +++ b/ports/advobfuscator/vcpkg.json @@ -1,6 +1,6 @@ { "name": "advobfuscator", - "version": "2.1", + "version": "2.1.1", "description": "Obfuscation library based on C++20 and metaprogramming", "homepage": "https://github.com/andrivet/ADVobfuscator", "license": "BSD-3-Clause-Clear", diff --git a/versions/a-/advobfuscator.json b/versions/a-/advobfuscator.json index 77e4d5ca46..db82907923 100644 --- a/versions/a-/advobfuscator.json +++ b/versions/a-/advobfuscator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22f546c6d768ba3d538e82dacff9c5b27f5a36f8", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "c241d092a06888dba3a352ae22db508a55d58c6e", "version": "2.1", diff --git a/versions/baseline.json b/versions/baseline.json index 24b22e19c8..31e60fc0e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -57,7 +57,7 @@ "port-version": 0 }, "advobfuscator": { - "baseline": "2.1", + "baseline": "2.1.1", "port-version": 0 }, "air-ctl": {