commit: fab429984552c440fd527eb0c059f54ce269e28e Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> AuthorDate: Tue Aug 22 22:08:30 2017 +0000 Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> CommitDate: Tue Aug 22 22:08:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab42998
www-client/chromium: fix build with system ICU 59 Bug: https://bugs.gentoo.org/627382 Package-Manager: Portage-2.3.6, Repoman-2.3.1 www-client/chromium/chromium-62.0.3188.2.ebuild | 3 ++- www-client/chromium/files/chromium-system-icu-r2.patch | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/www-client/chromium/chromium-62.0.3188.2.ebuild b/www-client/chromium/chromium-62.0.3188.2.ebuild index 02da775ef7e..baa5f1920f7 100644 --- a/www-client/chromium/chromium-62.0.3188.2.ebuild +++ b/www-client/chromium/chromium-62.0.3188.2.ebuild @@ -25,7 +25,7 @@ COMMON_DEPEND=" cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 - system-icu? ( <dev-libs/icu-59:= ) + system-icu? ( >=dev-libs/icu-59:= ) dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" "${FILESDIR}/${PN}-gcc5-r2.patch" "${FILESDIR}/${PN}-gn-bootstrap-r16.patch" + "${FILESDIR}/${PN}-system-icu-r2.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-system-icu-r2.patch b/www-client/chromium/files/chromium-system-icu-r2.patch new file mode 100644 index 00000000000..5c12bbb7cf6 --- /dev/null +++ b/www-client/chromium/files/chromium-system-icu-r2.patch @@ -0,0 +1,10 @@ +--- a/build/linux/unbundle/icu.gn ++++ b/build/linux/unbundle/icu.gn +@@ -16,6 +16,7 @@ config("icu_config") { + defines = [ + "USING_SYSTEM_ICU=1", + "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC", ++ "UCHAR_TYPE=uint16_t", + ] + } +
