From 7a3fdcad47e6baff0dbd115c6fc19a7d3614622a Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:01:44 +0200
Subject: [PATCH 01/27] Bump CI build to Qt 6.5 LTS

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6092e23..fa51e32 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,11 +35,11 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 5.15.2
+          version: 6.5.3
           target: desktop
           arch: win64_msvc2019_64
           cache: true
-          cache-key-prefix: qt-windows-5.15.2
+          cache-key-prefix: install-qt-action
 
       - name: Clone QtApng
         uses: actions/checkout@master

From cd85cde4ad3d63bf21e9153dc9fa251f74e6e9a4 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:12:30 +0200
Subject: [PATCH 02/27] Switch QtApng repo

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fa51e32..8cb4842 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Clone QtApng
         uses: actions/checkout@master
         with:
-          repository: Skycoder42/QtApng
+          repository: TrickyLeifa/QtApng
           path: "QtApng"
 
       - name: Configure MSVC (Windows)

From 71a7f852ebdc121cae6a1407aeaea8efc78a3aa8 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:28:19 +0200
Subject: [PATCH 03/27] Switch repo to jurplel/QtApng and comment it out

---
 .github/workflows/build.yml | 62 ++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8cb4842..12a98ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,26 +41,41 @@ jobs:
           cache: true
           cache-key-prefix: install-qt-action
 
-      - name: Clone QtApng
-        uses: actions/checkout@master
-        with:
-          repository: TrickyLeifa/QtApng
-          path: "QtApng"
-
       - name: Configure MSVC (Windows)
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Build and deploy QtApng
+      - name: Set reusable strings
+      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+        id: strings
+        shell: bash
         run: |
-          cd QtApng/src/3rdparty
-          chmod +x get_libs.sh
-          ./get_libs.sh 1.3.1 1.6.40
-          cd ../..
-          qmake CONFIG+=install_ok QMAKE_CXXFLAGS+="-fno-sized-deallocation"
-          nmake
-          cd ..
-          mkdir ./bin/imageformats
-          cp ./QtApng/plugins/imageformats/qapng.dll ./bin/imageformats/qapng.dll
+          echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+
+      - name: Configure CMake
+        run: >
+          cmake -B ${{ steps.strings.outputs.build-output-dir }}
+          -DCMAKE_CXX_COMPILER=cl
+          -DCMAKE_C_COMPILER=cl
+          -DCMAKE_BUILD_TYPE=Release
+          -S ${{ github.workspace }}
+
+#      - name: Clone QtApng
+#        uses: actions/checkout@master
+#        with:
+#          repository: jurplel/QtApng
+#          path: "QtApng"
+
+#      - name: Build and deploy QtApng
+#        run: |
+#          cd QtApng/src/3rdparty
+#          chmod +x get_libs.sh
+#          ./get_libs.sh 1.3.1 1.6.40
+#          cd ../..
+#          qmake CONFIG+=install_ok QMAKE_CXXFLAGS+="-fno-sized-deallocation"
+#          nmake
+#          cd ..
+#          mkdir ./bin/imageformats
+#          cp ./QtApng/plugins/imageformats/qapng.dll ./bin/imageformats/qapng.dll
 
       - name: Install Windows Discord RPC
         shell: bash
@@ -92,21 +107,6 @@ jobs:
           cp ./bass/c/x64/bassopus.lib ./lib/
           cp ./bass/x64/bassopus.dll ./bin/
 
-      - name: Set reusable strings
-      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
-        id: strings
-        shell: bash
-        run: |
-          echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
-
-      - name: Configure CMake
-        run: >
-          cmake -B ${{ steps.strings.outputs.build-output-dir }}
-          -DCMAKE_CXX_COMPILER=cl
-          -DCMAKE_C_COMPILER=cl
-          -DCMAKE_BUILD_TYPE=Release
-          -S ${{ github.workspace }}
-
       - name: Build
         run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config Release
 

