From nobody Sun Jul 21 14:52:08 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WRmbF2XNCz5RdXr; Sun, 21 Jul 2024 14:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRmbF0tRyz4gVf; Sun, 21 Jul 2024 14:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721573529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cRNOFWIgvB+pLRaEo8HYiqXX2K0yN8mtSWxVSfdfbg=; b=B4PQqBNeeRPVwhIVy3+XqF5PCtGww9cfFhm3ArnaHC3kMLO6vcSHkSjf4j4M7K+WeX4ipE QU1Zi0HB/lC61iXIoOJZ+PEUMLPrRsyqE5mVjTvCgDVR2lpjbJTnuz5eRk1XfiNd57guOx YX9v6CB6DNR1W1/pitvbvVFhzUQLIPPc68OAw+QRvZ+aa7EVfjdfgticRNDtjlzGlfVld8 4eHp0rdy9teGdncWAuO2vvWPQObd6nJmSzRGp3OgS9jsgQ3qLzCIBGHnxggEiLdwqhSvd7 vZAAdkyrNauOEGnWX+746qadIicRpcYFba2R9603V4tsaDJJZgh2cpk12tDHZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721573529; a=rsa-sha256; cv=none; b=xTmJ1QyNOpx+UNHGozVAeh7odWnBHyM1DcvvPq7oUHea5AvzVmgAPW1ksF9kmAjjecLkMI EiMmshFluaEMxXWT9R8CbBiyTrpuvdmRmlhR1NqmABJX4J1uIfVhWSQ0eACtpT+zWsb91a 66p2hae56FfftQxC6buZle5FTr9cUPYpY0eaA2Bqa4l9f/RWsiArIo3OUMS23a8RTh2FWv eEenWFBCutUJDuCu3q8ZwFiHkgQ/b1Vn2Q4I004mmYqGE7kNc2Lal7+sa5EaRyePsKhQwO pbQ7QfUMmN/saE8FX3yk4fHVfXQbu7QDiOaC0ZtYd+EEbod/PDVb16DFC3dWfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721573529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cRNOFWIgvB+pLRaEo8HYiqXX2K0yN8mtSWxVSfdfbg=; b=izBiapb84DDEtBx4onIc82oq+DdH2w92Q2FFf2KooBrN1CQIjCVjDGlFH/hdTSvVJCq0p6 2WketnbBz3Mwtppq9r8x4UGZ/YAa1G8KFntK2fGEBrJcCpHNC+7R/vJZo/K4mpn7IPyyuh Kl4rDMTa+KxWewSkqh7VIoUOy1XhKlSOsIT456v61eDVrEYxUURx4uxEsUaFFYUU5+CAVv pry3BuYpg5pXahX4KBxkYUEhYp3mM9dRWKVZEzUkIvnRAmiV3GlEKz80Xn5D/FpVMiRC8w G8kGQ7ksu5WUz4UmI6mkcVyjxKRG4y2vwwGeLs3TYV5lMv3uNMTQFBdeBrM0og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WRmbF0VfBz145J; Sun, 21 Jul 2024 14:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46LEq8JM090296; Sun, 21 Jul 2024 14:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LEq8CQ090293; Sun, 21 Jul 2024 14:52:08 GMT (envelope-from git) Date: Sun, 21 Jul 2024 14:52:08 GMT Message-Id: <202407211452.46LEq8CQ090293@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 9fd42baef1d6 - main - www/qt6-webengine: Fix build on recent -CURRENT List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fd42baef1d67ba2b5be74ec5ca634a044b13cb8 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fd42baef1d67ba2b5be74ec5ca634a044b13cb8 commit 9fd42baef1d67ba2b5be74ec5ca634a044b13cb8 Author: Guido Falsi AuthorDate: 2024-07-21 14:27:05 +0000 Commit: Jason E. Hale CommitDate: 2024-07-21 14:50:37 +0000 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 --- ...atch-src_3rdparty_chromium_third__party_nasm_BUILD.gn | 16 ---------------- ...arty_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 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