From 01c4206895faf3bc3a3c95da6610a72f57a053c6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 Dec 2025 15:42:15 +0100 Subject: [PATCH] package/oatpp: bump version to 1.3.1 Removed patch which is included in this release. Backported bump to fix cmake 4 compatibility. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- package/oatpp/0001-cmake4.patch | 22 +++++++++++ ...base-Environment.hpp-include-cstdarg.patch | 39 ------------------- package/oatpp/oatpp.hash | 2 +- package/oatpp/oatpp.mk | 2 +- 4 files changed, 24 insertions(+), 41 deletions(-) create mode 100644 package/oatpp/0001-cmake4.patch delete mode 100644 package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch diff --git a/package/oatpp/0001-cmake4.patch b/package/oatpp/0001-cmake4.patch new file mode 100644 index 0000000000..5dffdff802 --- /dev/null +++ b/package/oatpp/0001-cmake4.patch @@ -0,0 +1,22 @@ +From 06232810f7c23cc8a91864a504df412255a370b6 Mon Sep 17 00:00:00 2001 +From: Leonid Stryzhevskyi +Date: Tue, 23 Apr 2024 01:20:20 +0300 +Subject: [PATCH] refactor json namespaces + +Upstream: https://github.com/oatpp/oatpp/commit/06232810f7c23cc8a91864a504df412255a370b6 + +Signed-off-by: Bernd Kuhls +[backported only the cmake bump] +--- + CMakeLists.txt | 2 +- + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d41c8b2e..14ab71acf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.1 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.25 FATAL_ERROR) + + file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/src/oatpp/core/base/Environment.hpp" OATPP_VERSION_MACRO REGEX "#define OATPP_VERSION \"[0-9]+.[0-9]+.[0-9]+\"$") + string(REGEX REPLACE "#define OATPP_VERSION \"([0-9]+.[0-9]+.[0-9]+)\"$" "\\1" oatpp_VERSION "${OATPP_VERSION_MACRO}") diff --git a/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch b/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch deleted file mode 100644 index 33fa04a2f2..0000000000 --- a/package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6ac376cec5c9573abf3ee3b82e71bd2b7e410dad Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 23 Nov 2023 22:45:56 +0100 -Subject: [PATCH] src/oatpp/core/base/Environment.hpp: include cstdarg - -Include cstdarg to fix the following build failure with uclibc-ng: - -In file included from /home/autobuild/autobuild/instance-4/output-1/build/oatpp-1.3.0/src/oatpp/algorithm/CRC.hpp:28, - from /home/autobuild/autobuild/instance-4/output-1/build/oatpp-1.3.0/src/oatpp/algorithm/CRC.cpp:25: -/home/autobuild/autobuild/instance-4/output-1/build/oatpp-1.3.0/src/oatpp/core/base/Environment.hpp:359:93: error: 'va_list' has not been declared - 359 | static void vlogFormatted(v_uint32 priority, const std::string& tag, const char* message, va_list args); - | ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/bcdf7548ff752f936defd111d13c63245ea70cbe - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/oatpp/oatpp/commit/1d11558e2cbbabc0db02a233bf00d651ce5ea758 -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - src/oatpp/core/base/Environment.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/oatpp/core/base/Environment.hpp b/src/oatpp/core/base/Environment.hpp -index 984afdf2a7f5..2eb18be3e196 100644 ---- a/src/oatpp/core/base/Environment.hpp -+++ b/src/oatpp/core/base/Environment.hpp -@@ -28,6 +28,7 @@ - - #include "./Config.hpp" - -+#include - #include - #include - #include --- -2.43.0 - diff --git a/package/oatpp/oatpp.hash b/package/oatpp/oatpp.hash index e6b35d8d51..4afb27f012 100644 --- a/package/oatpp/oatpp.hash +++ b/package/oatpp/oatpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e1f80fa8fd7a74da6737e7fee1a4db68b4d7085a3f40e7d550752d6ff5714583 oatpp-1.3.0.tar.gz +sha256 9dd31f005ab0b3e8895a478d750d7dbce99e42750a147a3c42a9daecbddedd64 oatpp-1.3.1.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/oatpp/oatpp.mk b/package/oatpp/oatpp.mk index d3f6e1a9c2..e1ca3fb16c 100644 --- a/package/oatpp/oatpp.mk +++ b/package/oatpp/oatpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -OATPP_VERSION = 1.3.0 +OATPP_VERSION = 1.3.1 OATPP_SITE = $(call github,oatpp,oatpp,$(OATPP_VERSION)) OATPP_LICENSE = Apache-2.0 OATPP_LICENSE_FILES = LICENSE