From 181cea3ef0edf53577a3d94d269090822fa75f05 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:31:55 +0200
Subject: [PATCH 04/27] Add Websockets module to Qt-install

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 12a98ee..01966c8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,6 +40,7 @@ jobs:
           arch: win64_msvc2019_64
           cache: true
           cache-key-prefix: install-qt-action
+          modules: 'qtwebsockets'
 
       - name: Configure MSVC (Windows)
         uses: ilammy/msvc-dev-cmd@v1

From 4a705914778096b326d902d7c8caa8409e689c31 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:40:57 +0200
Subject: [PATCH 05/27] Remove outdated parameter for windeployqt

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 01966c8..454da18 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -115,7 +115,7 @@ jobs:
         working-directory: ${{github.workspace}}/bin/
         shell: bash
         run: |
-          windeployqt --no-quick-import --no-translations --no-virtualkeyboard --no-compiler-runtime --no-webkit2 --no-opengl-sw ./Attorney_Online.exe
+          windeployqt --no-quick-import --no-translations --no-compiler-runtime --no-opengl-sw ./Attorney_Online.exe
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master

From a1191b7c08023569bf5297caad56897324a59047 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 09:54:49 +0200
Subject: [PATCH 06/27] Install imageformats moudule

Kind of important.
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 454da18..cbf9430 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
           arch: win64_msvc2019_64
           cache: true
           cache-key-prefix: install-qt-action
-          modules: 'qtwebsockets'
+          modules: 'qtimageformats qtwebsockets'
 
       - name: Configure MSVC (Windows)
         uses: ilammy/msvc-dev-cmd@v1

From 0b26afbe0f2f6c1a16489be881ad0c63f43b6c6b Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:02:23 +0200
Subject: [PATCH 07/27] Reenable QtApng

---
 .github/workflows/build.yml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cbf9430..224e8fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,23 +60,16 @@ jobs:
           -DCMAKE_BUILD_TYPE=Release
           -S ${{ github.workspace }}
 
-#      - name: Clone QtApng
-#        uses: actions/checkout@master
-#        with:
-#          repository: jurplel/QtApng
-#          path: "QtApng"
+      - name: Clone QtApng
+        uses: actions/checkout@master
+        with:
+          repository: jurplel/QtApng
+          path: "QtApng"
 
-#      - name: Build and deploy QtApng
-#        run: |
-#          cd QtApng/src/3rdparty
-#          chmod +x get_libs.sh
-#          ./get_libs.sh 1.3.1 1.6.40
-#          cd ../..
-#          qmake CONFIG+=install_ok QMAKE_CXXFLAGS+="-fno-sized-deallocation"
-#          nmake
-#          cd ..
-#          mkdir ./bin/imageformats
-#          cp ./QtApng/plugins/imageformats/qapng.dll ./bin/imageformats/qapng.dll
+      - name: Build and deploy QtApng
+        run: |
+          cmake --build ${{ steps.strings.outputs.build-output-dir }} --config Release
+          nmake
 
       - name: Install Windows Discord RPC
         shell: bash

From fafdcc183ae028270bcad01fe9fdf7367f5dcc8c Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:07:59 +0200
Subject: [PATCH 08/27] Compile QtApng, not AO2-Client

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 224e8fb..8cffa15 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -68,6 +68,7 @@ jobs:
 
       - name: Build and deploy QtApng
         run: |
+          cd QtApng
           cmake --build ${{ steps.strings.outputs.build-output-dir }} --config Release
           nmake
 

From 0587f1ef1972c6b90a2e9c1dede5aaf794895b32 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:15:08 +0200
Subject: [PATCH 09/27] Don't clone QApng in the CI

---
 .github/workflows/build.yml | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8cffa15..7016f35 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,18 +60,6 @@ jobs:
           -DCMAKE_BUILD_TYPE=Release
           -S ${{ github.workspace }}
 
