Merge remote-tracking branch 'remotes/origin/master' into bugfix/qml-import-paths

Author: igor-sirotin

.gitignore

@@ -1,3 +1,4 @@
 *build*/
 .idea/
 *.AppImage
+*.zsync

.travis.yml

@@ -3,23 +3,23 @@ dist: xenial
 
 matrix:
   include:
-    - name: Build x86_64 AppImage on CentOS 6
+    - name: Build x86_64 AppImage on CentOS 7
       services:
         - docker
-      env: ARCH=x86_64 BUILD_TYPE=centos6
-      script: travis/build-centos6-docker.sh
+      env: ARCH=x86_64 BUILD_TYPE=centos7
+      script: travis/build-centos7-docker.sh
       after_success:
         - ls -lh
         # make sure only pushes to rewrite create a new release, otherwise pretend PR and upload to transfer.sh
         - if [ "$TRAVIS_TAG" != "$TRAVIS_BRANCH" ] && [ "$TRAVIS_BRANCH" != "master" ]; then export TRAVIS_EVENT_TYPE=pull_request; fi
         - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
         - bash upload.sh linuxdeploy*.AppImage*
 
-    - name: Build i386 AppImage on CentOS 6
+    - name: Build i386 AppImage on CentOS 7
       services:
         - docker
-      env: ARCH=i386 BUILD_TYPE=centos6
-      script: travis/build-centos6-docker.sh
+      env: ARCH=i386 BUILD_TYPE=centos7
+      script: travis/build-centos7-docker.sh
       after_success:
         - ls -lh
         # make sure only pushes to rewrite create a new release, otherwise pretend PR and upload to transfer.sh

travis/Dockerfile.centos6 renamed to travis/Dockerfile.centos7

@@ -1,16 +1,15 @@
-FROM centos:6
+FROM centos:7
 
-RUN yum install -y centos-release-scl-rh && \
-    yum install -y devtoolset-7 wget curl patchelf vim-common fuse libfuse2 libtool autoconf automake zlib-devel libjpeg-devel libpng-devel nano git && \
+RUN yum install -y centos-release-scl && \
+    yum install -y devtoolset-9 wget curl patchelf vim-common fuse libfuse2 libtool autoconf automake zlib-devel libjpeg-devel libpng-devel nano git file gcc-c++ && \
     wget https://artifacts.assassinate-you.net/artifactory/cmake-centos6/cmake-v3.15.3-x86_64.tar.gz -O- | tar xz --strip-components=1 -C/usr/local
 
 ENV ARCH=x86_64
 COPY entrypoint.sh /
 SHELL ["/entrypoint.sh", "bash", "-x", "-c"]
 ENTRYPOINT ["/entrypoint.sh"]
 
-RUN yum install -y gcc-c++ && \
-    git clone https://github.com/NixOS/patchelf.git && \
+RUN git clone https://github.com/NixOS/patchelf.git && \
     pushd patchelf && \
     # cannot use -b since it's not supported in really old versions of git
     git checkout 0.8 && \

travis/Dockerfile.centos6-i386 renamed to travis/Dockerfile.centos7-i386

@@ -1,4 +1,4 @@
-FROM i386/centos:6
+FROM i386/centos:7
 
 SHELL ["/bin/bash", "-x", "-c"]
 
@@ -9,8 +9,8 @@ RUN sed -i 's/$basearch/i386/g' /etc/yum.repos.d/CentOS-Base.repo
 # thanks CloudLinux, you're really helping us poor AppImage creators seeking for maximum compatibility by providing devtoolset i386 builds
 RUN yum install -y yum-utils && \
     rpm --import https://repo.cloudlinux.com/cloudlinux/security/RPM-GPG-KEY-CloudLinux && \
-    yum-config-manager --add-repo https://www.repo.cloudlinux.com/cloudlinux/6/sclo/devtoolset-7/i386/ && \
-    yum install -y devtoolset-7 wget curl patchelf vim-common fuse libfuse2 libtool autoconf automake zlib-devel libjpeg-devel libpng-devel nano git
+    yum-config-manager --add-repo https://www.repo.cloudlinux.com/cloudlinux/7/sclo/devtoolset-9/i386/ && \
+    yum install -y devtoolset-9 wget curl patchelf vim-common fuse libfuse2 libtool autoconf automake zlib-evel libjpeg-devel libpng-devel nano git make file gcc-c++
 
 # the shell wrapper takes care of enabling devtoolset and running a shell properly
 # unfortunately this is the easiest and most solid workaround to the limitations of the scl command

travis/build-centos6-docker.sh renamed to travis/build-centos7-docker.sh

@@ -5,8 +5,8 @@ set -xe
 old_cwd=$(readlink -f .)
 here=$(readlink -f $(dirname "$0"))
 
-DOCKERFILE="$here"/Dockerfile.centos6
-IMAGE=linuxdeploy-build-centos6
+DOCKERFILE="$here"/Dockerfile.centos7
+IMAGE=linuxdeploy-build-centos7
 
 if [ "$ARCH" == "i386" ]; then
     DOCKERFILE="$DOCKERFILE"-i386
@@ -15,4 +15,4 @@ fi
 
 (cd "$here" && docker build -f "$DOCKERFILE" -t "$IMAGE" .)
 
-docker run --rm -it -v "$here"/..:/ws:ro -v "$old_cwd":/out -e CI=1 -e OUTDIR_OWNER=$(id -u) "$IMAGE" /bin/bash -xe -c "cd /out && /ws/travis/build-centos6.sh"
+docker run --rm -it -v "$here"/..:/ws:ro -v "$old_cwd":/out -e CI=1 -e OUTDIR_OWNER=$(id -u) "$IMAGE" /bin/bash -xe -c "cd /out && /ws/travis/build-centos7.sh"