From cddec5e6db17f4fc5994bb482ee4b9fbc87b9526 Mon Sep 17 00:00:00 2001
From: askmeaboutloom <3596156-askmeaboutloom@users.noreply.gitlab.com>
Date: Thu, 27 Mar 2025 10:41:53 +0000
Subject: [PATCH] Update net.drawpile to 2.2.2-fix.1

---
 metadata/net.drawpile.yml | 82 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/metadata/net.drawpile.yml b/metadata/net.drawpile.yml
index 8c21613280..9e5a00c197 100644
--- a/metadata/net.drawpile.yml
+++ b/metadata/net.drawpile.yml
@@ -176,6 +176,84 @@ Builds:
       - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-x86_64-release
         --config Release
 
+  - versionName: 2.2.2-fix.1
+    versionCode: 2020299011
+    commit: 609885d626205862638b323e5c2d255d5d07ab3f
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential cmake nasm ninja-build pkg-config yasm
+      - rm -rf /opt/android-sdk/{build-tools,ndk,platforms}
+      - sdkmanager 'build-tools;34.0.0-rc3' 'ndk;27.0.12077973' 'platforms;android-34'
+    output: buildandroid-armeabi-v7a-release/bin/Drawpile-$$VERSION$$-23-23-armeabi-v7a.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=armeabi-v7a ANDROID_BUILD_TOOLS_VERSION=34.0.0-rc3
+        ANDROID_NDK_VERSION=27.0.12077973 ANDROID_PLATFORM_VERSION=34 ANDROID_TARGET_VERSION=23
+        ANDROID_SDK_DIR=$$SDK$$ ANDROID_SDKMANAGER=sdkmanager bash -c 'pkg/android/build.bash
+        setup && pkg/android/build.bash configure -DBUILD_ANDROID_VERSION_CODE=$$VERCODE$$
+        -DBUILD_VERSION=$$VERSION$$ -DCLANG_TIDY=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DDISABLE_UPDATE_CHECK_DEFAULT=ON -DDIST_BUILD=ON -DUSE_STRICT_ALIASING=ON
+        -DANDROID_MIN_SDK_VERSION=23'
+      - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-armeabi-v7a-release
+        --config Release
+
+  - versionName: 2.2.2-fix.1
+    versionCode: 2020299012
+    commit: 609885d626205862638b323e5c2d255d5d07ab3f
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential cmake nasm ninja-build pkg-config yasm
+      - rm -rf /opt/android-sdk/{build-tools,ndk,platforms}
+      - sdkmanager 'build-tools;34.0.0-rc3' 'ndk;27.0.12077973' 'platforms;android-34'
+    output: buildandroid-arm64-v8a-release/bin/Drawpile-$$VERSION$$-30-34-arm64-v8a.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=arm64-v8a ANDROID_BUILD_TOOLS_VERSION=34.0.0-rc3
+        ANDROID_NDK_VERSION=27.0.12077973 ANDROID_PLATFORM_VERSION=34 ANDROID_SDK_DIR=$$SDK$$
+        ANDROID_SDKMANAGER=sdkmanager bash -c 'pkg/android/build.bash setup && pkg/android/build.bash
+        configure -DBUILD_ANDROID_VERSION_CODE=$$VERCODE$$ -DBUILD_VERSION=$$VERSION$$
+        -DCLANG_TIDY=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_UPDATE_CHECK_DEFAULT=ON
+        -DDIST_BUILD=ON -DUSE_STRICT_ALIASING=ON -DANDROID_MIN_SDK_VERSION=30'
+      - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-arm64-v8a-release
+        --config Release
+
+  - versionName: 2.2.2-fix.1
+    versionCode: 2020299013
+    commit: 609885d626205862638b323e5c2d255d5d07ab3f
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential cmake nasm ninja-build pkg-config yasm
+      - rm -rf /opt/android-sdk/{build-tools,ndk,platforms}
+      - sdkmanager 'build-tools;34.0.0-rc3' 'ndk;27.0.12077973' 'platforms;android-34'
+    output: buildandroid-x86-release/bin/Drawpile-$$VERSION$$-23-23-x86.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=x86 ANDROID_BUILD_TOOLS_VERSION=34.0.0-rc3
+        ANDROID_NDK_VERSION=27.0.12077973 ANDROID_PLATFORM_VERSION=34 ANDROID_TARGET_VERSION=23
+        ANDROID_SDK_DIR=$$SDK$$ ANDROID_SDKMANAGER=sdkmanager bash -c 'pkg/android/build.bash
+        setup && pkg/android/build.bash configure -DBUILD_ANDROID_VERSION_CODE=$$VERCODE$$
+        -DBUILD_VERSION=$$VERSION$$ -DCLANG_TIDY=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DDISABLE_UPDATE_CHECK_DEFAULT=ON -DDIST_BUILD=ON -DUSE_STRICT_ALIASING=ON
+        -DANDROID_MIN_SDK_VERSION=23'
+      - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-x86-release --config
+        Release
+
+  - versionName: 2.2.2-fix.1
+    versionCode: 2020299014
+    commit: 609885d626205862638b323e5c2d255d5d07ab3f
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential cmake nasm ninja-build pkg-config yasm
+      - rm -rf /opt/android-sdk/{build-tools,ndk,platforms}
+      - sdkmanager 'build-tools;34.0.0-rc3' 'ndk;27.0.12077973' 'platforms;android-34'
+    output: buildandroid-x86_64-release/bin/Drawpile-$$VERSION$$-30-34-x86_64.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=x86_64 ANDROID_BUILD_TOOLS_VERSION=34.0.0-rc3
+        ANDROID_NDK_VERSION=27.0.12077973 ANDROID_PLATFORM_VERSION=34 ANDROID_SDK_DIR=$$SDK$$
+        ANDROID_SDKMANAGER=sdkmanager bash -c 'pkg/android/build.bash setup && pkg/android/build.bash
+        configure -DBUILD_ANDROID_VERSION_CODE=$$VERCODE$$ -DBUILD_VERSION=$$VERSION$$
+        -DCLANG_TIDY=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_UPDATE_CHECK_DEFAULT=ON
+        -DDIST_BUILD=ON -DUSE_STRICT_ALIASING=ON -DANDROID_MIN_SDK_VERSION=30'
+      - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-x86_64-release
+        --config Release
+
 MaintainerNotes: |-
   Qt's Android build process is extremely fragile and will fail by the mere
   presence of superfluous build-tools, ndk or platform versions, no matter how
@@ -198,5 +276,5 @@ VercodeOperation:
   - 10 * %c + 3
   - 10 * %c + 4
 UpdateCheckData: metadata/fdroidversion.txt|code=([0-9]+)|.|name=(\S+)
-CurrentVersion: 2.2.2-beta.5
-CurrentVersionCode: 2020205004
+CurrentVersion: 2.2.2-fix.1
+CurrentVersionCode: 2020299014