From c2f3bc16efca1d875f057bdc26723352895cea29 Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@gnu.org>
Date: Tue, 21 May 2024 02:25:43 +0200
Subject: [PATCH 1/5] misc/cirun: use $CITAG, instead of hard coding dist

Signed-off-by: Tim Janik <timj@gnu.org>
---
 misc/cirun | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/cirun b/misc/cirun
index 9098ec70..019536c0 100755
--- a/misc/cirun
+++ b/misc/cirun
@@ -36,7 +36,7 @@ while test $# -ne 0 ; do
 done
 
 # Check for existing docker image
-if $FORCE_BUILD || ! docker image inspect --format=1 cirun:focal >/dev/null 2>&1; then
+if $FORCE_BUILD || ! docker image inspect --format=1 cirun:$CITAG >/dev/null 2>&1; then
   # Utilize $CICACHE when present
   CACHETYPE=
   if test -n "${CICACHE:-}" ; then

From b76a38f5b95cf12532ac39ad845605704c8f675d Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@gnu.org>
Date: Tue, 21 May 2024 02:26:25 +0200
Subject: [PATCH 2/5] ase/*.hh: fix missing <algorithm> include

Signed-off-by: Tim Janik <timj@gnu.org>
---
 ase/callback.hh  | 1 +
 ase/eventlist.hh | 1 +
 ase/sortnet.hh   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ase/callback.hh b/ase/callback.hh
index 72ce94db..4f32a4f3 100644
--- a/ase/callback.hh
+++ b/ase/callback.hh
@@ -3,6 +3,7 @@
 #define __ASE_CALLBACK_HH__
 
 #include <ase/defs.hh>
+#include <algorithm>
 
 namespace Ase {
 
diff --git a/ase/eventlist.hh b/ase/eventlist.hh
index 8a3231af..c95b0871 100644
--- a/ase/eventlist.hh
+++ b/ase/eventlist.hh
@@ -3,6 +3,7 @@
 #define __ASE_EVENTLIST_HH__
 
 #include <ase/utils.hh>
+#include <algorithm>
 #include <any>
 
 namespace Ase {
diff --git a/ase/sortnet.hh b/ase/sortnet.hh
index bd89218a..3588ef70 100644
--- a/ase/sortnet.hh
+++ b/ase/sortnet.hh
@@ -3,6 +3,7 @@
 #define __ASE_SORTNET_HH__
 
 #include <functional>
+#include <algorithm>
 
 namespace Ase {
 

From f373e98928b55c8163225068589f3361b6d41beb Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@gnu.org>
Date: Tue, 21 May 2024 02:26:40 +0200
Subject: [PATCH 3/5] ase/*.cc: fix missing <algorithm> include

Signed-off-by: Tim Janik <timj@gnu.org>
---
 ase/driver.cc   | 1 +
 ase/memory.cc   | 1 +
 ase/path.cc     | 1 +
 ase/platform.cc | 1 +
 ase/strings.cc  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/ase/driver.cc b/ase/driver.cc
index 23366c52..56118af7 100644
--- a/ase/driver.cc
+++ b/ase/driver.cc
@@ -4,6 +4,7 @@
 #include "platform.hh"
 #include "datautils.hh"
 #include "internal.hh"
+#include <algorithm>
 
 #define DDEBUG(...)     Ase::debug ("driver", __VA_ARGS__)
 
diff --git a/ase/memory.cc b/ase/memory.cc
index 14a2b583..b80d486d 100644
--- a/ase/memory.cc
+++ b/ase/memory.cc
@@ -4,6 +4,7 @@
 #include <ase/testing.hh>
 #include <sys/mman.h>
 #include <unistd.h>     // _SC_PAGESIZE
+#include <algorithm>
 #include <shared_mutex>
 #include <atomic>
 
diff --git a/ase/path.cc b/ase/path.cc
index 6fa7136a..c1ca5e63 100644
--- a/ase/path.cc
+++ b/ase/path.cc
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <algorithm>
 #include <cstring>      // strchr
 #include <glob.h>       // glob
 #include <mutex>
diff --git a/ase/platform.cc b/ase/platform.cc
index cd59c980..b0e667a4 100644
--- a/ase/platform.cc
+++ b/ase/platform.cc
@@ -20,6 +20,7 @@
 #include <stdarg.h>
 #include <sys/types.h>
 #include <pwd.h>                // getpwuid_r
+#include <algorithm>
 
 #if defined __APPLE__
 #include <mach-o/dyld.h>        // _NSGetExecutablePath
diff --git a/ase/strings.cc b/ase/strings.cc
index 2ae1de05..4dd2e678 100644
--- a/ase/strings.cc
+++ b/ase/strings.cc
@@ -7,6 +7,7 @@
 #include <libintl.h>
 #include <iconv.h>
 #include <errno.h>
+#include <algorithm>
 
 #include <glib.h>       // g_unichar_*
 

From a2da11d677f8da7ee8de854f951cfec40ac8996f Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@gnu.org>
Date: Tue, 21 May 2024 02:57:31 +0200
Subject: [PATCH 4/5] package.json: add missing "globals" package (for eslint)

Signed-off-by: Tim Janik <timj@gnu.org>
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 46844487..88f08f21 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "eslint-plugin-unused-imports": "^3.2.0",
     "eslint-plugin-vue": "^9.25.0",
     "fork-awesome": "^1.2.0",
+    "globals": "^15.3.0",
     "icon-gen": "^4.0.0",
     "jsdoc": "^4.0.3",
     "jsdoc-api": "^8.0.0",

From 903979f3582177519b6b41945e8f12829f70f80b Mon Sep 17 00:00:00 2001
From: Tim Janik <timj@gnu.org>
Date: Tue, 21 May 2024 10:27:08 +0200
Subject: [PATCH 5/5] ase/logging.cc: add missing unistd.h include

Signed-off-by: Tim Janik <timj@gnu.org>
---
 ase/logging.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ase/logging.cc b/ase/logging.cc
index 2e87ab28..39cf6934 100644
--- a/ase/logging.cc
+++ b/ase/logging.cc
@@ -5,6 +5,7 @@
 #include <stdarg.h>
 #include <dirent.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <sys/stat.h>
 
 namespace Ase {