diff --git a/metadata/org.krita.yml b/metadata/org.krita.yml index f40afc66da..fa9ee2453b 100644 --- a/metadata/org.krita.yml +++ b/metadata/org.krita.yml @@ -603,33 +603,151 @@ Builds: -p=apk ndk: r22b + - versionName: 5.1.2 + versionCode: 5011501 + commit: 27a9cc22f76a9b9934f939ea2fb57e52bef8aa2a + timeout: 30000 + sudo: + - apt-get update + - apt-get install -y -t bullseye-backports cmake + - apt-get install -y make g++ python-is-python3 gettext subversion + - rm -rf /opt/android-sdk/platforms + - sdkmanager 'platforms;android-28' 'platforms;android-31' + output: build/krita_build_apk/build/outputs/apk/release/krita-armeabi-v7a-$$VERSION$$-release-unsigned.apk + rm: + - libs/flake/tests/data/*.zip + - packaging + - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip + prebuild: + - git checkout 5.1.2 -- packaging/android + - python3 build-tools/copy_po.py + - sed -i -e 's/donationLink->show();/donationLink->hide();/' libs/ui/KisWelcomePageWidget.cpp + - sed -i -e '/set(KRITA_VERSION_STRING/s/".*"/"$$VERSION$$"/' -e '/set(KRITA_ALPHA 1)/d' + CMakeLists.txt + - cd packaging/android/apk + - echo 'gradle "$@"' > gradlew + - sed -i -e '/billing/d' -e 's/versionCode .*/versionCode $$VERCODE$$/' build.gradle + - sed -i -e '/BILLING/d' AndroidManifest.xml + - rm src/org/krita/android/DonationHelper.java + - sed -i -e '/DonationHelper/d' src/org/krita/android/MainActivity.java + build: packaging/android/androidbuild.sh -p=all --src=$(pwd) --build-type=Release + --build-root=$(pwd)/build --ndk-path=$$NDK$$ --sdk-path=$$SDK$$ --android-abi=armeabi-v7a + ndk: r22b + + - versionName: 5.1.2 + versionCode: 5011502 + commit: 27a9cc22f76a9b9934f939ea2fb57e52bef8aa2a + timeout: 30000 + sudo: + - apt-get update + - apt-get install -y -t bullseye-backports cmake + - apt-get install -y make g++ python-is-python3 gettext subversion + - rm -rf /opt/android-sdk/platforms + - sdkmanager 'platforms;android-28' 'platforms;android-31' + output: build/krita_build_apk/build/outputs/apk/release/krita-arm64-v8a-$$VERSION$$-release-unsigned.apk + rm: + - libs/flake/tests/data/*.zip + - packaging + - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip + prebuild: + - git checkout 5.1.2 -- packaging/android + - python3 build-tools/copy_po.py + - sed -i -e 's/donationLink->show();/donationLink->hide();/' libs/ui/KisWelcomePageWidget.cpp + - sed -i -e '/set(KRITA_VERSION_STRING/s/".*"/"$$VERSION$$"/' -e '/set(KRITA_ALPHA 1)/d' + CMakeLists.txt + - cd packaging/android/apk + - echo 'gradle "$@"' > gradlew + - sed -i -e '/billing/d' -e 's/versionCode .*/versionCode $$VERCODE$$/' build.gradle + - sed -i -e '/BILLING/d' AndroidManifest.xml + - rm src/org/krita/android/DonationHelper.java + - sed -i -e '/DonationHelper/d' src/org/krita/android/MainActivity.java + build: packaging/android/androidbuild.sh -p=all --src=$(pwd) --build-type=Release + --build-root=$(pwd)/build --ndk-path=$$NDK$$ --sdk-path=$$SDK$$ --android-abi=arm64-v8a + ndk: r22b + + - versionName: 5.1.2 + versionCode: 5011503 + commit: 27a9cc22f76a9b9934f939ea2fb57e52bef8aa2a + timeout: 30000 + sudo: + - apt-get update + - apt-get install -y -t bullseye-backports cmake + - apt-get install -y make g++ python-is-python3 gettext subversion + - rm -rf /opt/android-sdk/platforms + - sdkmanager 'platforms;android-28' 'platforms;android-31' + output: build/krita_build_apk/build/outputs/apk/release/krita-x86-$$VERSION$$-release-unsigned.apk + rm: + - libs/flake/tests/data/*.zip + - packaging + - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip + prebuild: + - git checkout 5.1.2 -- packaging/android + - python3 build-tools/copy_po.py + - sed -i -e 's/donationLink->show();/donationLink->hide();/' libs/ui/KisWelcomePageWidget.cpp + - sed -i -e '/set(KRITA_VERSION_STRING/s/".*"/"$$VERSION$$"/' -e '/set(KRITA_ALPHA 1)/d' + CMakeLists.txt + - cd packaging/android/apk + - echo 'gradle "$@"' > gradlew + - sed -i -e '/billing/d' -e 's/versionCode .*/versionCode $$VERCODE$$/' build.gradle + - sed -i -e '/BILLING/d' AndroidManifest.xml + - rm src/org/krita/android/DonationHelper.java + - sed -i -e '/DonationHelper/d' src/org/krita/android/MainActivity.java + build: packaging/android/androidbuild.sh -p=all --src=$(pwd) --build-type=Release + --build-root=$(pwd)/build --ndk-path=$$NDK$$ --sdk-path=$$SDK$$ --android-abi=x86 + ndk: r22b + + - versionName: 5.1.2 + versionCode: 5011504 + commit: 27a9cc22f76a9b9934f939ea2fb57e52bef8aa2a + timeout: 30000 + sudo: + - apt-get update + - apt-get install -y -t bullseye-backports cmake + - apt-get install -y make g++ python-is-python3 gettext subversion + - rm -rf /opt/android-sdk/platforms + - sdkmanager 'platforms;android-28' 'platforms;android-31' + output: build/krita_build_apk/build/outputs/apk/release/krita-x86_64-$$VERSION$$-release-unsigned.apk + rm: + - libs/flake/tests/data/*.zip + - packaging + - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip + prebuild: + - git checkout 5.1.2 -- packaging/android + - python3 build-tools/copy_po.py + - sed -i -e 's/donationLink->show();/donationLink->hide();/' libs/ui/KisWelcomePageWidget.cpp + - sed -i -e '/set(KRITA_VERSION_STRING/s/".*"/"$$VERSION$$"/' -e '/set(KRITA_ALPHA 1)/d' + CMakeLists.txt + - cd packaging/android/apk + - echo 'gradle "$@"' > gradlew + - sed -i -e '/billing/d' -e 's/versionCode .*/versionCode $$VERCODE$$/' build.gradle + - sed -i -e '/BILLING/d' AndroidManifest.xml + - rm src/org/krita/android/DonationHelper.java + - sed -i -e '/DonationHelper/d' src/org/krita/android/MainActivity.java + build: packaging/android/androidbuild.sh -p=all --src=$(pwd) --build-type=Release + --build-root=$(pwd)/build --ndk-path=$$NDK$$ --sdk-path=$$SDK$$ --android-abi=x86_64 + ndk: r22b + MaintainerNotes: |- - - (1) Compilation fails if older versions of the SDK are present, so we're - - removing unneeded ones. - - (2) Dependencies are built using a recent commit from the master branch. - - The exact commits and the logs for the deps and the app builds can be - - found on KDE jenkins: - - https://binary-factory.kde.org/job/Krita_Release_Android_arm64-v8a_Build - - https://binary-factory.kde.org/job/Krita_Android_arm64-v8a_Dependency_Build - - (3) Translations are downloaded as part of the release process. They are - - included in the release tarball, and the official builds are based upon it. - - We can add FETCH_TRANSLATIONS to the build options or just run copy_po.py - - before building krita. - - (4) Patches at metadata/org.krita/*.patch actually create another patches - - in the project's root directory, since otherwise fdroid lint fails with - - unused file. - - (5) All google play donation code was added in 5e323fb7 (for branch 4) - - and 23b73112 (for branch 5), and remove-billing patches are (loosely) - - based on those commits. - - (6) Starting from the commit b517d988, which went to the version 5, - - versionCode no longer depends on abi; we revert that with restore-abi - - patches. - - (7) Version code schema, taken from build.gradle: - - project.ext.versionCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4] - - project.ext.versionCodes[abi] * 1000000 + versionMajor * 10000 + versionMinor * 100 + versionRelease + (1) Compilation fails if older versions of the SDK are present, so we're + removing unneeded ones. + (2) Dependencies are built using a recent commit from the master branch. + The exact commits and the logs for the deps and the app builds can be + found on KDE jenkins: + https://binary-factory.kde.org/job/Krita_Release_Android_arm64-v8a_Build + https://binary-factory.kde.org/job/Krita_Android_arm64-v8a_Dependency_Build + (3) Translations are downloaded as part of the release process. They are + included in the release tarball, and the official builds are based upon it. + We can add FETCH_TRANSLATIONS to the build options or just run copy_po.py + before building krita. + (4) Patches at metadata/org.krita/*.patch actually create another patches + in the project's root directory, since otherwise fdroid lint fails with + unused file. + (7) Version code schema: + abi: ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4] + versionMajor * 1000000 + versionMinor * 10000 + versionRelease * 100 + abi ArchivePolicy: 12 versions AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 5.0.6 -CurrentVersionCode: 4050008 +CurrentVersion: 5.1.2 +CurrentVersionCode: 5011504