diff --git a/.travis/before_install.sh b/.travis/before_install.sh index cb998e30b..16b479e37 100644 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -7,7 +7,21 @@ if [ "${TARGET}" = "macos-native" ] || [ "${TARGET}" = "macos-universal" ]; then fi if [ "${TARGET}" = "macos" ]; then - rm -f /etc/apt/sources.list.d/*.list + # sudo rm /etc/apt/sources.list.d/cassandra.list + # sudo rm /etc/apt/sources.list.d/chris-lea-redis-server.list + # sudo rm /etc/apt/sources.list.d/computology_apt-backport.list + # sudo rm /etc/apt/sources.list.d/couchdb.list + # sudo rm /etc/apt/sources.list.d/docker.list + # sudo rm /etc/apt/sources.list.d/github_git-lfs.list + # sudo rm /etc/apt/sources.list.d/git-ppa.list + sudo rm /etc/apt/sources.list.d/google-chrome.list + # sudo rm /etc/apt/sources.list.d/heroku-toolbelt.list + # sudo rm /etc/apt/sources.list.d/mongodb-3.4.list + # sudo rm /etc/apt/sources.list.d/openjdk-r-java-ppa.list + # sudo rm /etc/apt/sources.list.d/pgdg.list + # sudo rm /etc/apt/sources.list.d/pollinate.list + # sudo rm /etc/apt/sources.list.d/rabbitmq_rabbitmq-server.list + # sudo rm /etc/apt/sources.list.d/webupd8team-java-ppa.list sudo add-apt-repository -y ppa:kxstudio-debian/kxstudio sudo add-apt-repository -y ppa:kxstudio-debian/mingw sudo add-apt-repository -y ppa:kxstudio-debian/toolchain @@ -21,8 +35,8 @@ if [ "${TARGET}" = "linux" ] || [ "${TARGET}" = "win32" ] || [ "${TARGET}" = "wi wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' sudo dpkg --add-architecture i386 + sudo apt-get update -qq + sudo apt-get install -y -o APT::Immediate-Configure=false libc6 libc6:i386 libgcc-s1:i386 + sudo apt-get install -y -f + exit 0 fi - -sudo apt-get update -qq -sudo apt-get install -y -o APT::Immediate-Configure=false libc6 libc6:i386 libgcc-s1:i386 -sudo apt-get install -y -f diff --git a/.travis/install.sh b/.travis/install.sh index 0139d4bd0..2eddb3214 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -11,7 +11,6 @@ if [ "${TARGET}" = "linux" ]; then python3-rdflib \ libgtk2.0-dev \ libgtk-3-dev \ - libqt4-dev \ qtbase5-dev \ libasound2-dev \ libpulse-dev \ @@ -42,7 +41,6 @@ elif [ "${TARGET}" = "linux-strict" ]; then python3-rdflib \ libgtk2.0-dev \ libgtk-3-dev \ - libqt4-dev \ qtbase5-dev \ libasound2-dev \ libpulse-dev \ @@ -66,7 +64,6 @@ elif [ "${TARGET}" = "linux-juce-strict" ]; then python3-rdflib \ libgtk2.0-dev \ libgtk-3-dev \ - libqt4-dev \ qtbase5-dev \ libasound2-dev \ libjack-jackd2-dev \ diff --git a/README.md b/README.md index cc167afd1..56d1c509e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# ![Carla Logo](https://raw.githubusercontent.com/falkTX/Carla/master/resources/48x48/carla.png) Carla Plugin Host -[![Build Status](https://travis-ci.org/falkTX/Carla.png)](https://travis-ci.org/falkTX/Carla) +# ![Carla Logo](resources/48x48/carla.png) Carla Plugin Host +[![Build Status](https://travis-ci.com/falkTX/Carla.png)](https://travis-ci.com/falkTX/Carla) What is Carla? --------------- @@ -29,7 +29,7 @@ Carla is also available as an LV2 plugin and VST2 plugin. Screenshot ---------- -![Screenshot](http://kxstudio.linuxaudio.org/screenshots/carla.png) +![Screenshot](https://kx.studio/screenshots/carla.png) -See the [official webpage](http://kxstudio.linuxaudio.org/Applications:Carla) also. +See the [official webpage](https://kx.studio/Applications:Carla) also.