From e64b6c5fcd3aee7732cab11adfa5739edf8dde69 Mon Sep 17 00:00:00 2001
From: Urs Fleisch <ufleisch@users.sourceforge.net>
Date: Sat, 10 Feb 2024 18:22:14 +0100
Subject: [PATCH] kid3 - Use Qt 6.5.3

---
 metadata/net.sourceforge.kid3.yml | 71 ++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/metadata/net.sourceforge.kid3.yml b/metadata/net.sourceforge.kid3.yml
index 189469558c..b5ddfeb150 100644
--- a/metadata/net.sourceforge.kid3.yml
+++ b/metadata/net.sourceforge.kid3.yml
@@ -431,8 +431,75 @@ Builds:
       - COMPILER=cross-android ../build.sh
     ndk: r19c
 
+  - versionName: 3.9.5
+    versionCode: 29
+    commit: 36698627ed3a01ee3a76f6c293fe3fc0978aecaf
+    timeout: 14400
+    sudo:
+      - apt-get update
+      - apt-get install -y 7zip build-essential cmake docbook-xsl make ninja-build
+        python-is-python3 libclang-dev
+    output: android-build/kid3/android/android-build/build/outputs/apk/release/android-build-release-unsigned.apk
+    srclibs:
+      - Qt5@v6.5.3
+    prebuild:
+      - sdkmanager 'platforms;android-33' 'build-tools;33.0.0'
+      - cd $$Qt5$$
+      - ./init-repository -f --module-subset=qtbase,qtdeclarative,qtimageformats,qtmultimedia,qtshadertools,qtsvg,qttools,qttranslations
+    target: android-22
+    build:
+      - export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+      - export ANDROID_SDK_ROOT=$$SDK$$ ANDROID_NDK_ROOT=$$NDK$$
+      - export ANDROID_API_VERSION=android-31
+      - export PATH=${JAVA_HOME}/bin:${PATH}
+      - export BUILD_DIR=$(readlink -f ${PWD})/android-build
+      - export QT_HOST_BUILD=$(readlink -f ${PWD}/../srclib)/build-host-qt
+      - export QT_HOST_PREFIX=$(readlink -f ${PWD}/../srclib)/qt/6.5.3/gcc_64
+      - export QT_BUILD=$(readlink -f ${PWD}/../srclib)/build-qt
+      - export QTPREFIX=$(readlink -f ${PWD}/../srclib)/qt/6.5.3/android_armv7
+      - rm -rf $QT_HOST_PREFIX $QT_HOST_BUILD $QTPREFIX $QT_BUILD
+      - mkdir -p $BUILD_DIR $QT_HOST_PREFIX $QT_HOST_BUILD $QTPREFIX $QT_BUILD
+      - pushd ${BUILD_DIR}
+      - COMPILER=cross-android ../build.sh libs
+      - popd
+      - pushd ${QT_HOST_BUILD}
+      - $$Qt5$$/configure -opensource -confirm-license -prefix $QT_HOST_PREFIX -release
+        -submodules qtbase,qttools -nomake tests -nomake examples -no-sql-mysql -no-dbus
+        -no-openssl -no-glib -no-icu -no-cups -no-fontconfig -no-gtk -no-egl -skip
+        qtnetwork,qtsql,qtxml,qtprintsupport,qttestlib,qtwebengine,qtgamepad,qtwebchannel
+        -skip qtwebview,qtwebsockets,qtwebglplugin,qtserialport,qtnetworkauth,qt3d,qtsensors
+        -skip qtwayland,qtxmlpatterns,qtscxml,qtscript,qtconnectivity,qtimageformats
+        -skip qtlanguageserver,qtquicktimeline,qtquick3d,qt5compat,qtactiveqt,qtcharts
+        -skip qtcoap,qtdatavis3d,qthttpserver,qtpositioning,qtdoc,qtgrpc,qtlocation,qtlottie
+        -skip qtmqtt,qtopcua,qtquick3dphysics,qtquickeffectmaker,qtremoteobjects,qtserialbus
+        -skip qtspeech,qtvirtualkeyboard -no-opengl -no-feature-debug -no-feature-itemmodeltester
+        -no-feature-concurrent -- -D CMAKE_INSTALL_MESSAGE=NEVER
+      - cmake --build . --parallel
+      - cmake --install .
+      - popd
+      - pushd ${QT_BUILD}
+      - $$Qt5$$/configure -platform android-clang --disable-rpath -opensource -confirm-license
+        -silent -prefix $QTPREFIX -release -nomake tests -nomake examples -no-sql-mysql
+        -no-dbus -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -android-sdk
+        $$SDK$$ -android-ndk $$NDK$$ -android-arch armeabi-v7a -android-ndk-platform
+        android-23 -skip qtwebengine,qtgamepad,qtwebchannel,qtwebview,qtwebsockets,qtwebglplugin
+        -skip qtserialport,qtnetworkauth,qt3d,qtsensors,qtwayland,qtxmlpatterns,qtscxml
+        -skip qtscript,qtconnectivity,qtlanguageserver,qtquicktimeline,qtquick3d,qt5compat
+        -skip qtactiveqt,qtcharts,qtcoap,qtdatavis3d,qthttpserver,qtpositioning,qtdoc,qtgrpc
+        -skip qtlocation,qtlottie,qtmqtt,qtopcua,qtquick3dphysics,qtquickeffectmaker
+        -skip qtremoteobjects,qtserialbus,qtspeech,qtvirtualkeyboard -no-feature-debug
+        -no-feature-itemmodeltester -qt-host-path $QT_HOST_PREFIX -openssl-runtime
+        -- -D OPENSSL_ROOT_DIR=$BUILD_DIR/buildroot/usr/local -D CMAKE_INSTALL_MESSAGE=NEVER
+      - cmake --build . --parallel
+      - cmake --install .
+      - popd
+      - pushd ${BUILD_DIR}
+      - COMPILER=cross-android QTBINARYDIR=$QT_HOST_PREFIX/bin ../build.sh package
+      - popd
+    ndk: 23.1.7779620
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$
 UpdateCheckData: CMakeLists.txt|set\(QT_ANDROID_APP_VERSION_CODE\s+(\d+)\)|kid3.spec|Version:\s*(\S+)
-CurrentVersion: 3.9.4
-CurrentVersionCode: 28
+CurrentVersion: 3.9.5
+CurrentVersionCode: 29