-      - name: Clone QtApng
-        uses: actions/checkout@master
-        with:
-          repository: jurplel/QtApng
-          path: "QtApng"
-
-      - name: Build and deploy QtApng
-        run: |
-          cd QtApng
-          cmake --build ${{ steps.strings.outputs.build-output-dir }} --config Release
-          nmake
-
       - name: Install Windows Discord RPC
         shell: bash
         run: |
@@ -131,21 +119,6 @@ jobs:
           sudo apt-get upgrade
           sudo apt-get install qtbase5-dev libqt5websockets5-dev qttools5-dev qt5-image-formats-plugins
 
-      - name: Clone QtApng
-        uses: actions/checkout@master
-        with:
-          repository: Skycoder42/QtApng
-          path: "QtApng"
-
-      - name: Build and deploy QtApng
-        run: |
-          cd QtApng/src/3rdparty
-          chmod +x get_libs.sh
-          ./get_libs.sh 1.3.1 1.6.40
-          cd ../..
-          qmake CONFIG+=install_ok QMAKE_CXXFLAGS+="-fno-sized-deallocation"
-          make
-
       - name: Install Linux Discord RPC
         run: |
           curl -L https://github.com/discordapp/discord-rpc/releases/download/v3.4.0/discord-rpc-linux.zip -o discord_rpc.zip

From 9e8fc4313fdaebedb6a7768beeadbf4939c105bc Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:24:07 +0200
Subject: [PATCH 10/27] Add build option for QtApng to CMake file

---
 CMakeLists.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fabdcf..2788152 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 option(AO_BUILD_TESTS "Build test programs" ON)
 option(AO_ENABLE_DISCORD_RPC "Enable Discord Rich Presence" ON)
+option(AO_BUILD_QTAPNG_IMAGEPLUGIN "Enable APNG Imageplugin" ON)
 
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Network Widgets Concurrent WebSockets UiTools)
@@ -128,6 +129,17 @@ if(AO_BUILD_TESTS)
   add_subdirectory(test)
 endif()
 
+if (AO_BUILD_QTAPNG_IMAGEPLUGIN)
+    include(FetchContent)
+    FetchContent_Declare(
+      QtApng
+      GIT_REPOSITORY https://github.com/jurplel/QtApng.git
+      GIT_TAG        master
+      SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/QtApng
+    )
+    FetchContent_MakeAvailable(QtApng)
+endif()
+
 set_target_properties(Attorney_Online PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY $<1:${CMAKE_CURRENT_LIST_DIR}/bin>
         RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_CURRENT_LIST_DIR}/bin>)

From 1f53d14a48e0dfbf99eec01658ee0f602ec8dfb0 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 12:34:19 +0200
Subject: [PATCH 11/27] Switch Linux to jurplel/install-qt and 6.5.3

---
 .github/workflows/build.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7016f35..45eb0cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -113,11 +113,17 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Install Qt (Ubuntu)
-        run: |
-          sudo apt-get update
-          sudo apt-get upgrade
-          sudo apt-get install qtbase5-dev libqt5websockets5-dev qttools5-dev qt5-image-formats-plugins
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          aqtversion: '==3.1.*'
+          version: '6.5.3'
+          host: 'linux'
+          target: 'desktop'
+          arch: 'gcc_64'
+          cache: true
+          cache-key-prefix: install-qt-action
+          modules: 'qtimageformats qtwebsockets'
 
       - name: Install Linux Discord RPC
         run: |

From d2b4d5fb2db5cbb4e14ab699334f54b8d3a14c2c Mon Sep 17 00:00:00 2001
From: Leifa <26681464+TrickyLeifa@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:16:16 +0200
Subject: [PATCH 12/27] Remove APNG fetching

---
 CMakeLists.txt | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2788152..ab31644 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,17 +129,6 @@ if(AO_BUILD_TESTS)
   add_subdirectory(test)
 endif()
 
