From 83fe3e3ce3545cad4baba373bbbb0cd41e33b321 Mon Sep 17 00:00:00 2001 From: Frank <1433351828@qq.com> Date: Wed, 13 Mar 2024 07:21:19 +0000 Subject: [PATCH 1/6] [rttr] support android --- ports/rttr/fix-android.patch | 25 +++++++++++++++++++++++++ ports/rttr/portfile.cmake | 1 + ports/rttr/vcpkg.json | 1 + scripts/ci.baseline.txt | 3 --- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 ports/rttr/fix-android.patch diff --git a/ports/rttr/fix-android.patch b/ports/rttr/fix-android.patch new file mode 100644 index 00000000000000..ae9c4d1df6361c --- /dev/null +++ b/ports/rttr/fix-android.patch @@ -0,0 +1,25 @@ +diff --git a/src/rttr/detail/conversion/number_conversion.h b/src/rttr/detail/conversion/number_conversion.h +index ac40c63..7c04499 100644 +--- a/src/rttr/detail/conversion/number_conversion.h ++++ b/src/rttr/detail/conversion/number_conversion.h +@@ -134,9 +134,9 @@ typename std::enable_if::value && + bool>::type + convert_to(const F& from, T& to) + { +- if (from > std::numeric_limits::max()) ++ if (from > static_cast(std::numeric_limits::max())) + return false; // value too large +- else if (from < -std::numeric_limits::max()) ++ else if (from < -static_cast(std::numeric_limits::max())) + return false; // value to small + + to = static_cast(from); +@@ -151,7 +151,7 @@ typename std::enable_if::value && + bool>::type + convert_to(const F& from, T& to) + { +- if (from < 0 || from > std::numeric_limits::max()) ++ if (from < 0 || from > static_cast(std::numeric_limits::max())) + return false; // value too large + + to = static_cast(from); diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake index 92d426ac7646b5..b520738f6a516f 100644 --- a/ports/rttr/portfile.cmake +++ b/ports/rttr/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( Fix-depends.patch remove-owner-read-perms.patch disable-unsupport-header.patch + fix-android.patch ) if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") diff --git a/ports/rttr/vcpkg.json b/ports/rttr/vcpkg.json index d662479d8db8e3..26be709d0a1c36 100644 --- a/ports/rttr/vcpkg.json +++ b/ports/rttr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rttr", "version": "0.9.6+20210811", + "port-version": 1, "description": "an easy and intuitive way to use reflection in C++", "homepage": "https://github.com/rttrorg/rttr", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e5b84d3bba7f6e..3a742d0d6a9099 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1005,9 +1005,6 @@ rply:arm64-windows=skip rply:x64-linux=skip rply:x64-osx=skip rply:x64-windows-static-md=skip -rttr:arm-neon-android=fail -rttr:arm64-android=fail -rttr:x64-android=fail salome-medcoupling:x64-linux=fail scintilla:arm-neon-android=fail scintilla:arm64-android=fail From 23eb9c1efde2fc81a3e634cc30570ac5b25f0b85 Mon Sep 17 00:00:00 2001 From: Frank <1433351828@qq.com> Date: Wed, 13 Mar 2024 07:21:34 +0000 Subject: [PATCH 2/6] version --- versions/baseline.json | 2 +- versions/r-/rttr.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index d37c34cf07cd28..5383c64971a0be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7738,7 +7738,7 @@ }, "rttr": { "baseline": "0.9.6+20210811", - "port-version": 0 + "port-version": 1 }, "rubberband": { "baseline": "3.3.0", diff --git a/versions/r-/rttr.json b/versions/r-/rttr.json index 7149a6df7a557d..f1e74e17b485ab 100644 --- a/versions/r-/rttr.json +++ b/versions/r-/rttr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8bdad03bb6a947e0706f935d33037b19d3e3609", + "version": "0.9.6+20210811", + "port-version": 1 + }, { "git-tree": "efee986c87a05c8b3257d2aa4d793441af9e970f", "version": "0.9.6+20210811", From 456be5eba57ce2be944b7cd28ca19b8256d3aa95 Mon Sep 17 00:00:00 2001 From: Frank <1433351828@qq.com> Date: Mon, 18 Mar 2024 09:37:02 +0000 Subject: [PATCH 3/6] disable -Werror --- ports/rttr/fix-android.patch | 38 ++++++++++++------------------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/ports/rttr/fix-android.patch b/ports/rttr/fix-android.patch index ae9c4d1df6361c..8e9d944114fa43 100644 --- a/ports/rttr/fix-android.patch +++ b/ports/rttr/fix-android.patch @@ -1,25 +1,13 @@ -diff --git a/src/rttr/detail/conversion/number_conversion.h b/src/rttr/detail/conversion/number_conversion.h -index ac40c63..7c04499 100644 ---- a/src/rttr/detail/conversion/number_conversion.h -+++ b/src/rttr/detail/conversion/number_conversion.h -@@ -134,9 +134,9 @@ typename std::enable_if::value && - bool>::type - convert_to(const F& from, T& to) - { -- if (from > std::numeric_limits::max()) -+ if (from > static_cast(std::numeric_limits::max())) - return false; // value too large -- else if (from < -std::numeric_limits::max()) -+ else if (from < -static_cast(std::numeric_limits::max())) - return false; // value to small - - to = static_cast(from); -@@ -151,7 +151,7 @@ typename std::enable_if::value && - bool>::type - convert_to(const F& from, T& to) - { -- if (from < 0 || from > std::numeric_limits::max()) -+ if (from < 0 || from > static_cast(std::numeric_limits::max())) - return false; // value too large - - to = static_cast(from); +diff --git a/CMake/utility.cmake b/CMake/utility.cmake +index 8e7a0c6..ac5e305 100644 +--- a/CMake/utility.cmake ++++ b/CMake/utility.cmake +@@ -395,7 +395,7 @@ function( set_compiler_warnings target) + set(WARNINGS "-Werror" + "-Wall") + elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(WARNINGS "-Werror" ++ set(WARNINGS + "-Wall") + elseif(MSVC) + set(WARNINGS "/WX" From 29e3ae2f9827308a4fc1b1f52907acc80d98ca35 Mon Sep 17 00:00:00 2001 From: Frank <1433351828@qq.com> Date: Mon, 18 Mar 2024 09:37:33 +0000 Subject: [PATCH 4/6] version --- versions/r-/rttr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/r-/rttr.json b/versions/r-/rttr.json index f1e74e17b485ab..df5be9fe8b5869 100644 --- a/versions/r-/rttr.json +++ b/versions/r-/rttr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f8bdad03bb6a947e0706f935d33037b19d3e3609", + "git-tree": "73186b66927c6495377adfcc40db33a3c8de5d59", "version": "0.9.6+20210811", "port-version": 1 }, From aea90edf26387887c0765873aea9eebb7b8fcb63 Mon Sep 17 00:00:00 2001 From: Frank <1433351828@qq.com> Date: Mon, 18 Mar 2024 10:09:38 +0000 Subject: [PATCH 5/6] patch name --- ports/rttr/{fix-android.patch => disable-werrorr.patch} | 0 ports/rttr/portfile.cmake | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename ports/rttr/{fix-android.patch => disable-werrorr.patch} (100%) diff --git a/ports/rttr/fix-android.patch b/ports/rttr/disable-werrorr.patch similarity index 100% rename from ports/rttr/fix-android.patch rename to ports/rttr/disable-werrorr.patch diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake index b520738f6a516f..cbb9a155564817 100644 --- a/ports/rttr/portfile.cmake +++ b/ports/rttr/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( Fix-depends.patch remove-owner-read-perms.patch disable-unsupport-header.patch - fix-android.patch + disable-werrorr.patch ) if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") From 7b5802b9cd105b0744793bd24ab4f84f535ec1c6 Mon Sep 17 00:00:00 2001 From: Frank <1433351828@qq.com> Date: Mon, 18 Mar 2024 10:09:54 +0000 Subject: [PATCH 6/6] version --- versions/r-/rttr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/r-/rttr.json b/versions/r-/rttr.json index df5be9fe8b5869..6c0bdeb3fd5a2e 100644 --- a/versions/r-/rttr.json +++ b/versions/r-/rttr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "73186b66927c6495377adfcc40db33a3c8de5d59", + "git-tree": "942efa7d91154b3d9841608a015b1c216ca0f251", "version": "0.9.6+20210811", "port-version": 1 },