Date: Sat, 15 Apr 2023 14:22:41 GMT
From: Hiroki Tagato <tagattie@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: db5bfb69f45b - main - devel/electron{21,22}: fix build with icu 73
Message-ID: <202304151422.33FEMfNw094247@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=db5bfb69f45bcea3c912553657cd5c72ac984254 commit db5bfb69f45bcea3c912553657cd5c72ac984254 Author: Robert Nagy <rnagy@FreeBSD.org> AuthorDate: 2023-04-15 14:18:26 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2023-04-15 14:22:21 +0000 devel/electron{21,22}: fix build with icu 73 PR: 270827 Reported by: shoesoft@gmx.net, fgorter@gmail.com, jonc@chen.org.nz (via ports), jbeich (via ports), david@catwhisker.org (via ports) Obtained from: https://reviews.freebsd.org/D39564 --- .../electron21/files/patch-build_linux_unbundle_icu.gn | 18 ++++++++++++++++++ .../electron22/files/patch-build_linux_unbundle_icu.gn | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/devel/electron21/files/patch-build_linux_unbundle_icu.gn b/devel/electron21/files/patch-build_linux_unbundle_icu.gn new file mode 100644 index 000000000000..fa171b303ff1 --- /dev/null +++ b/devel/electron21/files/patch-build_linux_unbundle_icu.gn @@ -0,0 +1,18 @@ +--- build/linux/unbundle/icu.gn.orig 2023-02-01 05:17:58 UTC ++++ build/linux/unbundle/icu.gn +@@ -17,6 +17,15 @@ config("icu_config") { + "USING_SYSTEM_ICU=1", + "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC", + ++ # As of icu 73 C++ nullptr, char16_t, override, final and noexcept are used ++ # instead of defines. These definitions can be removed when the bundled icu ++ # gets updated to 73. For more details, see: ++ # https://unicode-org.atlassian.net/browse/ICU-21833 and ++ # https://github.com/unicode-org/icu/commit/28643799377ecf654564f6f31854b02788cebe33 ++ "U_FINAL=final", ++ "U_NOEXCEPT=noexcept", ++ "U_OVERRIDE=override", ++ + # 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 diff --git a/devel/electron22/files/patch-build_linux_unbundle_icu.gn b/devel/electron22/files/patch-build_linux_unbundle_icu.gn new file mode 100644 index 000000000000..88780c5460f2 --- /dev/null +++ b/devel/electron22/files/patch-build_linux_unbundle_icu.gn @@ -0,0 +1,18 @@ +--- build/linux/unbundle/icu.gn.orig 2023-02-05 22:30:04 UTC ++++ build/linux/unbundle/icu.gn +@@ -17,6 +17,15 @@ config("icu_config") { + "USING_SYSTEM_ICU=1", + "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC", + ++ # As of icu 73 C++ nullptr, char16_t, override, final and noexcept are used ++ # instead of defines. These definitions can be removed when the bundled icu ++ # gets updated to 73. For more details, see: ++ # https://unicode-org.atlassian.net/browse/ICU-21833 and ++ # https://github.com/unicode-org/icu/commit/28643799377ecf654564f6f31854b02788cebe33 ++ "U_FINAL=final", ++ "U_NOEXCEPT=noexcept", ++ "U_OVERRIDE=override", ++ + # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304151422.33FEMfNw094247>