diff --git a/build/Linux+BSD/portable/copy-libs b/build/Linux+BSD/portable/copy-libs index a9b0891bf195..38556d4db85a 100755 --- a/build/Linux+BSD/portable/copy-libs +++ b/build/Linux+BSD/portable/copy-libs @@ -65,8 +65,6 @@ getCrossPlatformDependencies() { #copyLib libicudata.so #icudt53.dll # Needed by Ubuntu 12.04 #copyLib libicui18n.so #libicuin53.so.5 # Needed by Ubuntu 12.04 #copyLib libicuuc.so #libicuuc53.so.5 # Needed by Ubuntu 12.04 - - copyLib libXrandr.so.2 #required to link MuseScore code with QWebEngine from Qt 5.9.8 copyLib libQt5CLucene.so.5 copyLib libQt5Core.so.5 diff --git a/build/Linux+BSD/portable/x86_64/Recipe b/build/Linux+BSD/portable/x86_64/Recipe index 2d72ccc51964..2b12369447b3 100755 --- a/build/Linux+BSD/portable/x86_64/Recipe +++ b/build/Linux+BSD/portable/x86_64/Recipe @@ -25,7 +25,6 @@ apt-get -y install \ libgl1-mesa-dev \ libopenal1 \ gstreamer0.10-plugins-base \ - libxrandr2 \ software-properties-common # installs `add-apt-repository` # get newer compiler @@ -39,7 +38,6 @@ apt-get -y install \ g++-4.9 \ wget \ make \ - cmake \ curl \ alsa \ libasound2-dev \ @@ -66,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 https://s3.amazonaws.com/utils.musescore.org/qt598.zip + wget -q -O qt5.zip https://s3.amazonaws.com/utils.musescore.org/qt593.zip unzip -qq qt5.zip -d qt5 rm -f qt5.zip fi @@ -75,6 +73,18 @@ export QT_PLUGIN_PATH="${PWD}/qt5/plugins" export QML2_IMPORT_PATH="${PWD}/qt5/qml" export LD_LIBRARY_PATH="${PWD}/qt5/lib:$LD_LIBRARY_PATH" +# install cmake +if [ ! -d cmake ]; then + if [ "$(arch)" = "i686" ]; then + CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.1-Linux-i386.tar.gz" + else + CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.1-Linux-$(arch).tar.gz" + fi + mkdir cmake + wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake +fi +export PATH="${PWD}/cmake/bin:${PATH}" + # build AppImageKit if [ ! -d "AppImageKit" ]; then git clone https://github.com/probonopd/AppImageKit.git