From b5b3d7bc14cc65c35b444654a19cea9b52a22c8d Mon Sep 17 00:00:00 2001
From: Matias Zuniga <matias.nicolas.zc@gmail.com>
Date: Mon, 14 Jan 2019 15:26:44 -0300
Subject: [PATCH] IceCatMobile: Update to 60.4.0

---
 metadata/org.gnu.icecat.txt | 58 +++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/metadata/org.gnu.icecat.txt b/metadata/org.gnu.icecat.txt
index 035a4b30ea..58f2a9ef34 100644
--- a/metadata/org.gnu.icecat.txt
+++ b/metadata/org.gnu.icecat.txt
@@ -421,6 +421,60 @@ Build:60.3.0,600310
         zip -d fdroid/icecat-unsigned.apk 'META-INF/*.*'
     ndk=r15c
 
+Build:60.4.0,600400
+    commit=FIREFOX_60_4_0esr_RELEASE
+    timeout=21600
+    sudo=apt-get update || apt-get update && \
+        apt install -y g++
+    output=fdroid/icecat-unsigned.apk
+    srclibs=MozLocales@3afdd978,IceCat@bf97e368
+    prebuild=bash $$IceCat$$/makeicecat -- --no-tarball --skip-l10n --no-debian --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-androideabi/g'` && \
+        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 "ac_add_options --target=${fxarch}" >> .mozconfig && \
+        echo "mk_add_options 'export MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$'" >> .mozconfig
+    build=mkdir rust && \
+        rsarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/armv7-linux-androideabi/g' -e 's/1/i686-linux-android/g'` && \
+        curl https://static.rust-lang.org/dist/rust-1.29.2-`uname -m`-unknown-linux-gnu.tar.xz | tar -x -J -C rust --strip-components 2 && \
+        curl https://static.rust-lang.org/dist/rust-std-1.29.2-${rsarch}.tar.xz | tar -x -J -C rust --strip-components 2 && \
+        PATH=$PWD/rust/bin:$PATH ./mach build && \
+        cat used-locales | xargs -I % ./mach build chrome-% && \
+        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/*.*'
+    ndk=r15c
+
+Build:60.4.0,600410
+    commit=FIREFOX_60_4_0esr_RELEASE
+    timeout=21600
+    sudo=apt-get update || apt-get update && \
+        apt install -y g++
+    output=fdroid/icecat-unsigned.apk
+    srclibs=MozLocales@3afdd978,IceCat@bf97e368
+    prebuild=bash $$IceCat$$/makeicecat -- --no-tarball --skip-l10n --no-debian --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-androideabi/g'` && \
+        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 "ac_add_options --target=${fxarch}" >> .mozconfig && \
+        echo "mk_add_options 'export MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$'" >> .mozconfig
+    build=mkdir rust && \
+        rsarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/armv7-linux-androideabi/g' -e 's/1/i686-linux-android/g'` && \
+        curl https://static.rust-lang.org/dist/rust-1.29.2-`uname -m`-unknown-linux-gnu.tar.xz | tar -x -J -C rust --strip-components 2 && \
+        curl https://static.rust-lang.org/dist/rust-std-1.29.2-${rsarch}.tar.xz | tar -x -J -C rust --strip-components 2 && \
+        PATH=$PWD/rust/bin:$PATH ./mach build && \
+        cat used-locales | xargs -I % ./mach build chrome-% && \
+        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/*.*'
+    ndk=r15c
+
 Maintainer Notes:
 Needs Mercurial (a.k.a. hg) >= 3.5 to clone from Mozilla server.
 Needs host g++ since at least version 52.3
@@ -429,5 +483,5 @@ Needs host g++ since at least version 52.3
 Archive Policy:4 versions
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:60.3.0
-Current Version Code:600310
+Current Version:60.4.0
+Current Version Code:600410