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

diff --git a/www-client/chromium/chromium-62.0.3188.2.ebuild b/www-client/chromium/chromium-62.0.3188.2.ebuild
index 02da775ef7e9d7f0b26b7fb30d2e7aa62d794453..baa5f1920f7a97849279ca8b7ab0c9a82e3d2f52 100644 (file)
--- 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 (file)
index 0000000..5c12bbb
--- /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",
+   ]
+ }
+