diff options
| author |   Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2017-08-23 00:08:30 +0200 |
|---|---|---|
| committer | Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2017-08-23 00:08:30 +0200 |
| commit | fab429984552c440fd527eb0c059f54ce269e28e (patch) | |
| tree | f376904708e51be1a0d0a963abef97f65d305dfc /www-client/chromium | |
| parent | app-emacs/basic-toolkit: HOMEPAGE 301 redirect to HTTPS (diff) | |
| download | gentoo-fab429984552c440fd527eb0c059f54ce269e28e.tar.gz gentoo-fab429984552c440fd527eb0c059f54ce269e28e.tar.bz2 gentoo-fab429984552c440fd527eb0c059f54ce269e28e.zip | |
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
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/chromium-62.0.3188.2.ebuild | 3 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-system-icu-r2.patch | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/www-client/chromium/chromium-62.0.3188.2.ebuild b/www-client/chromium/chromium-62.0.3188.2.ebuild index 02da775ef7e9..baa5f1920f7a 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 000000000000..5c12bbb7cf66 --- /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", + ] + } + |