From nobody Thu Jan 30 21:12:27 2025 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 4YkWv00840z5ml2B; Thu, 30 Jan 2025 21:12:28 +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 4YkWtz6Tl7z3Nmv; Thu, 30 Jan 2025 21:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738271548; 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=63NOd1PfXV3ISJRZqiVqPVHbtyRp5MM4HqXX9Luur4M=; b=ID5jgh6Eakpkjrcue3XZ+zCnKPBs6yMVG2VVqJ/00S3oFwTWwnHla0HVUMgmyrhkWnKFdC TaoXU7hVbLtzzNfiWK6hZWu9Khz01qJt/v9BV8RvpcQ7XkAQXWaOXuN6j/tp9goXUeY03q Q4SC37y7BwNZyO8g5ZRcSW+cG+i0vCtJjjJsIccykDo4M3e8mfaoZN3RZFOVD9E52JT26d 4JMFW+yJy9/HZmqKik/tKQekado936EGfkUICzVuIXYlSh/e88K21dBJhEJTXVw+9KIs9v wbC6FoEc/1ApOUs9E+C7FvxZnUz6A5TcXQTjGHHI0YppLiZJJZXV1JU0m2h7UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738271547; 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=63NOd1PfXV3ISJRZqiVqPVHbtyRp5MM4HqXX9Luur4M=; b=WniMelQTiOG1wkFqtaa0/1OYqlR/5U9ifNvAnIBQLn8J7TZEumvXFDcx5FVzuD6s3XgEiT rV+eYALht0z8fHD5fKpems5/fcmucFBeADArqUDOTvukhw3XTcTEt/MXo3WHmzA7HXZBjr sgRMZ98MicwBKNPOlzV/56DYdN8qiiWTyQ5RBxsSvLCPhCAf7yXmt7+68V7juxc8MMQqIJ EYLeFH5voaEOYScGIgpAiVvP0TNOFxzhw9TX3EucYKX/Pb50qy09IxdaUDYvMX02bvbTi6 XfF7nL3gOlZFzygugaeDT+onuCAvLkIFEDDG8rPmno+MSKwjThPYaA3cp9lqUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738271547; a=rsa-sha256; cv=none; b=r3NIiJ4dt+zWgSfCxAfdALlavnW/PBF96w6my2ITmhYT4O+nkhIadSov/gq5SCh0zgdbSA JfK2vebfK04ILnqsOBIDWT4WYyb+IZW9I0XiSHUUPMNHEu6fpfImQ2pw9KNs5YGOL4LioF bg9ZtzEcNOwFvgCbD7r4TOsuH6oyXGZ8IPnczM7v0Gbf6TReQn6WeGw6v374HME45QvLH4 RNoYWqNdaPMkqVoqXIIgtFIAnYZ7MgjjP54tsq2IF5nqZq+p+mQSsrfFrDh7pUqwFs1e28 TgjRs/RMPrUaWCee0XGGQdPY9duvWl/p7QsAJXs6FS+SVpVAHEMc7Rb/sbTMRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YkWtz65Cwz142R; Thu, 30 Jan 2025 21:12:27 +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 50ULCR4Z024130; Thu, 30 Jan 2025 21:12:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ULCRWN024127; Thu, 30 Jan 2025 21:12:27 GMT (envelope-from git) Date: Thu, 30 Jan 2025 21:12:27 GMT Message-Id: <202501302112.50ULCRWN024127@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: a65233d4d0f2 - main - devel/electron32: fix build with ICU 76 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: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a65233d4d0f25d61355f21cc8040fa2133cb62ad Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=a65233d4d0f25d61355f21cc8040fa2133cb62ad commit a65233d4d0f25d61355f21cc8040fa2133cb62ad Author: Hiroki Tagato AuthorDate: 2025-01-30 21:10:11 +0000 Commit: Hiroki Tagato CommitDate: 2025-01-30 21:12:20 +0000 devel/electron32: fix build with ICU 76 PR: 284316 Reported by: diizzy Obtained from: https://cgit.freebsd.org/ports/tree/www/chromium?id=ca048c2884dc9822310a87e2dfebb8b1647095e2 --- devel/electron32/files/patch-.gn | 11 +++++++++++ .../files/patch-build_linux_unbundle_icu.gn | 21 ++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/devel/electron32/files/patch-.gn b/devel/electron32/files/patch-.gn new file mode 100644 index 000000000000..2c072f8c7103 --- /dev/null +++ b/devel/electron32/files/patch-.gn @@ -0,0 +1,11 @@ +--- .gn.orig 2025-01-29 08:44:44 UTC ++++ .gn +@@ -173,6 +173,8 @@ exec_script_whitelist = + "//tools/grit/grit_rule.gni", + "//tools/gritsettings/BUILD.gn", + ++ "//third_party/icu/BUILD.gn", ++ + "//electron/BUILD.gn", + "//third_party/electron_node/deps/base64/BUILD.gn", + "//third_party/electron_node/deps/base64/unofficial.gni", diff --git a/devel/electron32/files/patch-build_linux_unbundle_icu.gn b/devel/electron32/files/patch-build_linux_unbundle_icu.gn index bd3567f59977..d1588b8a6ff0 100644 --- a/devel/electron32/files/patch-build_linux_unbundle_icu.gn +++ b/devel/electron32/files/patch-build_linux_unbundle_icu.gn @@ -1,4 +1,4 @@ ---- build/linux/unbundle/icu.gn.orig 2023-04-04 21:42:43 UTC +--- build/linux/unbundle/icu.gn.orig 2024-11-06 12:34:11 UTC +++ build/linux/unbundle/icu.gn @@ -17,6 +17,15 @@ config("icu_config") { "USING_SYSTEM_ICU=1", @@ -16,3 +16,22 @@ # U_EXPORT (defined in unicode/platform.h) is used to set public visibility # on classes through the U_COMMON_API and U_I18N_API macros (among others). # When linking against the system ICU library, we want its symbols to have +@@ -35,6 +44,18 @@ config("icu_config") { + # please see: https://crbug.com/822820 + "U_IMPORT=U_EXPORT", + ] ++ ++ _icu_version = exec_script(pkg_config_script, ++ common_pkg_config_args + pkg_config_args + [ ++ "icu-i18n", ++ "--version-as-components", ++ ], ++ "value") ++ ++ # Unbreak with icu 76 where private symbols are picked up ++ if (_icu_version[0] >= 76) { ++ defines += [ "U_HIDE_DRAFT_API" ] ++ } + } + + pkg_config("system_icui18n") {