Skip to content

Commit 57d7b12

Browse files
passgattpetazzoni
authored andcommitted
package/oatpp: update the patches to be applied with fuzz 0
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, oatpp fails to build with output: Applying 0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch using patch: patching file src/oatpp/core/base/Environment.hpp Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- saving rejects to file src/oatpp/core/base/Environment.hpp.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]>
1 parent 758fc7e commit 57d7b12

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

package/oatpp/0001-src-oatpp-core-base-Environment.hpp-include-cstdarg.patch

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b3e8930ccbaeeb77a4cd8b0fffbe52a208aa9a29 Mon Sep 17 00:00:00 2001
1+
From 6ac376cec5c9573abf3ee3b82e71bd2b7e410dad Mon Sep 17 00:00:00 2001
22
From: Fabrice Fontaine <[email protected]>
33
Date: Thu, 23 Nov 2023 22:45:56 +0100
44
Subject: [PATCH] src/oatpp/core/base/Environment.hpp: include cstdarg
@@ -16,22 +16,24 @@ Fixes:
1616

1717
Signed-off-by: Fabrice Fontaine <[email protected]>
1818
Upstream: https://github.com/oatpp/oatpp/commit/1d11558e2cbbabc0db02a233bf00d651ce5ea758
19+
[Dario: make the patch to be applied with fuzz factor 0]
20+
Signed-off-by: Dario Binacchi <[email protected]>
1921
---
2022
src/oatpp/core/base/Environment.hpp | 1 +
2123
1 file changed, 1 insertion(+)
2224

2325
diff --git a/src/oatpp/core/base/Environment.hpp b/src/oatpp/core/base/Environment.hpp
24-
index fd77a5c6..05d5c949 100644
26+
index 984afdf2a7f5..2eb18be3e196 100644
2527
--- a/src/oatpp/core/base/Environment.hpp
2628
+++ b/src/oatpp/core/base/Environment.hpp
27-
@@ -29,6 +29,7 @@
28-
#include "./Compiler.hpp"
29+
@@ -28,6 +28,7 @@
30+
2931
#include "./Config.hpp"
30-
32+
3133
+#include <cstdarg>
3234
#include <cstdio>
3335
#include <atomic>
3436
#include <mutex>
35-
--
36-
2.42.0
37+
--
38+
2.43.0
3739

0 commit comments

Comments
 (0)