From 70426e7d9103355873ef80a845a2ec90b93b5f6d Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Sat, 12 Jun 2021 18:25:47 +0200 Subject: [PATCH 01/13] Add RmlUi port --- ports/rmlui/portfile.cmake | 35 +++++++++++++++++++++++++++++++++++ ports/rmlui/vcpkg.json | 25 +++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 ports/rmlui/portfile.cmake create mode 100644 ports/rmlui/vcpkg.json diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake new file mode 100644 index 00000000000000..a259fc200ee7ae --- /dev/null +++ b/ports/rmlui/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mikke89/RmlUi + REF 4.0 + SHA512 b1c8dc48ce3c1ef8e53c7e8d0aa830eec5b968bb3ff7cd778067627de649b45c1a72adfcd168d0ca36018455b6b2a740324cec63304ec4e66dd859ef9d64f674 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + lua BUILD_LUA_BINDINGS + INVERTED_FEATURES + freetype NO_FONT_INTERFACE_DEFAULT +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets( + CONFIG_PATH lib/RmlUi/cmake +) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/RmlUi + ${CURRENT_PACKAGES_DIR}/lib/RmlUi +) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json new file mode 100644 index 00000000000000..3e0216a9c17d65 --- /dev/null +++ b/ports/rmlui/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "rmlui", + "version": "4.0", + "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", + "homepage": "https://github.com/mikke89/RmlUi", + "documentation": "https://mikke89.github.io/RmlUiDoc/", + "license": "MIT", + "default-features": [ + "freetype" + ], + "features": { + "freetype": { + "description": "Include font engine based on FreeType", + "dependencies": [ + "freetype" + ] + }, + "lua": { + "description": "Build Lua bindings", + "dependencies": [ + "lua" + ] + } + } +} From 8342554d7c14d44cbfd6494bb6eea28744fbc001 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Sat, 12 Jun 2021 18:27:07 +0200 Subject: [PATCH 02/13] Update versions --- versions/baseline.json | 4 ++++ versions/r-/rmlui.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/r-/rmlui.json diff --git a/versions/baseline.json b/versions/baseline.json index 8c59d3e7dd1741..35f8a879f35bae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5516,6 +5516,10 @@ "baseline": "0.3.0", "port-version": 0 }, + "rmlui": { + "baseline": "4.0", + "port-version": 0 + }, "roaring": { "baseline": "2019-03-05-2", "port-version": 0 diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json new file mode 100644 index 00000000000000..0144ca849e9fd1 --- /dev/null +++ b/versions/r-/rmlui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "483a59eb557575499a02d26c1c77c8c479f0b34a", + "version": "4.0", + "port-version": 0 + } + ] +} From 6962f63abbeb0f7aa51e7a8382fb2f4fd5ee8831 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Sun, 13 Jun 2021 01:38:07 +0200 Subject: [PATCH 03/13] Fix uwp build --- ports/rmlui/fix-uwp.patch | 12 ++++++++++++ ports/rmlui/portfile.cmake | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 ports/rmlui/fix-uwp.patch diff --git a/ports/rmlui/fix-uwp.patch b/ports/rmlui/fix-uwp.patch new file mode 100644 index 00000000000000..003672a8f107a6 --- /dev/null +++ b/ports/rmlui/fix-uwp.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7280464e..e03f667c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -297,6 +297,7 @@ macro(add_common_target_options NAME) + endif() + elseif(MSVC) + target_compile_options(${NAME} PRIVATE /MP /W4 /w44062 /permissive-) ++ target_compile_definitions(${NAME} PRIVATE _CRT_SECURE_NO_WARNINGS) + + if(WARNINGS_AS_ERRORS) + target_compile_options(${NAME} PRIVATE /WX) diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index a259fc200ee7ae..47df12fafde0d6 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 4.0 SHA512 b1c8dc48ce3c1ef8e53c7e8d0aa830eec5b968bb3ff7cd778067627de649b45c1a72adfcd168d0ca36018455b6b2a740324cec63304ec4e66dd859ef9d64f674 HEAD_REF master + PATCHES + fix-uwp.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS From 54e18d2133ba5ae08220c8e5e3791675f488cc85 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Sun, 13 Jun 2021 01:54:30 +0200 Subject: [PATCH 04/13] Update versions --- versions/r-/rmlui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index 0144ca849e9fd1..e2b8f9a642201b 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "483a59eb557575499a02d26c1c77c8c479f0b34a", + "git-tree": "2533e0b991fb493e304aef1e706e70d9afd1f3e4", "version": "4.0", "port-version": 0 } From 55e4608e9611a49ee9194318962a7b8c58179cb0 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Tue, 15 Jun 2021 19:35:50 +0200 Subject: [PATCH 05/13] Add maintainers to manifest --- ports/rmlui/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json index 3e0216a9c17d65..2f0f22089444bf 100644 --- a/ports/rmlui/vcpkg.json +++ b/ports/rmlui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rmlui", "version": "4.0", + "maintainers": "Michael R. P. Ragazzon ", "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", "homepage": "https://github.com/mikke89/RmlUi", "documentation": "https://mikke89.github.io/RmlUiDoc/", From c2d2e7ca79b1a60b00d7ba828a255c92b05a5c12 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Tue, 15 Jun 2021 19:37:34 +0200 Subject: [PATCH 06/13] Update version --- versions/r-/rmlui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index e2b8f9a642201b..8e3f6869efacff 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2533e0b991fb493e304aef1e706e70d9afd1f3e4", + "git-tree": "81009f0952c6bc37ce0246d2ff7e67fcbed76a13", "version": "4.0", "port-version": 0 } From 5ad9e30308f0c7fb1f37a22dec50ed11df74027b Mon Sep 17 00:00:00 2001 From: "Michael R. P. Ragazzon" Date: Fri, 18 Jun 2021 23:32:16 +0200 Subject: [PATCH 07/13] Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat --- ports/rmlui/portfile.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index 47df12fafde0d6..59f140d852755a 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -22,10 +22,11 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/RmlUi/cmake +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/${PORT}/cmake ) + vcpkg_copy_pdbs() file(REMOVE_RECURSE From 58dfadbbee03186eb0e23df42b023045bb964b5d Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Sat, 19 Jun 2021 13:36:59 +0200 Subject: [PATCH 08/13] - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. --- ports/rmlui/fix-uwp.patch | 12 --------- ports/rmlui/portfile.cmake | 55 +++++++++++++++++++++++++------------- ports/rmlui/vcpkg.json | 12 +++++++-- versions/baseline.json | 2 +- versions/r-/rmlui.json | 4 +-- 5 files changed, 50 insertions(+), 35 deletions(-) delete mode 100644 ports/rmlui/fix-uwp.patch diff --git a/ports/rmlui/fix-uwp.patch b/ports/rmlui/fix-uwp.patch deleted file mode 100644 index 003672a8f107a6..00000000000000 --- a/ports/rmlui/fix-uwp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7280464e..e03f667c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -297,6 +297,7 @@ macro(add_common_target_options NAME) - endif() - elseif(MSVC) - target_compile_options(${NAME} PRIVATE /MP /W4 /w44062 /permissive-) -+ target_compile_definitions(${NAME} PRIVATE _CRT_SECURE_NO_WARNINGS) - - if(WARNINGS_AS_ERRORS) - target_compile_options(${NAME} PRIVATE /WX) diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index 59f140d852755a..49a73a69d2b353 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -1,32 +1,51 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mikke89/RmlUi - REF 4.0 - SHA512 b1c8dc48ce3c1ef8e53c7e8d0aa830eec5b968bb3ff7cd778067627de649b45c1a72adfcd168d0ca36018455b6b2a740324cec63304ec4e66dd859ef9d64f674 - HEAD_REF master - PATCHES - fix-uwp.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO mikke89/RmlUi + REF 4.1 + SHA512 f79bd30104c42469142e4c79a81f120c61f5bd3ae918df9847fa42d05fcda372d3adb5f6884c81c8517a440a81235e70ffcdde8d98751a14d2e4265fc2051a01 + HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - lua BUILD_LUA_BINDINGS - INVERTED_FEATURES - freetype NO_FONT_INTERFACE_DEFAULT + FEATURES + lua BUILD_LUA_BINDINGS + INVERTED_FEATURES + freetype NO_FONT_INTERFACE_DEFAULT ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - ${FEATURE_OPTIONS} +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${SOURCE_PATH}/Include/RmlUi/Core/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + vcpkg_replace_string(${SOURCE_PATH}/Include/RmlUi/Debugger/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + if ("lua" IN_LIST FEATURES) + vcpkg_replace_string(${SOURCE_PATH}/Include/RmlUi/Lua/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + endif() +endif() + +# Replace built-in thirdparty header +file(COPY + ${CURRENT_INSTALLED_DIR}/include/robin_hood.h + DESTINATION ${SOURCE_PATH}/Include/RmlUi/Core/Containers +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup( - CONFIG_PATH lib/${PORT}/cmake + CONFIG_PATH lib/${PORT}/cmake ) - vcpkg_copy_pdbs() file(REMOVE_RECURSE diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json index 2f0f22089444bf..9b42867c63570c 100644 --- a/ports/rmlui/vcpkg.json +++ b/ports/rmlui/vcpkg.json @@ -1,11 +1,16 @@ { "name": "rmlui", - "version": "4.0", + "version": "4.1", "maintainers": "Michael R. P. Ragazzon ", "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", "homepage": "https://github.com/mikke89/RmlUi", "documentation": "https://mikke89.github.io/RmlUiDoc/", "license": "MIT", + "dependencies": [ + "robin-hood-hashing", + "vcpkg-cmake", + "vcpkg-cmake-config" + ], "default-features": [ "freetype" ], @@ -13,7 +18,10 @@ "freetype": { "description": "Include font engine based on FreeType", "dependencies": [ - "freetype" + { + "name": "freetype", + "default-features": false + } ] }, "lua": { diff --git a/versions/baseline.json b/versions/baseline.json index 35f8a879f35bae..c704530483a546 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5517,7 +5517,7 @@ "port-version": 0 }, "rmlui": { - "baseline": "4.0", + "baseline": "4.1", "port-version": 0 }, "roaring": { diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index 8e3f6869efacff..f5ae672dc6d01d 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "81009f0952c6bc37ce0246d2ff7e67fcbed76a13", - "version": "4.0", + "git-tree": "effa64bec2685d140db8d4662d65ec20bbf88943", + "version": "4.1", "port-version": 0 } ] From 3678481189033a577e14c63de7fb2d977644fb44 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Sat, 19 Jun 2021 14:05:47 +0200 Subject: [PATCH 09/13] Fix config name --- ports/rmlui/portfile.cmake | 2 +- versions/r-/rmlui.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index 49a73a69d2b353..dfc91ccad17e6a 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -44,7 +44,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup( - CONFIG_PATH lib/${PORT}/cmake + CONFIG_PATH lib/RmlUi/cmake ) vcpkg_copy_pdbs() diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index f5ae672dc6d01d..9e43a28a67eaed 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "effa64bec2685d140db8d4662d65ec20bbf88943", + "git-tree": "d78c2413a06d4b4926c2e5453dc6f11f057822f7", "version": "4.1", "port-version": 0 } From e1b708f5e1be44db5b6590e18f2be239aafa5653 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Mon, 21 Jun 2021 21:50:42 +0200 Subject: [PATCH 10/13] Change source in current packages directory --- ports/rmlui/portfile.cmake | 34 +++++++++++++++++----------------- versions/r-/rmlui.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index dfc91ccad17e6a..1c3ca401d02c54 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -13,23 +13,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS freetype NO_FONT_INTERFACE_DEFAULT ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${SOURCE_PATH}/Include/RmlUi/Core/Header.h - "#if !defined RMLUI_STATIC_LIB" - "#if 0" - ) - vcpkg_replace_string(${SOURCE_PATH}/Include/RmlUi/Debugger/Header.h - "#if !defined RMLUI_STATIC_LIB" - "#if 0" - ) - if ("lua" IN_LIST FEATURES) - vcpkg_replace_string(${SOURCE_PATH}/Include/RmlUi/Lua/Header.h - "#if !defined RMLUI_STATIC_LIB" - "#if 0" - ) - endif() -endif() - # Replace built-in thirdparty header file(COPY ${CURRENT_INSTALLED_DIR}/include/robin_hood.h @@ -54,4 +37,21 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/RmlUi ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Core/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Debugger/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + if ("lua" IN_LIST FEATURES) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Lua/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + endif() +endif() + file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index 9e43a28a67eaed..bef7017ef65ede 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d78c2413a06d4b4926c2e5453dc6f11f057822f7", + "git-tree": "bacb4a2c8c0e4021e52d10b15549580ae9509f3a", "version": "4.1", "port-version": 0 } From 31f74c15dde4dc300890cc0bfd357e2ff327c5ca Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Wed, 23 Jun 2021 00:13:36 +0200 Subject: [PATCH 11/13] Use robin_hood.h included from vcpkg --- ports/rmlui/add-robin-hood.patch | 13 +++++++++++++ ports/rmlui/portfile.cmake | 15 +++++++++++---- versions/r-/rmlui.json | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 ports/rmlui/add-robin-hood.patch diff --git a/ports/rmlui/add-robin-hood.patch b/ports/rmlui/add-robin-hood.patch new file mode 100644 index 00000000000000..1e804e86debead --- /dev/null +++ b/ports/rmlui/add-robin-hood.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62432f1..d9287c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -387,6 +387,8 @@ if( ENABLE_SVG_PLUGIN ) + message("-- Can SVG plugin be enabled - yes - lunasvg library found") + endif() + ++find_path(ROBIN_HOOD_INCLUDE_DIR robin_hood.h) ++include_directories(${ROBIN_HOOD_INCLUDE_DIR}) + + if(NOT BUILD_FRAMEWORK) + #=================================== diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index 1c3ca401d02c54..9fb50c0e2cceca 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 4.1 SHA512 f79bd30104c42469142e4c79a81f120c61f5bd3ae918df9847fa42d05fcda372d3adb5f6884c81c8517a440a81235e70ffcdde8d98751a14d2e4265fc2051a01 HEAD_REF master + PATCHES + add-robin-hood.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -13,10 +15,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS freetype NO_FONT_INTERFACE_DEFAULT ) -# Replace built-in thirdparty header -file(COPY - ${CURRENT_INSTALLED_DIR}/include/robin_hood.h - DESTINATION ${SOURCE_PATH}/Include/RmlUi/Core/Containers +# Replace built-in header with vcpkg version (from robin-hood-hashing port) +file(REMOVE ${SOURCE_PATH}/Include/RmlUi/Core/Containers/robin_hood.h) +vcpkg_replace_string( ${SOURCE_PATH}/Include/RmlUi/Config/Config.h + "#include \"../Core/Containers/robin_hood.h\"" + "#include " +) +vcpkg_replace_string( ${SOURCE_PATH}/CMake/FileList.cmake + "\${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h" + "" ) vcpkg_cmake_configure( diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index bef7017ef65ede..b2369c16ad3115 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bacb4a2c8c0e4021e52d10b15549580ae9509f3a", + "git-tree": "bdbc92f47a3b315385d4389e4109ffb4b9c68bfd", "version": "4.1", "port-version": 0 } From 67c2f3126a451d00a3c90199f0d69cef99d22811 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Wed, 23 Jun 2021 20:21:31 +0200 Subject: [PATCH 12/13] Move source modifications to robin_hood patch --- ports/rmlui/add-robin-hood.patch | 25 +++++++++++++++++++++++++ ports/rmlui/portfile.cmake | 10 +--------- versions/r-/rmlui.json | 2 +- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/ports/rmlui/add-robin-hood.patch b/ports/rmlui/add-robin-hood.patch index 1e804e86debead..c823b3249c24b0 100644 --- a/ports/rmlui/add-robin-hood.patch +++ b/ports/rmlui/add-robin-hood.patch @@ -11,3 +11,28 @@ index 62432f1..d9287c9 100644 if(NOT BUILD_FRAMEWORK) #=================================== +diff --git a/cmake/FileList.cmake b/cmake/FileList.cmake +index 9c3042c..c3820df 100644 +--- a/cmake/FileList.cmake ++++ b/cmake/FileList.cmake +@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp +- ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h +diff --git a/include/RmlUi/Config/Config.h b/include/RmlUi/Config/Config.h +index dc42753..5249e1d 100644 +--- a/include/RmlUi/Config/Config.h ++++ b/include/RmlUi/Config/Config.h +@@ -57,7 +57,7 @@ + #else + #include "../Core/Containers/chobo/flat_map.hpp" + #include "../Core/Containers/chobo/flat_set.hpp" +-#include "../Core/Containers/robin_hood.h" ++#include + #endif // RMLUI_NO_THIRDPARTY_CONTAINERS + + namespace Rml { diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index 9fb50c0e2cceca..cf9ec6f057002d 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -15,16 +15,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS freetype NO_FONT_INTERFACE_DEFAULT ) -# Replace built-in header with vcpkg version (from robin-hood-hashing port) +# Remove built-in header, instead we use vcpkg version (from robin-hood-hashing port) file(REMOVE ${SOURCE_PATH}/Include/RmlUi/Core/Containers/robin_hood.h) -vcpkg_replace_string( ${SOURCE_PATH}/Include/RmlUi/Config/Config.h - "#include \"../Core/Containers/robin_hood.h\"" - "#include " -) -vcpkg_replace_string( ${SOURCE_PATH}/CMake/FileList.cmake - "\${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h" - "" -) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index b2369c16ad3115..f252d8a947574b 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bdbc92f47a3b315385d4389e4109ffb4b9c68bfd", + "git-tree": "b2fc0fe7017125c9bd790e2fbee3dc7785d2a876", "version": "4.1", "port-version": 0 } From eaa98975398b1ddc0ba842004705c1e5bd5916c9 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Thu, 24 Jun 2021 21:04:21 +0200 Subject: [PATCH 13/13] Fix path in patch --- ports/rmlui/add-robin-hood.patch | 30 +++++++++++++++--------------- versions/r-/rmlui.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ports/rmlui/add-robin-hood.patch b/ports/rmlui/add-robin-hood.patch index c823b3249c24b0..4a39a8a5a1aa96 100644 --- a/ports/rmlui/add-robin-hood.patch +++ b/ports/rmlui/add-robin-hood.patch @@ -1,3 +1,15 @@ +diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake +index 9c3042c..c3820df 100644 +--- a/CMake/FileList.cmake ++++ b/CMake/FileList.cmake +@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp +- ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 62432f1..d9287c9 100644 --- a/CMakeLists.txt @@ -11,22 +23,10 @@ index 62432f1..d9287c9 100644 if(NOT BUILD_FRAMEWORK) #=================================== -diff --git a/cmake/FileList.cmake b/cmake/FileList.cmake -index 9c3042c..c3820df 100644 ---- a/cmake/FileList.cmake -+++ b/cmake/FileList.cmake -@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES - ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h - ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp - ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp -- ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h - ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h - ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h - ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h -diff --git a/include/RmlUi/Config/Config.h b/include/RmlUi/Config/Config.h +diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h index dc42753..5249e1d 100644 ---- a/include/RmlUi/Config/Config.h -+++ b/include/RmlUi/Config/Config.h +--- a/Include/RmlUi/Config/Config.h ++++ b/Include/RmlUi/Config/Config.h @@ -57,7 +57,7 @@ #else #include "../Core/Containers/chobo/flat_map.hpp" diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index f252d8a947574b..f3c15b656f8e82 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b2fc0fe7017125c9bd790e2fbee3dc7785d2a876", + "git-tree": "83f463f3ebcc4e415d6903bea260fb1601a14dd2", "version": "4.1", "port-version": 0 }