ja2_stracciatella, add forgotten update on patchset (#13005)

This commit is contained in:
Schrijvers Luc
2025-10-03 13:24:25 +02:00
committed by GitHub
parent 0b666c6f5e
commit 450958b434

View File

@@ -1,4 +1,4 @@
From 266bb25d6e0ef56a8cad4e27bda06046813ef9f8 Mon Sep 17 00:00:00 2001
From 97de5d969dd313ec9f6ff8d6fd0ed2ffe0f6c7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 7 Jun 2017 07:54:07 +0200
Subject: PATCH: LC_ALL not defined on Haiku
@@ -22,10 +22,10 @@ index 033105e..4ce6808 100644
#if defined BROKEN_SWPRINTF
--
2.37.3
2.50.1
From 523f093a27b4ae15826a6c876e9b3d2a38ff4666 Mon Sep 17 00:00:00 2001
From 309cdbb6de79e1aac022f9e5434797e6c55b6ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 7 Jun 2017 07:57:36 +0200
Subject: PATCH: dirent dirty fix
@@ -53,10 +53,10 @@ index a304a98..b6672fe 100644
// SLOGI(DEBUG_TAG_FILEMAN,"Looking for %s/[ %s ] : %s", directory, name, result ? "success" : "failure");
return result;
--
2.37.3
2.50.1
From 3489ce612eba70341aedaa0f666ea6c360f9853c Mon Sep 17 00:00:00 2001
From 227dcbefac47a55378a207f8f2f8ae6e300495ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Wed, 7 Jun 2017 17:57:57 +0200
Subject: Patch: Haiku config file location
@@ -76,10 +76,10 @@ index 582600e..6e7915e 100644
},
None => Err(String::from("Could not find home directory")),
--
2.37.3
2.50.1
From ff4e1bdef8b6c06b9794205df074e5bdc569abbf Mon Sep 17 00:00:00 2001
From 9d27f63137bc4215a2e287dee04511a7f556153b Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 6 May 2023 21:03:06 +0200
Subject: fix path for SDL2 headers
@@ -215,5 +215,26 @@ index 2158ef3..da5eef6 100644
--
2.37.3
2.50.1
From afb3722c692ceb689ffd45f3574ecbc54636532b Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Fri, 3 Oct 2025 12:23:26 +0200
Subject: Build fix
Fixes: error: 'transform' is not a member of 'std'
Fixes: error: 'sort' is not a member of 'std'; did you mean 'sqrt'?
diff --git a/src/sgp/FileMan.cc b/src/sgp/FileMan.cc
index f72da4b..e67b404 100644
--- a/src/sgp/FileMan.cc
+++ b/src/sgp/FileMan.cc
@@ -1,3 +1,4 @@
+#include <algorithm>
#include <stdexcept>
#include <errno.h>
--
2.50.1