Skip to content

Commit 15f648b

Browse files
authored

File tree

5 files changed

+10
-28
lines changed

5 files changed

+10
-28
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
command: |
5252
sudo apt-get update
5353
sudo apt-get install coreutils realpath curl git subversion python-dev ruby gperf -y
54+
pyenv global 3.5.2
5455
- run:
5556
name: upgrade node
5657
command: |

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
},
2828
"config": {
2929
"webkitGTK": "2.24.2",
30-
"chromiumICUCommit": "b34251f8b762f8e2112a89c587855ca4297fed96"
30+
"chromiumICUCommit": "64e5d7d43a1ff205e3787ab6150bbc1a1837332b"
3131
}
3232
}

patches/icu.patch

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ diff -aur target-org/icu/source/config/Makefile.inc.in target/icu/source/config/
22
--- target-org/icu/source/config/Makefile.inc.in 2017-07-05 13:23:06.000000000 +0200
33
+++ target/icu/source/config/Makefile.inc.in 2017-07-06 14:02:52.275016858 +0200
44
@@ -143,7 +143,7 @@
5-
5+
66
# Versioned target for a shared library
77
FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION)
88
-MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR)
99
+MIDDLE_SO_TARGET = $(SO_TARGET)
10-
10+
1111
# Access to important ICU tools.
12-
# Use as follows: $(INVOKE) $(GENRB) arguments ..
12+
# Use as follows: $(INVOKE) $(GENRB) arguments ..
1313
diff -aur target-org/icu/source/config/mh-linux target/icu/source/config/mh-linux
1414
--- target-org/icu/source/config/mh-linux 2017-07-05 13:23:06.000000000 +0200
1515
+++ target/icu/source/config/mh-linux 2017-07-06 14:02:52.275016858 +0200
1616
@@ -25,9 +25,12 @@
17-
17+
1818
## Compiler switch to embed a library name
1919
# The initial tab in the next line is to prevent icu-config from reading it.
2020
- LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
@@ -25,7 +25,7 @@ diff -aur target-org/icu/source/config/mh-linux target/icu/source/config/mh-linu
2525
#SH# # We can't depend on MIDDLE_SO_TARGET being set.
2626
-#SH# LD_SONAME=
2727
+#SH# LD_SONAME=${SO_TARGET}
28-
28+
2929
## Shared library options
3030
LD_SOOPTIONS= -Wl,-Bsymbolic
3131
diff -aur target-org/icu/source/data/Makefile.in target/icu/source/data/Makefile.in
@@ -41,22 +41,6 @@ diff -aur target-org/icu/source/data/Makefile.in target/icu/source/data/Makefile
4141
+#ifeq ($(PKGDATA_VERSIONING),)
4242
+#PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION)
4343
+#endif
44-
44+
4545
# This allows all the data to be in one directory
4646
ifeq ($(PKGDATA_MODE),dll)
47-
diff -aur target-org/icu/source/i18n/digitlst.cpp target/icu/source/i18n/digitlst.cpp
48-
--- target-org/icu/source/i18n/digitlst.cpp 2018-07-23 11:20:13.000000000 +0200
49-
+++ target/icu/source/i18n/digitlst.cpp 2018-07-23 15:29:24.729402639 +0200
50-
@@ -61,11 +61,7 @@
51-
#endif
52-
53-
#if U_USE_STRTOD_L
54-
-# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
55-
-# include <locale.h>
56-
-# else
57-
-# include <xlocale.h>
58-
-# endif
59-
+# include <xlocale.h>
60-
#endif
61-
62-
// ***************************************************************************

scripts/compile/icu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ else
2525
BUILD_TYPE_CONFIG="--enable-debug=yes"
2626
fi
2727

28+
ICU_DATA_FILTER_FILE="${TARGETDIR}/icu/filters/android.json" \
2829
$TARGETDIR/icu/source/configure --prefix=$(pwd)/prebuilts \
2930
$BUILD_TYPE_CONFIG \
3031
--host=$CROSS_COMPILE_PLATFORM \
@@ -35,7 +36,6 @@ $TARGETDIR/icu/source/configure --prefix=$(pwd)/prebuilts \
3536
--enable-icuio=no \
3637
--enable-layout=no \
3738
--enable-layoutex=no \
38-
--enable-tools=no \
3939
--enable-tests=no \
4040
--enable-samples=no \
4141
--enable-dyload=no \

scripts/start.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ patchAndMakeICU() {
1717
printf "ICU version: ${ICU_VERSION_MAJOR}\n"
1818
$SCRIPT_DIR/patch.sh icu
1919

20-
# use compiled .dat archive from Android Chromium
21-
cp $TARGETDIR/icu/android/icudtl.dat $TARGETDIR/icu/source/data/in/icudt${ICU_VERSION_MAJOR}l.dat
22-
rm $TARGETDIR/icu/source/data/translit/root_subset.txt $TARGETDIR/icu/source/data/translit/trnslocal.mk
23-
2420
rm -rf $TARGETDIR/icu/host
2521
mkdir -p $TARGETDIR/icu/host
2622
cd $TARGETDIR/icu/host
@@ -32,6 +28,7 @@ patchAndMakeICU() {
3228
CFLAGS="-g2"
3329
fi
3430

31+
ICU_DATA_FILTER_FILE="${TARGETDIR}/icu/filters/android.json" \
3532
$TARGETDIR/icu/source/runConfigureICU Linux \
3633
--prefix=$PWD/prebuilts \
3734
CFLAGS="$CFLAGS" \

0 commit comments

Comments
 (0)