Title: [281752] trunk/Tools
- Revision
- 281752
- Author
- [email protected]
- Date
- 2021-08-29 22:01:20 -0700 (Sun, 29 Aug 2021)
Log Message
[GTK][WPE] Add ICU 63.1 to JHBuild minimal dependencies
https://bugs.webkit.org/show_bug.cgi?id=229607
Reviewed by Carlos Alberto Lopez Perez.
* jhbuild/jhbuild-minimal.modules:
* jhbuild/patches/icudata-stdlibs.patch: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (281751 => 281752)
--- trunk/Tools/ChangeLog 2021-08-30 02:21:08 UTC (rev 281751)
+++ trunk/Tools/ChangeLog 2021-08-30 05:01:20 UTC (rev 281752)
@@ -1,3 +1,13 @@
+2021-08-29 Diego Pino Garcia <[email protected]>
+
+ [GTK][WPE] Add ICU 63.1 to JHBuild minimal dependencies
+ https://bugs.webkit.org/show_bug.cgi?id=229607
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * jhbuild/jhbuild-minimal.modules:
+ * jhbuild/patches/icudata-stdlibs.patch: Added.
+
2021-08-27 Patrick Griffis <[email protected]>
[GTK] Simplify run-gtk-tests handling of the a11y service
Modified: trunk/Tools/jhbuild/jhbuild-minimal.modules (281751 => 281752)
--- trunk/Tools/jhbuild/jhbuild-minimal.modules 2021-08-30 02:21:08 UTC (rev 281751)
+++ trunk/Tools/jhbuild/jhbuild-minimal.modules 2021-08-30 05:01:20 UTC (rev 281752)
@@ -6,6 +6,7 @@
<metamodule id="webkitgtk-minimal-dependencies">
<dependencies>
<dep package="wpebackend-fdo"/>
+ <dep package="icu"/>
<dep package="libsoup"/>
<dep package="manette"/>
<dep package="libvpx"/>
@@ -15,6 +16,7 @@
<metamodule id="webkitwpe-minimal-dependencies">
<dependencies>
<dep package="wpebackend-fdo"/>
+ <dep package="icu"/>
<dep package="libsoup"/>
<dep package="openxr"/>
<dep package="libvpx"/>
@@ -83,6 +85,15 @@
</branch>
</cmake>
+ <autotools id="icu" autogen-sh="./source/configure" autogenargs="--disable-samples --enable-weak-threads">
+ <pkg-config>icu-i18n.pc</pkg-config>
+ <branch module="unicode-org/icu/releases/download/release-61-2/icu4c-61_2-src.tgz" version="61.2" checkoutdir="icu"
+ repo="github-tarball"
+ hash="sha256:cb6a8f8e29f03554f868f81ae70d3d5686136604304073be6bde8e75d8207855">
+ <patch file="icudata-stdlibs.patch" strip="1"/>
+ </branch>
+ </autotools>
+
<!-- libsoup >= 2.69 required for SameSite cookie support -->
<meson id="libsoup" mesonargs="-Dintrospection=disabled -Dgssapi=disabled -Dvapi=disabled -Dtests=false">
<pkg-config>libsoup-2.4.pc</pkg-config>
@@ -98,6 +109,9 @@
<autotools id="libpsl" autogenargs="--enable-runtime=libicu --enable-builtin=libicu">
<pkg-config>libpsl.pc</pkg-config>
+ <dependencies>
+ <dep package="icu"/>
+ </dependencies>
<branch module="rockdaboot/libpsl/releases/download/libpsl-${version}/libpsl-${version}.tar.gz"
version="0.20.2"
repo="github-tarball"
Added: trunk/Tools/jhbuild/patches/icudata-stdlibs.patch (0 => 281752)
--- trunk/Tools/jhbuild/patches/icudata-stdlibs.patch (rev 0)
+++ trunk/Tools/jhbuild/patches/icudata-stdlibs.patch 2021-08-30 05:01:20 UTC (rev 281752)
@@ -0,0 +1,15 @@
+Index: icu-52~m1/source/config/mh-linux
+===================================================================
+--- icu-52~m1.orig/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400
++++ icu-52~m1/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400
+@@ -21,7 +21,9 @@
+ LD_RPATH_PRE = -Wl,-rpath,
+
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
++#LDFLAGSICUDT=-nodefaultlibs -nostdlib
++# Debian change: linking icudata as data only causes too many problems.
++LDFLAGSICUDT=
+
+ ## Compiler switch to embed a library name
+ # The initial tab in the next line is to prevent icu-config from reading it.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