-if (AO_BUILD_QTAPNG_IMAGEPLUGIN)
-    include(FetchContent)
-    FetchContent_Declare(
-      QtApng
-      GIT_REPOSITORY https://github.com/jurplel/QtApng.git
-      GIT_TAG        master
-      SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/QtApng
-    )
-    FetchContent_MakeAvailable(QtApng)
-endif()
-
 set_target_properties(Attorney_Online PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY $<1:${CMAKE_CURRENT_LIST_DIR}/bin>
         RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_CURRENT_LIST_DIR}/bin>)

From accbc17f51959427458edb2ed5335a202e74b18b Mon Sep 17 00:00:00 2001
From: Leifa <26681464+TrickyLeifa@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:17:52 +0200
Subject: [PATCH 13/27] Fetch APNG and build it

---
 .github/workflows/build.yml | 46 +++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 45eb0cc..2f78c05 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,14 +52,6 @@ jobs:
         run: |
           echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
-      - name: Configure CMake
-        run: >
-          cmake -B ${{ steps.strings.outputs.build-output-dir }}
-          -DCMAKE_CXX_COMPILER=cl
-          -DCMAKE_C_COMPILER=cl
-          -DCMAKE_BUILD_TYPE=Release
-          -S ${{ github.workspace }}
-
       - name: Install Windows Discord RPC
         shell: bash
         run: |
@@ -90,8 +82,22 @@ jobs:
           cp ./bass/c/x64/bassopus.lib ./lib/
           cp ./bass/x64/bassopus.dll ./bin/
 
+      - name: Clone Apng plugin
+        uses: actions/checkout@master
+        with:
+          repository: jurplel/QtApng
+          path: ./qtapng
+
+      - name: Build Apng plugin
+        run: |
+          cd ./qtapng
+          cmake . -D CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="${{ github.workspace }}/lib"
+          cmake --build . --config Release
+
       - name: Build
-        run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config Release
+        run: |
+          cmake .
+          cmake --build . --config Release
 
       - name: Deploy Windows
         working-directory: ${{github.workspace}}/bin/
@@ -160,16 +166,22 @@ jobs:
         run: |
           echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
-      - name: Configure CMake
-        run: >
-          cmake -B ${{ steps.strings.outputs.build-output-dir }}
-          -DCMAKE_CXX_COMPILER=g++
-          -DCMAKE_C_COMPILER=gcc
-          -DCMAKE_BUILD_TYPE=Release
-          -S ${{ github.workspace }}
+      - name: Clone Apng plugin
+        uses: actions/checkout@master
+        with:
+          repository: jurplel/QtApng
+          path: ./qtapng
+
+      - name: Build Apng plugin
+        run: |
+          cd ./qtapng
+          cmake . -D CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="${{ github.workspace }}/lib"
+          cmake --build . --config Release
 
       - name: Build
-        run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config Release
+        run: |
+          cmake .
+          cmake --build . --config Release
 
       - name: Deploy Linux
         working-directory: ${{github.workspace}}/bin/

From a259d9e8cc4ed6d8de23c70faa2c06e8adeb27d7 Mon Sep 17 00:00:00 2001
From: Leifa <26681464+TrickyLeifa@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:22:43 +0200
Subject: [PATCH 14/27] Relocate plugin final destination path

---
 .github/workflows/build.yml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2f78c05..1e9adf2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,13 +45,6 @@ jobs:
       - name: Configure MSVC (Windows)
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Set reusable strings
-      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
-        id: strings
-        shell: bash
-        run: |
-          echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
-
       - name: Install Windows Discord RPC
         shell: bash
         run: |
@@ -91,7 +84,7 @@ jobs:
       - name: Build Apng plugin
         run: |
           cd ./qtapng
-          cmake . -D CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="${{ github.workspace }}/lib"
+          cmake . -D CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="${{ github.workspace }}/bin/imageformats/"
           cmake --build . --config Release
 
       - name: Build
@@ -159,13 +152,6 @@ jobs:
           cp ./bass/libs/x86_64/libbassopus.so ./lib/
           cp ./bass/libs/x86_64/libbassopus.so ./bin/
 
