From 40e35a2cbdb97dc5d8d9594a8c774afab4ef9eb8 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Sat, 6 Jun 2026 01:26:12 +0200 Subject: [PATCH] [rappture] fix build with c++17 (#52210) Signed-off-by: Vitalii Koshura --- ports/rappture/fix_c++17.patch | 15 +++++++++++++++ ports/rappture/portfile.cmake | 1 + ports/rappture/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rappture.json | 5 +++++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ports/rappture/fix_c++17.patch diff --git a/ports/rappture/fix_c++17.patch b/ports/rappture/fix_c++17.patch new file mode 100644 index 0000000000..33d2fdad3a --- /dev/null +++ b/ports/rappture/fix_c++17.patch @@ -0,0 +1,15 @@ +diff --git a/src/core/RpUnits.h b/src/core/RpUnits.h +index e697424..fb9b3b5 100644 +--- a/src/core/RpUnits.h ++++ b/src/core/RpUnits.h +@@ -393,9 +393,7 @@ class RpUnits + return true; + + } +- struct _key_compare: +- public +- std::binary_function { ++ struct _key_compare { + + bool operator() ( const std::string& lhs, + const std::string& rhs ) const diff --git a/ports/rappture/portfile.cmake b/ports/rappture/portfile.cmake index 7451fffa28..631fadbc92 100644 --- a/ports/rappture/portfile.cmake +++ b/ports/rappture/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive( PATCHES rappture.patch include_functional.patch + fix_c++17.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/rappture/vcpkg.json b/ports/rappture/vcpkg.json index ab94b10d50..864a2044dc 100644 --- a/ports/rappture/vcpkg.json +++ b/ports/rappture/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rappture", "version": "1.9", - "port-version": 4, + "port-version": 5, "description": "Rappture is a toolkit supporting Rapid application infrastructure, making it quick and easy to develop powerful scientific applications.", "license": null, "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d3f48c465c..1dbe069664 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8646,7 +8646,7 @@ }, "rappture": { "baseline": "1.9", - "port-version": 4 + "port-version": 5 }, "raygui": { "baseline": "4.0", diff --git a/versions/r-/rappture.json b/versions/r-/rappture.json index ffb1871baf..905671a171 100644 --- a/versions/r-/rappture.json +++ b/versions/r-/rappture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5912ed2b7fd8365575c4bd9c6318e98ddebf8de", + "version": "1.9", + "port-version": 5 + }, { "git-tree": "31376dbc3c6b3f397f76819c46c05a653c47e1ce", "version": "1.9",