Merge branch 'IceCat6804' into 'master'
IceCat: Update to 68.4.1 See merge request fdroid/fdroiddata!6183
This commit is contained in:
commit
aab383b422
|
@ -1,5 +1,3 @@
|
|||
AntiFeatures:
|
||||
- KnownVuln
|
||||
Categories:
|
||||
- Internet
|
||||
License: MPL-2.0
|
||||
|
@ -853,6 +851,92 @@ Builds:
|
|||
- zip -d fdroid/icecat-unsigned.apk 'META-INF/*.*'
|
||||
ndk: r15c
|
||||
|
||||
- versionName: 68.4.1
|
||||
versionCode: 680401
|
||||
commit: FENNEC_68_4_1_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: fdroid/icecat-unsigned.apk
|
||||
srclibs:
|
||||
- MozLocales@b9f4c1f3
|
||||
- IceCat@4e4f29a3
|
||||
- rustup@1.21.1
|
||||
prebuild:
|
||||
- bash $$IceCat$$/makeicecat -- --no-tarball --with-l10ndir=$$MozLocales$$ --with-sourcedir=$PWD
|
||||
- bash $$MozLocales$$/prebuild-icecat.sh
|
||||
- fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g'
|
||||
-e 's/1/i686-linux-android/g'`
|
||||
- echo "ac_add_options --target=${fxarch}" >> .mozconfig
|
||||
- echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig
|
||||
- echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .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 'export MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$'" >>
|
||||
.mozconfig
|
||||
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.12.1 cbindgen
|
||||
- ./mach build
|
||||
- cat used-locales | xargs -I % ./mach build chrome-%
|
||||
- make -C obj-android/mobile/android/base android_apks
|
||||
- make -C obj-android package AB_CD=multi
|
||||
- mv obj-android/dist/icecat*-unsigned-unaligned.apk fdroid/icecat-unsigned.apk
|
||||
- zip -d fdroid/icecat-unsigned.apk 'META-INF/CERT.*' 'META-INF/MANIFEST.MF'
|
||||
ndk: r19c
|
||||
|
||||
- versionName: 68.4.1
|
||||
versionCode: 680411
|
||||
commit: FENNEC_68_4_1_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: fdroid/icecat-unsigned.apk
|
||||
srclibs:
|
||||
- MozLocales@b9f4c1f3
|
||||
- IceCat@4e4f29a3
|
||||
- rustup@1.21.1
|
||||
prebuild:
|
||||
- bash $$IceCat$$/makeicecat -- --no-tarball --with-l10ndir=$$MozLocales$$ --with-sourcedir=$PWD
|
||||
- bash $$MozLocales$$/prebuild-icecat.sh
|
||||
- fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g'
|
||||
-e 's/1/i686-linux-android/g'`
|
||||
- echo "ac_add_options --target=${fxarch}" >> .mozconfig
|
||||
- echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig
|
||||
- echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .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 'export MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$'" >>
|
||||
.mozconfig
|
||||
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.12.1 cbindgen
|
||||
- ./mach build
|
||||
- cat used-locales | xargs -I % ./mach build chrome-%
|
||||
- make -C obj-android/mobile/android/base android_apks
|
||||
- make -C obj-android package AB_CD=multi
|
||||
- mv obj-android/dist/icecat*-unsigned-unaligned.apk fdroid/icecat-unsigned.apk
|
||||
- zip -d fdroid/icecat-unsigned.apk 'META-INF/CERT.*' 'META-INF/MANIFEST.MF'
|
||||
ndk: r19c
|
||||
|
||||
MaintainerNotes: |-
|
||||
Needs Mercurial (a.k.a. hg) >= 3.5 to clone from Mozilla server.
|
||||
Needs host g++ since at least version 52.3
|
||||
|
@ -860,5 +944,5 @@ MaintainerNotes: |-
|
|||
ArchivePolicy: 4 versions
|
||||
AutoUpdateMode: None
|
||||
UpdateCheckMode: None
|
||||
CurrentVersion: 60.5.1
|
||||
CurrentVersionCode: 600511
|
||||
CurrentVersion: 68.4.1
|
||||
CurrentVersionCode: 680411
|
||||
|
|
Loading…
Reference in New Issue