From 6fab4cb2104dc45e22247223bf9b89a1f7eef78f Mon Sep 17 00:00:00 2001
From: askmeaboutloom <3596156-askmeaboutloom@users.noreply.gitlab.com>
Date: Sat, 18 Oct 2025 06:46:12 +0200
Subject: [PATCH] Update net.drawpile to 2.3.0-beta.4

---
 metadata/net.drawpile.yml | 90 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 87 insertions(+), 3 deletions(-)

diff --git a/metadata/net.drawpile.yml b/metadata/net.drawpile.yml
index 9a2b04a325..fd9273b836 100644
--- a/metadata/net.drawpile.yml
+++ b/metadata/net.drawpile.yml
@@ -335,6 +335,87 @@ Builds:
       - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-x86_64-release
         --config Release
 
+  - versionName: 2.3.0-beta.4
+    versionCode: 2030004001
+    commit: 6115a8b21ae2d2b9bcd513dadb504aa1fb13f1e0
+    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;35.0.0' 'ndk;27.3.13750724' 'platforms;android-35'
+    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=35.0.0
+        ANDROID_NDK_VERSION=27.3.13750724 ANDROID_PLATFORM_VERSION=35 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.3.0-beta.4
+    versionCode: 2030004002
+    commit: 6115a8b21ae2d2b9bcd513dadb504aa1fb13f1e0
+    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;35.0.0' 'ndk;27.3.13750724' 'platforms;android-35'
+    output: buildandroid-arm64-v8a-release/bin/Drawpile-$$VERSION$$-30-35-arm64-v8a.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=arm64-v8a ANDROID_BUILD_TOOLS_VERSION=35.0.0
+        ANDROID_NDK_VERSION=27.3.13750724 ANDROID_PLATFORM_VERSION=35 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.3.0-beta.4
+    versionCode: 2030004003
+    commit: 6115a8b21ae2d2b9bcd513dadb504aa1fb13f1e0
+    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;35.0.0' 'ndk;27.3.13750724' 'platforms;android-35'
+      - rm -f /opt/android-sdk/ndk/27.3.13750724/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ranlib
+      - ln -s /opt/android-sdk/ndk/27.3.13750724/toolchains/llvm/prebuilt/linux-x86_64/bin/{llvm-ranlib,i686-linux-android-ranlib}
+    output: buildandroid-x86-release/bin/Drawpile-$$VERSION$$-23-23-x86.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=x86 ANDROID_BUILD_TOOLS_VERSION=35.0.0 ANDROID_NDK_VERSION=27.3.13750724
+        ANDROID_PLATFORM_VERSION=35 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.3.0-beta.4
+    versionCode: 2030004004
+    commit: 6115a8b21ae2d2b9bcd513dadb504aa1fb13f1e0
+    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;35.0.0' 'ndk;27.3.13750724' 'platforms;android-35'
+      - rm -f /opt/android-sdk/ndk/27.3.13750724/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ranlib
+      - ln -s /opt/android-sdk/ndk/27.3.13750724/toolchains/llvm/prebuilt/linux-x86_64/bin/{llvm-ranlib,x86_64-linux-android-ranlib}
+    output: buildandroid-x86_64-release/bin/Drawpile-$$VERSION$$-30-35-x86_64.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=x86_64 ANDROID_BUILD_TOOLS_VERSION=35.0.0 ANDROID_NDK_VERSION=27.3.13750724
+        ANDROID_PLATFORM_VERSION=35 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
@@ -345,9 +426,12 @@ MaintainerNotes: |-
   own repository. You can find them there in .github/workflows/main.yml in the
   step "Set Android environment variables".
 
-  Installing NDK 27.0.12077973 via the usual ndk entry under Builds fails to
-  find the version for some reason. We just install it via sdkmanager directly,
-  since we need to run that ourselves anyway due to the Qt issues above.
+  Installing the NDK via the usual ndk entry under Builds fails to find the
+  version for some reason. We just install it via sdkmanager directly, since we
+  need to run that ourselves anyway due to the Qt issues above.
+
+  Qt incorrectly calls a ranlib on x86 and x86_64 that doesn't exist in the NDK
+  anymore. We make a symlink to llvm-ranlib to work around that.
 
   Regular versions look like "1.2.3" for stable versions and "1.2.3-beta.4" for
   unstable versions. Versions that contain only fixes for F-Droid and don't