From ced7d5096556c2188630896d9d070990a2de0526 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 15 Dec 2022 16:26:19 +0800 Subject: [PATCH] krita: 5.1.4 --- metadata/org.krita.yml | 137 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 133 insertions(+), 4 deletions(-) diff --git a/metadata/org.krita.yml b/metadata/org.krita.yml index 86f641a257..515291b724 100644 --- a/metadata/org.krita.yml +++ b/metadata/org.krita.yml @@ -735,14 +735,143 @@ Builds: --android-abi=x86_64 ndk: r22b + - versionName: 5.1.4 + versionCode: 5011701 + commit: 5.1.4 + 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 bzip2 xz-utils + - 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/linux + - packaging/macos + - packaging/steam + - packaging/windows + - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip + prebuild: + - git checkout 16d7c65d7082f1a56e493a784aba3a3833b858b8 -- 3rdparty + - sed -i -e 's/donationLink->show();/donationLink->hide();/' libs/ui/KisWelcomePageWidget.cpp + - 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: MAKEFLAGS=-j$(nproc) 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.4 + versionCode: 5011702 + commit: 5.1.4 + 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 bzip2 xz-utils + - 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/linux + - packaging/macos + - packaging/steam + - packaging/windows + - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip + prebuild: + - git checkout 16d7c65d7082f1a56e493a784aba3a3833b858b8 -- 3rdparty + - sed -i -e 's/donationLink->show();/donationLink->hide();/' libs/ui/KisWelcomePageWidget.cpp + - 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: MAKEFLAGS=-j$(nproc) 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.4 + versionCode: 5011703 + commit: 5.1.4 + 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 bzip2 xz-utils + - 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/linux + - packaging/macos + - packaging/steam + - packaging/windows + - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip + prebuild: + - git checkout 16d7c65d7082f1a56e493a784aba3a3833b858b8 -- 3rdparty + - sed -i -e 's/donationLink->show();/donationLink->hide();/' libs/ui/KisWelcomePageWidget.cpp + - 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: MAKEFLAGS=-j$(nproc) 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.4 + versionCode: 5011704 + commit: 5.1.4 + 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 bzip2 xz-utils + - 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/linux + - packaging/macos + - packaging/steam + - packaging/windows + - plugins/extensions/pykrita/plugin/krita/sceditor/rope.zip + prebuild: + - git checkout 16d7c65d7082f1a56e493a784aba3a3833b858b8 -- 3rdparty + - sed -i -e 's/donationLink->show();/donationLink->hide();/' libs/ui/KisWelcomePageWidget.cpp + - 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: MAKEFLAGS=-j$(nproc) 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 + The apk is built in https://binary-factory.kde.org/job/Krita_Release_Android_arm64-v8a_Build + The dep job can be find in the full log by searching "Krita_Android_arm64-v8a_Dependency_Build". + Then the commit can be found in 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 @@ -757,5 +886,5 @@ MaintainerNotes: |- ArchivePolicy: 12 versions AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 5.1.3 -CurrentVersionCode: 5011604 +CurrentVersion: 5.1.4 +CurrentVersionCode: 5011704