From 121abce408153b6944ee593b30b02d343663f3cb Mon Sep 17 00:00:00 2001
From: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
Date: Wed, 15 Jan 2025 18:39:13 +0100
Subject: [PATCH 1/4] Fix #1824 (#1825)

---
 libsrc/utils/ImageResampler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsrc/utils/ImageResampler.cpp b/libsrc/utils/ImageResampler.cpp
index d36beb10..793620a5 100644
--- a/libsrc/utils/ImageResampler.cpp
+++ b/libsrc/utils/ImageResampler.cpp
@@ -53,7 +53,7 @@ void ImageResampler::processImage(const uint8_t * data, int width, int height, i
 	int xDestStart {0};
 	int xDestEnd = {outputWidth-1};
 	int yDestStart = {0};
-	int yDestEnd = {outputWidth-1};
+	int yDestEnd = {outputHeight-1};
 
 	switch (_flipMode)
 	{

From d7295c88b8671e088cb902f503c5424be73ec252 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Feb 2025 22:15:28 +0100
Subject: [PATCH 2/4] Bump jakoch/install-vulkan-sdk-action from 1.0.5 to 1.0.6
 (#1834)

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

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 9fa28ca3..7e48302c 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -182,7 +182,7 @@ jobs:
 
       - name: Install Vulkan SDK
         if: ${{ inputs.qt_version == '6' }}
-        uses: jakoch/install-vulkan-sdk-action@v1.0.5
+        uses: jakoch/install-vulkan-sdk-action@v1.0.6
         with:
           install_runtime: false
           cache: true

From 307fda4dc9bb48067f3fab74387d4f037b5ec828 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Sat, 8 Feb 2025 16:27:23 +0100
Subject: [PATCH 3/4] [CI] Switch to ubuntu-22.04 runner

relates to tonistiigi/binfmt#215
---
 .github/workflows/qt5_6.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 7e48302c..1a714a4c 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -36,7 +36,7 @@ jobs:
 
   Linux:
     name: 🐧 ${{ matrix.os.description }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

From dd81a23dfca5b434b7199153ab08c06cf611b3c7 Mon Sep 17 00:00:00 2001
From: LordGrey <48840279+Lord-Grey@users.noreply.github.com>
Date: Thu, 13 Feb 2025 18:05:50 +0100
Subject: [PATCH 4/4] Update docker-compile.sh

---
 bin/scripts/docker-compile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/scripts/docker-compile.sh b/bin/scripts/docker-compile.sh
index 96f6abed..464adcc2 100755
--- a/bin/scripts/docker-compile.sh
+++ b/bin/scripts/docker-compile.sh
@@ -200,7 +200,7 @@ if [ ${CURRENT_ARCHITECTURE} == "aarch64" ]; then
 		   USER_ARCHITECTURE="arm/v6"
 	   fi
 	fi
-    if [ $ARCHITECTURE != $USER_ARCHITECTURE ]; then
+    if [ $CURRENT_ARCHITECTURE != $USER_ARCHITECTURE ]; then
         log "Identified user space current architecture: $USER_ARCHITECTURE"
         CURRENT_ARCHITECTURE=$USER_ARCHITECTURE
     fi
@@ -211,7 +211,7 @@ fi
 log "Identified kernel current architecture: $CURRENT_ARCHITECTURE"
 if [ $ARCHITECTURE != $CURRENT_ARCHITECTURE ]; then
 	echo "---> Build is not for the same architecturem, enable emulation for ${PLATFORM_ARCHITECTURE}"
-	ENTRYPOINT_OPTION=
+	ENTRYPOINT_OPTION="--entrypoint /usr/bin/qemu-static"
 
 	if [ $CURRENT_ARCHITECTURE != "amd64" ]; then
 		echo "---> Emulation builds can only be executed on linux/amd64, linux/x86_64 platforms, current architecture is ${CURRENT_ARCHITECTURE}"