From 59a887d071bab7e7c6d60238249f8ae9f340d74f Mon Sep 17 00:00:00 2001 From: anatoly-os Date: Fri, 28 Jun 2019 12:32:24 +0200 Subject: [PATCH] Revert changes to build AppImage with Qt 5.9.8 --- build/Linux+BSD/portable/x86_64/Dockerfile | 2 +- build/Linux+BSD/portable/x86_64/Recipe | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/Linux+BSD/portable/x86_64/Dockerfile b/build/Linux+BSD/portable/x86_64/Dockerfile index 2e8235ac68942..59a8aa62616e9 100644 --- a/build/Linux+BSD/portable/x86_64/Dockerfile +++ b/build/Linux+BSD/portable/x86_64/Dockerfile @@ -1,4 +1,4 @@ -FROM library/ubuntu:18.04 +FROM library/ubuntu:14.04 ADD Recipe /Recipe RUN bash -ex Recipe && apt-get clean autoclean RUN apt-get autoremove -y && rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* diff --git a/build/Linux+BSD/portable/x86_64/Recipe b/build/Linux+BSD/portable/x86_64/Recipe index 2c429528a1df6..7e6267e2e347a 100755 --- a/build/Linux+BSD/portable/x86_64/Recipe +++ b/build/Linux+BSD/portable/x86_64/Recipe @@ -24,6 +24,7 @@ apt-get -y install \ libdrm-dev \ libgl1-mesa-dev \ libopenal1 \ + gstreamer0.10-plugins-base \ software-properties-common # get newer compiler @@ -63,7 +64,7 @@ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 40 --slave /usr/ # get Qt if [ ! -d "qt5" ]; then mkdir qt5 - wget -q -O qt5.zip http://utils.musescore.org.s3.amazonaws.com/qt598.zip + wget -q -O qt5.zip http://utils.musescore.org.s3.amazonaws.com/qt593.zip unzip -qq qt5.zip -d qt5 rm -f qt5.zip fi