Commit 5e3bb14c authored by Ben Cooksley's avatar Ben Cooksley
Browse files

Revert "Add GCC9 to Krita AppImage base image"

GCC9 cannot be used due to various incompatibilities, so lets remove it.

This reverts commit 69dd4c6a.
parent 9911661f
Pipeline #79580 skipped with stage
......@@ -27,7 +27,7 @@ RUN apt-get install -y \
# General requirements for building KDE software
build-essential cmake git-core locales \
# General requirements for building other software
automake gcc-6 g++-6 gcc-9 g++-9 libxml-parser-perl libpq-dev libaio-dev \
automake gcc-6 g++-6 libxml-parser-perl libpq-dev libaio-dev \
# Needed for some frameworks
bison gettext \
# Qt and KDE Build Dependencies
......@@ -49,13 +49,6 @@ RUN apt-get install -y \
RUN add-apt-repository -y ppa:deadsnakes/ppa && apt-get update && apt-get install -y python3.9 python3.9-dev python3.9-venv && python3.9 -m ensurepip
RUN python3.9 -m pip install meson ninja
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 10 && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 20 && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 30 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 10 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 20 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 30
# Setup a user account for everything else to be done under
RUN useradd -d /home/appimage/ -u 1000 --user-group --create-home -G video appimage
# Make sure SSHD will be able to startup
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment