From e5dd304952bfd8dc33bb5026e008180b1607f0c7 Mon Sep 17 00:00:00 2001 From: Cheney-Wang <850426846@qq.com> Date: Thu, 23 Feb 2023 00:06:13 -0800 Subject: [PATCH 1/2] [rttr] Update to latest commit for support c++20 --- ports/rttr/253.patch | 12 ------------ ports/rttr/portfile.cmake | 8 ++++---- ports/rttr/remove-owner-read-perms.patch | 14 +++++++------- ports/rttr/support-cpp20.patch | 13 +++++++++++++ ports/rttr/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/rttr.json | 5 +++++ 7 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 ports/rttr/253.patch create mode 100644 ports/rttr/support-cpp20.patch diff --git a/ports/rttr/253.patch b/ports/rttr/253.patch deleted file mode 100644 index c7d0d12c928e89..00000000000000 --- a/ports/rttr/253.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/rttr/variant.h b/src/rttr/variant.h -index cec094b0..40978e3b 100644 ---- a/src/rttr/variant.h -+++ b/src/rttr/variant.h -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - namespace rttr - { diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake index 646f98ead8fa45..92d426ac7646b5 100644 --- a/ports/rttr/portfile.cmake +++ b/ports/rttr/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rttrorg/rttr - REF v0.9.6 - SHA512 5c94f037b319568d351ee6d25f1404adce00b40598dce4a331789d5357c059e50aae3894f90e60d37307b7e96f4672ae09d3798bbe47f796ef2044f1ac6f9e50 + REF 7edbd580cfad509a3253c733e70144e36f02ecd4 + SHA512 17432728037bc0f8e346c6bd01298c6ee3a4714c83505b2cf1bc23305acea5cc55925e7fc28a8cf182b6ba26abdc9d40ea2f5b168615c030d5ebeec9a8961636 HEAD_REF master PATCHES fix-directory-output.patch Fix-depends.patch remove-owner-read-perms.patch - 253.patch # https://github.com/rttrorg/rttr/pull/253/ + disable-unsupport-header.patch ) if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") @@ -47,7 +47,7 @@ else() vcpkg_cmake_config_fixup(CONFIG_PATH share/rttr/cmake) endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" diff --git a/ports/rttr/remove-owner-read-perms.patch b/ports/rttr/remove-owner-read-perms.patch index 3fc98422d9b87b..66edabdddc87d9 100644 --- a/ports/rttr/remove-owner-read-perms.patch +++ b/ports/rttr/remove-owner-read-perms.patch @@ -1,5 +1,5 @@ diff --git a/CMake/config.cmake b/CMake/config.cmake -index 4483900..dfef016 100644 +index 6b9eba8..e465709 100644 --- a/CMake/config.cmake +++ b/CMake/config.cmake @@ -171,6 +171,5 @@ if (BUILD_INSTALLER) @@ -7,24 +7,24 @@ index 4483900..dfef016 100644 install(FILES "${LICENSE_FILE}" "${README_FILE}" - DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR} -- PERMISSIONS OWNER_READ) +- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR}) endif() diff --git a/CMake/utility.cmake b/CMake/utility.cmake -index 7e1f677..a3932ae 100644 +index cd1e835..8e7a0c6 100644 --- a/CMake/utility.cmake +++ b/CMake/utility.cmake @@ -165,7 +165,7 @@ function(loadFolder FOLDER _HEADER_FILES _SOURCE_FILES) getNameOfDir(CMAKE_CURRENT_SOURCE_DIR DIRNAME) if (${shouldInstall}) if (NOT ${FULL_HEADER_PATH} MATCHES ".*_p.h$") # we don't want to install header files which are marked as private -- install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ) +- install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}") endif() endif() endforeach() diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index bacb280..a92d642 100644 +index de70600..a92d642 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -132,12 +132,10 @@ set_target_properties(doc PROPERTIES FOLDER "Documentation") @@ -32,12 +32,12 @@ index bacb280..a92d642 100644 install(DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_CUSTOM_HTML_DIR}" DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}" - PATTERN "*.*" -- PERMISSIONS OWNER_READ) +- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + PATTERN "*.*") install(FILES "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_INDEX_FILE}" - DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}" -- PERMISSIONS OWNER_READ) +- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) + DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}") ######################################################################################### diff --git a/ports/rttr/support-cpp20.patch b/ports/rttr/support-cpp20.patch new file mode 100644 index 00000000000000..efe2bb2096ec4d --- /dev/null +++ b/ports/rttr/support-cpp20.patch @@ -0,0 +1,13 @@ +diff --git a/src/rttr/detail/misc/flat_map.h b/src/rttr/detail/misc/flat_map.h +index 767c97b..ba97cc7 100644 +--- a/src/rttr/detail/misc/flat_map.h ++++ b/src/rttr/detail/misc/flat_map.h +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include // _LIBCPP_VERSION ++//#include // _LIBCPP_VERSION + + namespace rttr + { diff --git a/ports/rttr/vcpkg.json b/ports/rttr/vcpkg.json index 416c3ebbec88a6..d662479d8db8e3 100644 --- a/ports/rttr/vcpkg.json +++ b/ports/rttr/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rttr", - "version": "0.9.6", - "port-version": 5, + "version": "0.9.6+20210811", "description": "an easy and intuitive way to use reflection in C++", "homepage": "https://github.com/rttrorg/rttr", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 52376ab16b898a..3275029f7bf5ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6945,8 +6945,8 @@ "port-version": 2 }, "rttr": { - "baseline": "0.9.6", - "port-version": 5 + "baseline": "0.9.6+20210811", + "port-version": 0 }, "rubberband": { "baseline": "3.1.1", diff --git a/versions/r-/rttr.json b/versions/r-/rttr.json index 6841b448928f40..3b9152abe496c4 100644 --- a/versions/r-/rttr.json +++ b/versions/r-/rttr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ffc39ab74d691e75378b2c16aee3fe0e43fc527", + "version": "0.9.6+20210811", + "port-version": 0 + }, { "git-tree": "2a535fc9ac44aea50a9e4f41a4698b86b1a2e747", "version": "0.9.6", From 9ff04eaeed7bef943aefa9a83c187b13feb85ae6 Mon Sep 17 00:00:00 2001 From: Cheney-Wang <850426846@qq.com> Date: Thu, 23 Feb 2023 01:24:50 -0800 Subject: [PATCH 2/2] Modify name of patch --- .../{support-cpp20.patch => disable-unsupport-header.patch} | 0 versions/r-/rttr.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename ports/rttr/{support-cpp20.patch => disable-unsupport-header.patch} (100%) diff --git a/ports/rttr/support-cpp20.patch b/ports/rttr/disable-unsupport-header.patch similarity index 100% rename from ports/rttr/support-cpp20.patch rename to ports/rttr/disable-unsupport-header.patch diff --git a/versions/r-/rttr.json b/versions/r-/rttr.json index 3b9152abe496c4..7149a6df7a557d 100644 --- a/versions/r-/rttr.json +++ b/versions/r-/rttr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1ffc39ab74d691e75378b2c16aee3fe0e43fc527", + "git-tree": "efee986c87a05c8b3257d2aa4d793441af9e970f", "version": "0.9.6+20210811", "port-version": 0 },