add build icu

Author: clmpo

appimage/Dockerfile

@@ -2,11 +2,11 @@ FROM centos:7
 
 RUN yum -y update && yum -y install wget && yum -y install centos-release-scl epel-release && yum -y update && yum -y install devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils wget tar bzip2 git libtool which fuse fuse-devel libjpeg-devel libpng-devel automake cppunit-devel cmake glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel libxml2-devel libstdc++-devel libXrender-devel libXcomposite libXcomposite-devel patch xcb-util-keysyms-devel libXi-devel libudev-devel.x86_64 openssl-devel sqlite-devel.x86_64 gperftools.x86_64 gperf.x86_64 libicu-devel.x86_64 boost-devel.x86_64 libxslt-devel.x86_64 docbook-style-xsl.noarch python27.x86_64 cmake3.x86_64 bison flex bison-devel flex-devel xz xz-devel pcre-devel pcre2-devel pcre pcre2 mesa-libEGL-devel mesa-libGL-devel glib-devel gettext perl-URI.noarch bzip2-devel.x86_64 subversion-devel.x86_64 subversion.x86_64 sqlite2-devel.x86_64 hunspell-devel aspell-devel hspell-devel vim sudo unzip xkeyboard-config libffi libffi-devel hyphen hyphen-devel make file libudev-devel
 
-#RUN cd /tmp && wget http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/subversion-1.9.4-3.x86_64.rpm http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/subversion-devel-1.9.4-3.x86_64.rpm http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/serf-1.3.7-1.x86_64.rpm && yum -y install subversion* serf*; rm subversion* serf*
+RUN cd /tmp && wget http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/subversion-1.9.4-3.x86_64.rpm http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/subversion-devel-1.9.4-3.x86_64.rpm http://opensource.wandisco.com/rhel/6/svn-1.9/RPMS/x86_64/serf-1.3.7-1.x86_64.rpm && yum -y install subversion* serf*; rm subversion* serf*
 
 RUN echo ". /opt/rh/devtoolset-7/enable && chmod +x /opt/rh/python27/enable && . /opt/rh/python27/enable" >> /root/.bashrc
 
-ENV LANG=en_US.UTF-8 PYTHON_VERSION=3.6.7 QTVERSION=5.12.8 QTVERSION_SHORT=5.12 LLVM_VERSION=10.0.0 LLVM_ROOT=/opt/llvm/ RUBY_VERSION=1.9.3-p484 GLIB_VERSION_SHORT=2.61 GLIB_VERSION=2.61.2 LD_LIBRARY_PATH=$QTDIR/lib/
+ENV LANG=en_US.UTF-8 PYTHON_VERSION=3.6.7 QTVERSION=5.12.8 QTVERSION_SHORT=5.12 LLVM_VERSION=11.0.0 LLVM_ROOT=/opt/llvm/ RUBY_VERSION=1.9.3-p484 GLIB_VERSION_SHORT=2.61 GLIB_VERSION=2.61.2 LD_LIBRARY_PATH=$QTDIR/lib/
 ENV QTDIR=/opt/qt5
 
 RUN bash -c "ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/g++ && ln -sf /opt/rh/devtoolset-7/root/usr/bin/c++ /usr/bin/c++"
@@ -43,14 +43,12 @@ RUN bash -c "cd /glib/ && tar xvf glib-${GLIB_VERSION}.tar.xz"
 RUN bash -c ". /opt/rh/devtoolset-7/enable && cd /glib/glib-${GLIB_VERSION} && meson -D libmount=false _build && ninja -C _build && ninja -C _build install && rm -Rf /glib"
 
 # Build ICU >= 52.1, required for qtwebkit
-RUN bash -c "mkdir -p /icu && cd /icu && wget https://github.com/unicode-org/icu/releases/download/release-52-2/icu4c-52_2-src.tgz"
-RUN bash -c "cd /icu/ && tar xvf icu4c-52_2-src.tgz"
-RUN bash -c ". /opt/rh/devtoolset-7/enable && cd /icu/icu/source && ./configure --prefix /opt/icu4c-52_2 && make -j$(nproc) && make -j$(nproc) install && rm -Rf /icu && echo "/opt/icu4c-52_2/lib/" > /etc/ld.so.conf.d/icu4c-52_2.conf && ldconfig"
+COPY build_icu.sh /build_icu.sh
+RUN bash -c "chmod u+x /build_icu.sh && /build_icu.sh"
 
 # Build qtwebkit
-COPY qtwebkit.sh /qtwebkit.sh
-
-RUN bash -c "chmod u+x /qtwebkit.sh && /qtwebkit.sh"
+COPY build_qtwebkit.sh /build_qtwebkit.sh
+RUN bash -c "chmod u+x /build_qtwebkit.sh && /build_qtwebkit.sh"
 
 # Build Clang/LLVM
 RUN bash -c "mkdir -p /llvm && cd /llvm && wget https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"

appimage/build_icu.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Halt on errors
+set -e
+
+# Be verbose
+set -x
+
+# Build ICU >= 52.1, required for qtwebkit
+mkdir -p /icu 
+cd /icu 
+wget https://github.com/unicode-org/icu/releases/download/release-52-2/icu4c-52_2-src.tgz
+tar xvf icu4c-52_2-src.tgz --no-same-owner
+
+source /opt/rh/devtoolset-7/enable 
+cd /icu/icu/source 
+./configure --prefix /opt/icu4c-52_2 
+make -j$(nproc) 
+make -j$(nproc) install 
+rm -Rf /icu 
+
+echo "/opt/icu4c-52_2/lib/" > /etc/ld.so.conf.d/icu4c-52_2.conf 
+ldconfig

appimage/qtwebkit.sh renamed to appimage/build_qtwebkit.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
+# Halt on errors
+set -e
+
+# Be verbose
+set -x
 
 mkdir -p /qtwk
 cd /qtwk && wget https://github.com/qt/qtwebkit/archive/v5.212.0-alpha4.tar.gz