WebKit Bugzilla
Attachment 361193 Details for
Bug 194288
: [GTK][WPE] force libpsl build to use ICU in jhbuild
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194288-20190205174743.patch (text/plain), 2.08 KB, created by
Olivier Blin
on 2019-02-05 08:47:44 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Olivier Blin
Created:
2019-02-05 08:47:44 PST
Size:
2.08 KB
patch
obsolete
>Subversion Revision: 240968 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 5acecaaeece2cfd51891e90b79b102a5e554bc46..cf85cccf89b410d83c15e8c1f2eea517c2c4e36d 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,18 @@ >+2019-02-05 Olivier Blin <olivier.blin@softathome.com> >+ >+ [GTK][WPE] force libpsl build to use ICU in jhbuild >+ https://bugs.webkit.org/show_bug.cgi?id=194288 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ In jhbuild, libpsl depends on ICU, but its configure script may decide to use libidn instead of ICU. >+ This can cause build failures if libidn is detected but libunistring is not available. >+ >+ Make sure that ICU is used for runtime and builtin PSL data. >+ >+ * gtk/jhbuild.modules: >+ * wpe/jhbuild.modules: >+ > 2019-02-05 Olivier Blin <olivier.blin@softathome.com> > > [WPE] require python3-setuptools for meson build in jhbuild >diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules >index a40d75fb5241acc452f5fa4e821429402e17d9d2..948cbf91f25f003792686701b6b7403b894a4273 100644 >--- a/Tools/gtk/jhbuild.modules >+++ b/Tools/gtk/jhbuild.modules >@@ -229,7 +229,8 @@ > hash="sha256:bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"/> > </meson> > >- <autotools id="libpsl"> >+ <autotools id="libpsl" >+ autogenargs="--enable-runtime=libicu --enable-builtin=libicu"> > <branch module="rockdaboot/libpsl/releases/download/libpsl-${version}/libpsl-${version}.tar.gz" > version="0.20.2" > repo="github-tarball" >diff --git a/Tools/wpe/jhbuild.modules b/Tools/wpe/jhbuild.modules >index 820dcfbb58ec30e7ef6be66c6d0831ca6c42ae59..a6e6ad90e289731b5b06c8337334b12bae56f8bc 100644 >--- a/Tools/wpe/jhbuild.modules >+++ b/Tools/wpe/jhbuild.modules >@@ -90,7 +90,8 @@ > hash="sha256:bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"/> > </meson> > >- <autotools id="libpsl"> >+ <autotools id="libpsl" >+ autogenargs="--enable-runtime=libicu --enable-builtin=libicu"> > <dependencies> > <dep package="icu"/> > </dependencies>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194288
: 361193 |
361290