diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2024-07-21 14:27:05 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2024-07-21 14:50:37 +0000 |
| commit | 9fd42baef1d67ba2b5be74ec5ca634a044b13cb8 (patch) | |
| tree | 56475b8b7969518fc66ce449a066701cd182972f | |
| parent | efb313eda85cf9e4d5a2b77121fd15add958d439 (diff) | |
| download | ports-9fd42baef1d67ba2b5be74ec5ca634a044b13cb8.tar.gz ports-9fd42baef1d67ba2b5be74ec5ca634a044b13cb8.zip | |
www/qt6-webengine: Fix build on recent -CURRENT
Due to recent changes in string.h, the regex in our local patch for the
bundled nasm to check whether mempcpy(3) was available no longer worked.
This caused it to use its own implementation which caused an error due
to a declaration conflict.
Since all currently supported versions of FreeBSD have mempcpy(3), this
patch is no longer needed.
PR: 280376
| -rw-r--r-- | www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn | 16 | ||||
| -rw-r--r-- | www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h | 11 |
2 files changed, 2 insertions, 25 deletions
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn deleted file mode 100644 index ac5cca70bae0..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/third_party/nasm/BUILD.gn.orig 2023-01-11 09:17:16 UTC -+++ src/3rdparty/chromium/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/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h index 51ee60839711..caa281ce0277 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2023-01-11 09:17:16 UTC +--- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig 2024-06-10 11:34:19 UTC +++ src/3rdparty/chromium/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 <memory.h> 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 |