From 83c78971e25cd94cd071c0d8ded0ef42b8edacea Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 11 May 2021 18:55:59 +0200 Subject: [PATCH] Ports: Fix building the libicu port If you're on the new toolchain with std support already you'd be unable to build libicu because #undefs some of the defines from (e.g. isfinite). --- Ports/libicu/patches/std.patch | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Ports/libicu/patches/std.patch diff --git a/Ports/libicu/patches/std.patch b/Ports/libicu/patches/std.patch new file mode 100644 index 00000000000..81fc15f6a98 --- /dev/null +++ b/Ports/libicu/patches/std.patch @@ -0,0 +1,48 @@ +diff -Naur source/i18n/decimfmt.cpp source.serenity/i18n/decimfmt.cpp +--- source/i18n/decimfmt.cpp 2021-05-11 18:48:28.172956656 +0200 ++++ source.serenity/i18n/decimfmt.cpp 2021-05-11 18:47:42.222070235 +0200 +@@ -9,7 +9,7 @@ + // Helpful in toString methods and elsewhere. + #define UNISTR_FROM_STRING_EXPLICIT + +-#include ++#include + #include + #include + #include "unicode/errorcode.h" +diff -Naur source/i18n/number_decimalquantity.cpp source.serenity/i18n/number_decimalquantity.cpp +--- source/i18n/number_decimalquantity.cpp 2021-05-11 18:48:28.172956656 +0200 ++++ source.serenity/i18n/number_decimalquantity.cpp 2021-05-11 18:48:02.715798916 +0200 +@@ -6,7 +6,7 @@ + #if !UCONFIG_NO_FORMATTING + + #include +-#include ++#include + #include + #include + +diff -Naur source/i18n/number_utils.cpp source.serenity/i18n/number_utils.cpp +--- source/i18n/number_utils.cpp 2021-05-11 18:48:28.172956656 +0200 ++++ source.serenity/i18n/number_utils.cpp 2021-05-11 18:47:22.298352531 +0200 +@@ -10,7 +10,7 @@ + #define UNISTR_FROM_STRING_EXPLICIT + + #include +-#include ++#include + #include "number_decnum.h" + #include "number_types.h" + #include "number_utils.h" +diff -Naur source/i18n/reldatefmt.cpp source.serenity/i18n/reldatefmt.cpp +--- source/i18n/reldatefmt.cpp 2021-05-11 18:48:28.172956656 +0200 ++++ source.serenity/i18n/reldatefmt.cpp 2021-05-11 18:46:45.380973593 +0200 +@@ -14,7 +14,7 @@ + + #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_BREAK_ITERATION + +-#include ++#include + #include + #include "unicode/dtfmtsym.h" + #include "unicode/ucasemap.h"