From e1408af5040e82b4bf8c5131178872807d6f9208 Mon Sep 17 00:00:00 2001
From: TGP17 <86961834+TGP17@users.noreply.github.com>
Date: Thu, 11 May 2023 20:46:50 +0200
Subject: [PATCH] Change AppImage Buildsystem to Ubuntu20.04

---
 linux-appimage/Dockerfile | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/linux-appimage/Dockerfile b/linux-appimage/Dockerfile
index 0370e1c..c30500f 100644
--- a/linux-appimage/Dockerfile
+++ b/linux-appimage/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-backports
+FROM ubuntu:20.04
 LABEL maintainer="citraemu"
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -6,12 +6,24 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Create a user account citra (UID 1027) that the container will run as
 RUN useradd -m -u 1027 -s /bin/bash citra
 
-# Update system and install packages for building Citra.
-RUN apt-get update && apt-get full-upgrade -y -t bullseye-backports
-RUN apt-get install -y -t bullseye-backports \
+# Update system, install PPAs and install packages for building Citra.
+RUN apt-get update && apt-get full-upgrade -y
+RUN apt-get install -y software-properties-common lsb-release
+RUN add-apt-repository -y ppa:savoury1/build-tools
+RUN add-apt-repository -y ppa:savoury1/display
+RUN add-apt-repository -y ppa:savoury1/ffmpeg4
+RUN add-apt-repository -y ppa:savoury1/gcc-defaults-11
+RUN add-apt-repository -y ppa:savoury1/llvm-defaults-13
+RUN add-apt-repository -y ppa:savoury1/qt-6-2
+RUN add-apt-repository -y ppa:theofficialgman/gpu-tools
+RUN apt-get update && apt-get upgrade -y && apt-get dist-upgrade -y
+RUN apt-get install -y \
     build-essential \
     libsdl2-dev \
     libssl-dev \
+    gcc-11 \
+    g++-11 \
+    cpp-11 \
 # Qt 5
     qtbase5-dev \
     qtbase5-private-dev \
@@ -32,6 +44,7 @@ RUN apt-get install -y -t bullseye-backports \
     qt6-tools-dev \
     qt6-tools-dev-tools \
     qt6-gtk-platformtheme \
+    qt6-documentation-tools \
     qt6-wayland \
 # FFmpeg
     ffmpeg \
@@ -53,13 +66,6 @@ RUN apt-get install -y -t bullseye-backports \
     glslang-tools \
     file
 
-# Install glslang
-RUN cd /tmp
-RUN wget https://github.com/KhronosGroup/glslang/releases/download/main-tot/glslang-main-linux-Release.zip
-RUN unzip glslang-main-linux-Release.zip -d glslang
-RUN cp -rv glslang/* /usr
-run rm -rf glslang-*
-
 # Download tools for building AppImages
 RUN wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
 RUN wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage