From 822e754cafdc5a32c80c97ca015cd6f9008329c3 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Tue, 24 Dec 2024 14:38:53 -0500
Subject: Rename, cleanup and pass on readability

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 subprojects/libalabaster.wrap                      |  2 +-
 subprojects/libcurl.wrap                           |  2 +-
 subprojects/libev.wrap                             |  2 +-
 .../packagefiles/libev/libev_aki_thread_sleep.diff | 37 ----------------------
 .../packagefiles/libev/libev_nn_thread_sleep.diff  | 37 ++++++++++++++++++++++
 5 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 subprojects/packagefiles/libev/libev_aki_thread_sleep.diff
 create mode 100644 subprojects/packagefiles/libev/libev_nn_thread_sleep.diff

(limited to 'subprojects')

diff --git a/subprojects/libalabaster.wrap b/subprojects/libalabaster.wrap
index c0358cf..206e02f 100644
--- a/subprojects/libalabaster.wrap
+++ b/subprojects/libalabaster.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url = https://git.akon.city/libalabaster
-revision = master
+revision = 42c161bbeb30c17c1ef39f84e13e54ff207f09da
 depth = 1
diff --git a/subprojects/libcurl.wrap b/subprojects/libcurl.wrap
index c432a53..918eaff 100644
--- a/subprojects/libcurl.wrap
+++ b/subprojects/libcurl.wrap
@@ -1,5 +1,5 @@
 [wrap-git]
 url = https://github.com/curl/curl.git
-revision = curl-8_5_0
+revision = curl-8_11_1
 depth = 1
 method = cmake
diff --git a/subprojects/libev.wrap b/subprojects/libev.wrap
index 56b5299..8705cd1 100644
--- a/subprojects/libev.wrap
+++ b/subprojects/libev.wrap
@@ -6,7 +6,7 @@ source_filename = libev-4.33.tar.gz
 source_hash = 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea
 
 patch_directory = libev
-diff_files = libev/libev_aki_thread_sleep.diff, libev/no_extern_on_init.diff, libev/no_monotonic.diff
+diff_files = libev/libev_nn_thread_sleep.diff, libev/no_extern_on_init.diff, libev/no_monotonic.diff
 
 [provide]
 dependency_names = libev
diff --git a/subprojects/packagefiles/libev/libev_aki_thread_sleep.diff b/subprojects/packagefiles/libev/libev_aki_thread_sleep.diff
deleted file mode 100644
index 59d197c..0000000
--- a/subprojects/packagefiles/libev/libev_aki_thread_sleep.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/ev.c 2020-03-18 08:27:32.000000000 -0400
-+++ b/ev.c 2024-01-16 15:42:39.360703755 -0400
-@@ -216,6 +216,8 @@
- 
- #include <signal.h>
- 
-+#include <aki/thread.h>
-+
- #ifdef EV_H
- # include EV_H
- #else
-@@ -2216,24 +2218,7 @@
- {
-   if (delay > EV_TS_CONST (0.))
-     {
--#if EV_USE_NANOSLEEP
--      struct timespec ts;
--
--      EV_TS_SET (ts, delay);
--      nanosleep (&ts, 0);
--#elif defined _WIN32
--      /* maybe this should round up, as ms is very low resolution */
--      /* compared to select (µs) or nanosleep (ns) */
--      Sleep ((unsigned long)(EV_TS_TO_MSEC (delay)));
--#else
--      struct timeval tv;
--
--      /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
--      /* something not guaranteed by newer posix versions, but guaranteed */
--      /* by older ones */
--      EV_TV_SET (tv, delay);
--      select (0, 0, 0, 0, &tv);
--#endif
-+      aki_thread_sleep (delay);
-     }
- }
- 
diff --git a/subprojects/packagefiles/libev/libev_nn_thread_sleep.diff b/subprojects/packagefiles/libev/libev_nn_thread_sleep.diff
new file mode 100644
index 0000000..527f555
--- /dev/null
+++ b/subprojects/packagefiles/libev/libev_nn_thread_sleep.diff
@@ -0,0 +1,37 @@
+--- a/ev.c 2020-03-18 08:27:32.000000000 -0400
++++ b/ev.c 2024-01-16 15:42:39.360703755 -0400
+@@ -216,6 +216,8 @@
+ 
+ #include <signal.h>
+ 
++#include <nnwt/thread.h>
++
+ #ifdef EV_H
+ # include EV_H
+ #else
+@@ -2216,24 +2218,7 @@
+ {
+   if (delay > EV_TS_CONST (0.))
+     {
+-#if EV_USE_NANOSLEEP
+-      struct timespec ts;
+-
+-      EV_TS_SET (ts, delay);
+-      nanosleep (&ts, 0);
+-#elif defined _WIN32
+-      /* maybe this should round up, as ms is very low resolution */
+-      /* compared to select (µs) or nanosleep (ns) */
+-      Sleep ((unsigned long)(EV_TS_TO_MSEC (delay)));
+-#else
+-      struct timeval tv;
+-
+-      /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
+-      /* something not guaranteed by newer posix versions, but guaranteed */
+-      /* by older ones */
+-      EV_TV_SET (tv, delay);
+-      select (0, 0, 0, 0, &tv);
+-#endif
++      nn_thread_sleep (delay);
+     }
+ }
+ 
-- 
cgit v1.2.3-101-g0448