correct nanosleep patch

diff --git a/nanosleep.patch b/nanosleep.patch
index e15aab351d817c7ce43de6889d0aaad99d21d211..b9f3370539000b74fb130f52d84318ca23d72caa 100644 (file)
--- a/nanosleep.patch
+++ b/nanosleep.patch
@@ -1,31 +1,28 @@
-From cc9bc2387fe19d6cb130460defe52ee8ecefe968 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Tue, 29 Nov 2022 07:34:17 +0700
-Subject: [PATCH] stl/tuple: change uarg##N to internal linkage
+From bd98844ec4206ee34b04f0609995d2e20b83196d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Tue, 1 Nov 2022 13:06:19 +0100
+Subject: [PATCH] Added include for nanosleep
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-8b6a9c2 (std::tuple support (Resolving #103) (#104), 2021-03-11) put
-uarg##N in all translation units, which includes
-boost/phoenix/stl/tuple.hpp or boost/phoenix/stl.hpp, with external
-linkage. Thus, we'll run into below error:
+Fixed compilation on Fedora 38. Maybe better fix is to switch
+to std::this_thread::sleep_for.
 
-> multiple definition of `boost::phoenix::placeholders::uarg1'
-
-Change it to internal linkage.
+Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
 ---
- include/boost/phoenix/stl/tuple.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ lunchbox/sleep.cpp | 1 +
+ 1 file changed, 1 insertion(+)
 
-diff --git a/include/boost/phoenix/stl/tuple.hpp b/include/boost/phoenix/stl/tuple.hpp
-index a83014ac..d04ad16e 100644
---- a/include/boost/phoenix/stl/tuple.hpp
-+++ b/include/boost/phoenix/stl/tuple.hpp
-@@ -110,7 +110,7 @@ namespace boost { namespace phoenix {
-     namespace placeholders {
-         #define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT)
-         #define BOOST_PP_LOCAL_MACRO(N)                                                \
--            auto uarg##N =                                                             \
-+            const auto uarg##N =                                                       \
-             boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1);
-         #include BOOST_PP_LOCAL_ITERATE()
-     }
+diff --git a/lunchbox/sleep.cpp b/lunchbox/sleep.cpp
+index 14aa0523..885c47a0 100644
+--- a/lunchbox/sleep.cpp
++++ b/lunchbox/sleep.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include "os.h"
+ #include "time.h"
++#include <time.h>
+ 
+ namespace lunchbox
+ {