diff mbox series

[meta-oe,08/10] pcapplusplus: upgrade 24.09 -> 25.05

Message ID 20250711100052.255467-9-Moritz.Haase@bmw.de
State Under Review
Headers show
Series Patches to allow builds with CMake 4+ | expand

Commit Message

Moritz Haase July 11, 2025, 10 a.m. UTC 
New version includes support to build against CMake 4+.

Release notes are available at [0].

[0]: https://github.com/seladb/PcapPlusPlus/releases/tag/v25.05

Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
---
 ...-Remove-whitespace-in-operator-_json.patch | 52 -------------------
 ...lusplus_24.09.bb => pcapplusplus_25.05.bb} |  6 +--
 2 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch
 rename meta-oe/recipes-connectivity/pcapplusplus/{pcapplusplus_24.09.bb => pcapplusplus_25.05.bb} (83%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch
deleted file mode 100644
index fb793548a2..0000000000
--- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-Remove-whitespace-in-operator-_json.patch
+++ /dev/null
@@ -1,52 +0,0 @@ 
-From 16974cb6a9f10fbd08db964ee0d9f074ef430db6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 7 Mar 2025 11:55:12 -0800
-Subject: [PATCH] Remove whitespace in operator"" _json
-
-Clang 20+ errors about this whitespace.
-
-Fixes
-git/3rdParty/json/include/json.hpp:24428:58: error: identifier '_json' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator]
- 24428 |     using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
-       |                                              ~~~~~~~~~~~~^~~~~
-       |                                              operator""_json
-
-Upstream-Status: Backport [ Its fixed in json import post 2024.9 release ]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- 3rdParty/json/include/json.hpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/3rdParty/json/include/json.hpp b/3rdParty/json/include/json.hpp
-index 60ba1df..6eceb7c 100644
---- a/3rdParty/json/include/json.hpp
-+++ b/3rdParty/json/include/json.hpp
-@@ -24353,7 +24353,7 @@ inline namespace json_literals
- /// @brief user-defined string literal for JSON values
- /// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
- JSON_HEDLEY_NON_NULL(1)
--inline nlohmann::json operator "" _json(const char* s, std::size_t n)
-+inline nlohmann::json operator ""_json(const char* s, std::size_t n)
- {
-     return nlohmann::json::parse(s, s + n);
- }
-@@ -24361,7 +24361,7 @@ inline nlohmann::json operator "" _json(const char* s, std::size_t n)
- /// @brief user-defined string literal for JSON pointer
- /// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
- JSON_HEDLEY_NON_NULL(1)
--inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
-+inline nlohmann::json::json_pointer operator ""_json_pointer(const char* s, std::size_t n)
- {
-     return nlohmann::json::json_pointer(std::string(s, n));
- }
-@@ -24425,8 +24425,8 @@ inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC
- }  // namespace std
- 
- #if JSON_USE_GLOBAL_UDLS
--    using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
--    using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
-+    using nlohmann::literals::json_literals::operator ""_json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
-+    using nlohmann::literals::json_literals::operator ""_json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
- #endif
- 
- // #include <nlohmann/detail/macro_unscope.hpp>
diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_24.09.bb b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_25.05.bb
similarity index 83%
rename from meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_24.09.bb
rename to meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_25.05.bb
index a04102aa42..aa5fb8d417 100644
--- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_24.09.bb
+++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_25.05.bb
@@ -7,10 +7,8 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f"
 
 DEPENDS = "libpcap"
 
-SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master \
-           file://0001-Remove-whitespace-in-operator-_json.patch \
-          "
-SRCREV = "4af4b8b04e6d5dd40b8e69cc30c5c1f62e7fe368"
+SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "a49a79e0b67b402ad75ffa96c1795def36df75c8"
 
 
 inherit cmake