From 838eff58e9c3d12a2e2571c412820ab041e0ae49 Mon Sep 17 00:00:00 2001 From: relan Date: Thu, 5 Dec 2019 21:33:45 +0300 Subject: [PATCH] Update Fennec F-Droid to 68.3.0 --- metadata/org.mozilla.fennec_fdroid.yml | 151 ++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 2 deletions(-) diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml index 2e235d3b02..d96715880b 100644 --- a/metadata/org.mozilla.fennec_fdroid.yml +++ b/metadata/org.mozilla.fennec_fdroid.yml @@ -8810,6 +8810,153 @@ Builds: 'META-INF/CERT.*' 'META-INF/MANIFEST.MF' ndk: r19c + - versionName: 68.3.0 + versionCode: 683000 + commit: FENNEC_68_3_0_RELEASE + timeout: 28800 + sudo: + - apt-get update || apt-get update + - apt-get install -y clang-6.0 llvm-6.0 libgmp-dev libmpfr-dev libmpc-dev + - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 + - update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 + 100 + output: obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + srclibs: + - MozLocales@5b44ee041cff7d887adc6df402834ea5862150ab + - rustup@1.20.2 + prebuild: + - bash $$MozLocales$$/prebuild.sh + - echo "ac_add_options --target=arm-linux-androideabi" >> .mozconfig + - echo "ac_add_options --with-android-min-sdk=16" >> .mozconfig + - echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig + - echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig + - echo "ac_add_options --enable-application=mobile/android" >> .mozconfig + - echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> + .mozconfig + - echo "ac_add_options --with-libclang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/lib64/" + >> .mozconfig + - echo "ac_add_options --with-clang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" + >> .mozconfig + - echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj" >> .mozconfig + - pushd mobile/android/branding/unofficial/ + - sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh + - echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh + - echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh + - echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh + - sed -i -e 's/Mozilla Fennec/Fennec F-Droid/g' locales/en-US/brand* + - popd + build: + - $$rustup$$/rustup-init.sh -y + - source $HOME/.cargo/env + - rustup default 1.38.0 + - rustup target add thumbv7neon-linux-androideabi + - cargo install --force --vers 0.11.0 cbindgen + - ./mach build + - cat used-locales | xargs -I % ./mach build chrome-% + - make -C obj/mobile/android/base android_apks + - make -C obj package AB_CD=multi + - zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + 'META-INF/CERT.*' 'META-INF/MANIFEST.MF' + ndk: r19c + + - versionName: 68.3.0 + versionCode: 683010 + commit: FENNEC_68_3_0_RELEASE + timeout: 28800 + sudo: + - apt-get update || apt-get update + - apt-get install -y clang-6.0 llvm-6.0 libgmp-dev libmpfr-dev libmpc-dev + - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 + - update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 + 100 + output: obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + srclibs: + - MozLocales@5b44ee041cff7d887adc6df402834ea5862150ab + - rustup@1.20.2 + prebuild: + - bash $$MozLocales$$/prebuild.sh + - echo "ac_add_options --target=i686-linux-android" >> .mozconfig + - echo "ac_add_options --with-android-min-sdk=16" >> .mozconfig + - echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig + - echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig + - echo "ac_add_options --enable-application=mobile/android" >> .mozconfig + - echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> + .mozconfig + - echo "ac_add_options --with-libclang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/lib64/" + >> .mozconfig + - echo "ac_add_options --with-clang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" + >> .mozconfig + - echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj" >> .mozconfig + - pushd mobile/android/branding/unofficial/ + - sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh + - echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh + - echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh + - echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh + - sed -i -e 's/Mozilla Fennec/Fennec F-Droid/g' locales/en-US/brand* + - popd + build: + - $$rustup$$/rustup-init.sh -y + - source $HOME/.cargo/env + - rustup default 1.38.0 + - rustup target add i686-linux-android + - cargo install --force --vers 0.11.0 cbindgen + - ./mach build + - cat used-locales | xargs -I % ./mach build chrome-% + - make -C obj/mobile/android/base android_apks + - make -C obj package AB_CD=multi + - zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + 'META-INF/CERT.*' 'META-INF/MANIFEST.MF' + ndk: r19c + + - versionName: 68.3.0 + versionCode: 683020 + commit: FENNEC_68_3_0_RELEASE + timeout: 28800 + sudo: + - apt-get update || apt-get update + - apt-get install -y clang-6.0 llvm-6.0 libgmp-dev libmpfr-dev libmpc-dev + - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 + - update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 + 100 + output: obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + srclibs: + - MozLocales@5b44ee041cff7d887adc6df402834ea5862150ab + - rustup@1.20.2 + prebuild: + - bash $$MozLocales$$/prebuild.sh + - echo "ac_add_options --target=aarch64-linux-android" >> .mozconfig + - echo "ac_add_options --with-android-min-sdk=21" >> .mozconfig + - echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig + - echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig + - echo "ac_add_options --enable-application=mobile/android" >> .mozconfig + - echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> + .mozconfig + - echo "ac_add_options --with-libclang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/lib64/" + >> .mozconfig + - echo "ac_add_options --with-clang-path=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" + >> .mozconfig + - echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj" >> .mozconfig + - pushd mobile/android/branding/unofficial/ + - sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh + - echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh + - echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh + - echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh + - sed -i -e 's/Mozilla Fennec/Fennec F-Droid/g' locales/en-US/brand* + - popd + build: + - $$rustup$$/rustup-init.sh -y + - source $HOME/.cargo/env + - rustup default 1.38.0 + - rustup target add aarch64-linux-android + - cargo install --force --vers 0.11.0 cbindgen + - ./mach build + - cat used-locales | xargs -I % ./mach build chrome-% + - make -C obj/mobile/android/base android_apks + - make -C obj package AB_CD=multi + - zip -d obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + 'META-INF/CERT.*' 'META-INF/MANIFEST.MF' + ndk: r19c + MaintainerNotes: |4- Updating/Versioning: @@ -8832,5 +8979,5 @@ MaintainerNotes: |4- ArchivePolicy: 6 versions AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 68.2.0 -CurrentVersionCode: 682020 +CurrentVersion: 68.3.0 +CurrentVersionCode: 683020