diff --git a/www/chromium/files/patch-third__party_nasm_BUILD.gn b/www/chromium/files/patch-third__party_nasm_BUILD.gn deleted file mode 100644 --- a/www/chromium/files/patch-third__party_nasm_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/nasm/BUILD.gn.orig 2023-01-11 09:17:16 UTC -+++ third_party/nasm/BUILD.gn -@@ -63,6 +63,13 @@ config("nasm_config") { - - defines = [ "HAVE_CONFIG_H" ] - -+ _string_h_lines = -+ read_file("/usr/include/string.h", "list lines") -+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ]) -+ if (_mempcpy != []) { -+ defines += [ "HAVE_MEMPCPY=1" ] -+ } -+ - if (is_clang) { - cflags = [ - # The inline functions in NASM's headers flag this. diff --git a/www/chromium/files/patch-third__party_nasm_config_config-linux.h b/www/chromium/files/patch-third__party_nasm_config_config-linux.h --- a/www/chromium/files/patch-third__party_nasm_config_config-linux.h +++ b/www/chromium/files/patch-third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- third_party/nasm/config/config-linux.h.orig 2023-01-11 09:17:16 UTC +--- third_party/nasm/config/config-linux.h.orig 2024-06-13 07:44:30 UTC +++ third_party/nasm/config/config-linux.h @@ -160,7 +160,7 @@ @@ -18,7 +18,7 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,16 +327,16 @@ +@@ -327,10 +327,10 @@ #define HAVE_ISASCII 1 /* Define to 1 if you have the `iscntrl' function. */ @@ -31,13 +31,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 - - /* Define to 1 if you have the `mempcpy' function. */ --#define HAVE_MEMPCPY 1 -+/* #undef HAVE_MEMPCPY */ - - /* Define to 1 if you have a working `mmap' system call. */ - #define HAVE_MMAP 1 @@ -357,7 +357,7 @@ #define HAVE_STDARG_H 1 diff --git a/www/ungoogled-chromium/files/patch-third__party_nasm_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_nasm_BUILD.gn deleted file mode 100644 --- a/www/ungoogled-chromium/files/patch-third__party_nasm_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/nasm/BUILD.gn.orig 2023-01-13 08:56:02 UTC -+++ third_party/nasm/BUILD.gn -@@ -63,6 +63,13 @@ config("nasm_config") { - - defines = [ "HAVE_CONFIG_H" ] - -+ _string_h_lines = -+ read_file("/usr/include/string.h", "list lines") -+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ]) -+ if (_mempcpy != []) { -+ defines += [ "HAVE_MEMPCPY=1" ] -+ } -+ - if (is_clang) { - cflags = [ - # The inline functions in NASM's headers flag this. diff --git a/www/ungoogled-chromium/files/patch-third__party_nasm_config_config-linux.h b/www/ungoogled-chromium/files/patch-third__party_nasm_config_config-linux.h --- a/www/ungoogled-chromium/files/patch-third__party_nasm_config_config-linux.h +++ b/www/ungoogled-chromium/files/patch-third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- third_party/nasm/config/config-linux.h.orig 2023-01-13 08:56:02 UTC +--- third_party/nasm/config/config-linux.h.orig 2024-06-13 07:44:30 UTC +++ third_party/nasm/config/config-linux.h @@ -160,7 +160,7 @@ @@ -18,7 +18,7 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,16 +327,16 @@ +@@ -327,10 +327,10 @@ #define HAVE_ISASCII 1 /* Define to 1 if you have the `iscntrl' function. */ @@ -31,13 +31,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 - - /* Define to 1 if you have the `mempcpy' function. */ --#define HAVE_MEMPCPY 1 -+/* #undef HAVE_MEMPCPY */ - - /* Define to 1 if you have a working `mmap' system call. */ - #define HAVE_MMAP 1 @@ -357,7 +357,7 @@ #define HAVE_STDARG_H 1