-      - name: Set reusable strings
-      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
-        id: strings
-        shell: bash
-        run: |
-          echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
-
       - name: Clone Apng plugin
         uses: actions/checkout@master
         with:
@@ -175,7 +161,7 @@ jobs:
       - name: Build Apng plugin
         run: |
           cd ./qtapng
-          cmake . -D CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="${{ github.workspace }}/lib"
+          cmake . -D CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="${{ github.workspace }}/bin/imageformats/"
           cmake --build . --config Release
 
       - name: Build

From c7e43cb2871e75c8d9988390a312d109d68cf211 Mon Sep 17 00:00:00 2001
From: Leifa <26681464+TrickyLeifa@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:32:28 +0200
Subject: [PATCH 15/27] Update apng final destination path, ...

* Update apng final destination path
* Also remove the CI copying files to `imageformats` only to immediately start deleting everything inside of said directory
---
 .github/workflows/build.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e9adf2..14a4592 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,6 @@ on:
   pull_request:
     branches: [ "master" ]
 
-
 jobs:
   formatting-check:
     name: formatting-check
@@ -22,8 +21,6 @@ jobs:
          check-path: 'src'
          fallback-style: LLVM
 
-
-
   build-windows:
     needs: formatting-check
     runs-on: windows-latest
@@ -174,12 +171,9 @@ jobs:
         shell: bash
         run: |
           cp ../scripts/launch.sh .
