From 239e0ff8fc73562af1785ea70baf32b05513387a Mon Sep 17 00:00:00 2001 From: relan Date: Sat, 18 May 2019 19:56:37 +0300 Subject: [PATCH] Update Fennec F-Droid to 67.0 --- metadata/org.mozilla.fennec_fdroid.yml | 142 ++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 2 deletions(-) diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml index bab3806145..8a0edae9cb 100644 --- a/metadata/org.mozilla.fennec_fdroid.yml +++ b/metadata/org.mozilla.fennec_fdroid.yml @@ -7809,6 +7809,144 @@ Builds: 'META-INF/*.*' ndk: r19c + - versionName: '67.0' + versionCode: 670000 + commit: FENNEC_67_0_RELEASE + timeout: 28800 + sudo: + - apt-get update || apt-get update + - apt-get install -y g++ llvm libgmp-dev libmpfr-dev libmpc-dev + output: obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + srclibs: + - MozLocales@b071e8a820297017fc9dc4a0385a415ebd0b25d6 + - rustup@1.18.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.34.2 + - rustup target add armv7-linux-androideabi + - cargo install --force --vers 0.8.7 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/*.*' + ndk: r19c + + - versionName: '67.0' + versionCode: 670010 + commit: FENNEC_67_0_RELEASE + timeout: 28800 + sudo: + - apt-get update || apt-get update + - apt-get install -y g++ llvm libgmp-dev libmpfr-dev libmpc-dev + output: obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + srclibs: + - MozLocales@b071e8a820297017fc9dc4a0385a415ebd0b25d6 + - rustup@1.18.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.34.2 + - rustup target add i686-linux-android + - cargo install --force --vers 0.8.7 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/*.*' + ndk: r19c + + - versionName: '67.0' + versionCode: 670020 + commit: FENNEC_67_0_RELEASE + timeout: 28800 + sudo: + - apt-get update || apt-get update + - apt-get install -y g++ llvm libgmp-dev libmpfr-dev libmpc-dev + output: obj/dist/fennec-$$VERSION$$.multi.android-*-unsigned-unaligned.apk + srclibs: + - MozLocales@b071e8a820297017fc9dc4a0385a415ebd0b25d6 + - rustup@1.18.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.34.2 + - rustup target add aarch64-linux-android + - cargo install --force --vers 0.8.7 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/*.*' + ndk: r19c + MaintainerNotes: |4- Updating/Versioning: @@ -7831,5 +7969,5 @@ MaintainerNotes: |4- ArchivePolicy: 6 versions AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 66.0.5 -CurrentVersionCode: 660520 +CurrentVersion: '67.0' +CurrentVersionCode: 670020