gnucash-on-windows master: The recent webkit rebuild now depends on icu

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/30bba34a (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/9974359d (commit)



commit 30bba34a41ec58220e881567b9bc9ccf3a194b68
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu May 4 16:28:56 2017 +0200

    The recent webkit rebuild now depends on icu

diff --git a/dist-impl.sh b/dist-impl.sh
index 0a8f5cf..240dafb 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -241,11 +241,6 @@ function dist_webkit() {
 function dist_icu4c() {
     setup icu4c
     get_major_minor "$GNUCASH_SCM_REV"
-    if [ "$GNUCASH_SCM_REV" != "master" ] &&
-           (( $major_minor <= 206 )); then
-        echo "Skipping. ICU is only needed for the master branch or future 2.7.x and up versions of gnucash."
-        return
-    fi
     cp -a ${_ICU4C_UDIR}/lib/*.dll ${_DIST_UDIR}/bin
 }
 
diff --git a/install-impl.sh b/install-impl.sh
index 3134218..acfac61 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1264,12 +1264,6 @@ function inst_hh() {
 
 function inst_icu4c() {
     setup icu4c
-    get_major_minor "$GNUCASH_SCM_REV"
-    if [ "$GNUCASH_SCM_REV" != "master" ] &&
-        (( $major_minor <= 206 )); then
-        echo "Skipping. ICU is only needed for the master branch or future 2.7.x and up versions of gnucash."
-        return
-    fi
     _ICU4C_UDIR=`unix_path $ICU4C_DIR`
     if [ -f "$_ICU4C_UDIR/lib/libicuuc.dll.a" ]
     then
diff --git a/install.sh b/install.sh
index c1a1e57..883ad44 100644
--- a/install.sh
+++ b/install.sh
@@ -95,12 +95,12 @@ add_step inst_ktoblzcheck
 add_step inst_aqbanking
 add_step inst_libdbi
 
-# libsoup and enchant needed by webkit
+# icu, libsoup and enchant needed by webkit
+add_step inst_icu4c
 add_step inst_libsoup
 add_step inst_enchant
 add_step inst_webkit
-#icu, boost, and gtest now needed for C++ on master only
-add_step inst_icu4c
+# boost, and gtest now needed for C++ on master only
 add_step inst_boost
 add_step inst_gtest
 



Summary of changes:
 dist-impl.sh    | 5 -----
 install-impl.sh | 6 ------
 install.sh      | 6 +++---
 3 files changed, 3 insertions(+), 14 deletions(-)