-          mkdir -p imageformats
-          cp ../QtApng/plugins/imageformats/libqapng.so ./imageformats/libqapng.so
           chmod +x launch.sh
           chmod +x Attorney_Online
           tar -cf Attorney_Online.tar ./*
-          rm -rf imageformats
           rm *.so
           rm *.sh
           rm Attorney_Online

From 7e527353a63bd5e71006ff3d8c27243e6e22eaea Mon Sep 17 00:00:00 2001
From: Leifa <26681464+TrickyLeifa@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:46:52 +0200
Subject: [PATCH 16/27] Fix Linux archiving a tar inside a zip

---
 .github/workflows/build.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 14a4592..7620f3f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -81,7 +81,7 @@ jobs:
       - name: Build Apng plugin
         run: |
           cd ./qtapng
-          cmake . -D CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="${{ github.workspace }}/bin/imageformats/"
+          cmake .
           cmake --build . --config Release
 
       - name: Build
@@ -167,19 +167,17 @@ jobs:
           cmake --build . --config Release
 
       - name: Deploy Linux
-        working-directory: ${{github.workspace}}/bin/
         shell: bash
         run: |
+          cd ${{ github.workspace }}/bin
+          mkdir ./imageformats
+          cp ../qtapng/plugins/imageformats/libqapng.so ./imageformats
           cp ../scripts/launch.sh .
           chmod +x launch.sh
           chmod +x Attorney_Online
-          tar -cf Attorney_Online.tar ./*
-          rm *.so
-          rm *.sh
-          rm Attorney_Online
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master
         with:
           name: Attorney_Online-Linux
-          path: ${{github.workspace}}/bin/Attorney_Online.tar
+          path: ${{github.workspace}}/bin

From ba62265ce0e69a9634e0c5b69a5928adbc4db266 Mon Sep 17 00:00:00 2001
From: Leifa <26681464+TrickyLeifa@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:05:32 +0200
Subject: [PATCH 17/27] Removed option of fetching Apng since we no longer
 fetch it from the project

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab31644..6fabdcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 option(AO_BUILD_TESTS "Build test programs" ON)
 option(AO_ENABLE_DISCORD_RPC "Enable Discord Rich Presence" ON)
-option(AO_BUILD_QTAPNG_IMAGEPLUGIN "Enable APNG Imageplugin" ON)
 
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Network Widgets Concurrent WebSockets UiTools)

From 16075f908b2d9d1e5edaa22ca50429a287f5e09b Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 18:58:25 +0200
Subject: [PATCH 18/27] Add themes to CI run

resolves #970
---
 .github/workflows/build.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7620f3f..f3572f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -95,6 +95,12 @@ jobs:
         run: |
           windeployqt --no-quick-import --no-translations --no-compiler-runtime --no-opengl-sw ./Attorney_Online.exe
 
+      - name: Clone Themes
+        uses: actions/checkout@master
+        with:
+          repository: AttorneyOnline/AO2-Themes
+          path: "bin/themes"
+
       - name: Upload Artifact
         uses: actions/upload-artifact@master
         with:
@@ -176,6 +182,12 @@ jobs:
           chmod +x launch.sh
           chmod +x Attorney_Online
 
+      - name: Clone Themes
+        uses: actions/checkout@master
+        with:
+          repository: AttorneyOnline/AO2-Themes
+          path: "bin/themes"
+
       - name: Upload Artifact
         uses: actions/upload-artifact@master
         with:

From aa8bf20d74fe1988bed25e2a7d3bd02959b55ccf Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 19:06:32 +0200
Subject: [PATCH 19/27] Put it in the right folder

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3572f2..4c7a32f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -186,7 +186,7 @@ jobs:
         uses: actions/checkout@master
         with:
           repository: AttorneyOnline/AO2-Themes
-          path: "bin/themes"
+          path: "bin/base/themes"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master

From fb322c5c87d5e1d5051d2ef8837a5d5c508a71b6 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 19:58:23 +0200
Subject: [PATCH 20/27] Put all the themes where they belong

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4c7a32f..f2d75f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,7 +99,7 @@ jobs:
         uses: actions/checkout@master
         with:
           repository: AttorneyOnline/AO2-Themes
-          path: "bin/themes"
+          path: "bin/base/themes"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master

From 51efa6b4e6e683a736734cfa819c3a6abd7c9ab2 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Mon, 24 Jun 2024 23:49:01 +0200
Subject: [PATCH 21/27] Add filter

Should ignore all dot folders/files
---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f2d75f2..c2801f5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,6 +100,7 @@ jobs:
         with:
           repository: AttorneyOnline/AO2-Themes
           path: "bin/base/themes"
+          filter: ".*"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master
@@ -187,6 +188,7 @@ jobs:
         with:
           repository: AttorneyOnline/AO2-Themes
           path: "bin/base/themes"
+          filter: ".*"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master

From 1a10186dde196ef7973f46d661c3e2904ce97fe1 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:00:02 +0200
Subject: [PATCH 22/27] Cleanup instead of filter

---
 .github/workflows/build.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c2801f5..250b961 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -102,6 +102,12 @@ jobs:
           path: "bin/base/themes"
           filter: ".*"
 
+      - name: Cleanup Themes Checkout
+        run: |
+          rm ./bin/base/themes/.gitignore
+          rm .bin/base/themes/.gitattributes
+          rm -r ./bin/base/themes/.git
+
       - name: Upload Artifact
         uses: actions/upload-artifact@master
         with:
@@ -188,7 +194,12 @@ jobs:
         with:
           repository: AttorneyOnline/AO2-Themes
           path: "bin/base/themes"
-          filter: ".*"
+
+      - name: Cleanup Themes Checkout
+        run: |
+          rm ./bin/base/themes/.gitignore
+          rm .bin/base/themes/.gitattributes
+          rm -r ./bin/base/themes/.git
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master

From 14d8d2c53ad4bbd5e2c70e098e565d97dfcfa69b Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:04:30 +0200
Subject: [PATCH 23/27] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 250b961..4fb9517 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -198,7 +198,7 @@ jobs:
       - name: Cleanup Themes Checkout
         run: |
           rm ./bin/base/themes/.gitignore
-          rm .bin/base/themes/.gitattributes
+          rm ./bin/base/themes/.gitattributes
           rm -r ./bin/base/themes/.git
 
       - name: Upload Artifact

From 2fcdbee4c998346508f1b58faf9b67c878f735c5 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:26:19 +0200
Subject: [PATCH 24/27] Fix windows too

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4fb9517..e60fb0d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,12 +100,11 @@ jobs:
         with:
           repository: AttorneyOnline/AO2-Themes
           path: "bin/base/themes"
-          filter: ".*"
 
       - name: Cleanup Themes Checkout
         run: |
           rm ./bin/base/themes/.gitignore
-          rm .bin/base/themes/.gitattributes
+          rm ./bin/base/themes/.gitattributes
           rm -r ./bin/base/themes/.git
 
       - name: Upload Artifact

From d0050b3fffb7a4d2816e05f5f2700cb107799298 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:39:15 +0200
Subject: [PATCH 25/27] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e60fb0d..51b31e2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,7 +105,7 @@ jobs:
         run: |
           rm ./bin/base/themes/.gitignore
           rm ./bin/base/themes/.gitattributes
-          rm -r ./bin/base/themes/.git
+          rm -rf ./bin/base/themes/.git
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master

From a9d5661e89d0264db562d027753e9b39883d00e3 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Tue, 25 Jun 2024 00:46:27 +0200
Subject: [PATCH 26/27] FORCE

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 51b31e2..94cf4e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,7 +105,7 @@ jobs:
         run: |
           rm ./bin/base/themes/.gitignore
           rm ./bin/base/themes/.gitattributes
-          rm -rf ./bin/base/themes/.git
+          Remove-Item -Path "./bin/base/themes/.git" -Recurse -Force
 
       - name: Upload Artifact
         uses: actions/upload-artifact@master

From fd2e3097b975b030926187b6fca90bd8d92682f0 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Sun, 30 Jun 2024 21:56:29 +0200
Subject: [PATCH 27/27] Update readme to mention Qt6, not Qt5

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9383f6b..3916a17 100644
--- a/README.md
+++ b/README.md
@@ -9,15 +9,15 @@
 Linux users will need to install the system dependencies related to Qt. These are the commands to run on a terminal for some distributions:
 * Ubuntu 22.04 LTS:
 ```
-$ sudo apt-get install qt5base-dev libqt5websockets5 qt5-image-formats-plugins libqt5svg5
+$ sudo apt-get install qt6base-dev libqt6websockets6 qt6-image-formats-plugins libqt6svg6
 ```
 * Arch:
 ```
-$ sudo pacman -Syu qt5-base qt5-websockets qt5-imageformats qt5-svg
+$ sudo pacman -Syu qt6-base qt6-websockets qt6-imageformats qt6-svg
 ```
 * Fedora:
 ```
-$ sudo dnf install qt5-qtbase qt5-qtwebsockets qt5-qtimageformats qt5-qtsvg
+$ sudo dnf install qt6-qtbase qt6-qtwebsockets qt6-qtimageformats qt6-qtsvg
 ```
 
 ## Credits
@@ -40,7 +40,7 @@ Killing Fever Online additions copyright (c) 2019 Crystalwarrior
 
 ### Qt
 
-This project uses Qt 5, which is licensed under the [GNU Lesser General Public License](https://www.gnu.org/licenses/lgpl-3.0.txt) with [certain licensing restrictions and exceptions](https://www.qt.io/qt-licensing-terms/). To comply with licensing requirements for static linking, object code is available if you would like to relink with an alternative version of Qt, and the source code for Qt may be found at https://github.com/qt/qtbase, http://code.qt.io/cgit/, or at https://qt.io.
+This project uses Qt 6.5.3, which is licensed under the [GNU Lesser General Public License](https://www.gnu.org/licenses/lgpl-3.0.txt) with [certain licensing restrictions and exceptions](https://www.qt.io/qt-licensing-terms/). To comply with licensing requirements for static linking, object code is available if you would like to relink with an alternative version of Qt, and the source code for Qt may be found at https://github.com/qt/qtbase, http://code.qt.io/cgit/, or at https://qt.io.
 
 Copyright (c) 2016 The Qt Company Ltd.