Merge https://gitlab.com/librewolf-community/browser/linux into master

4 files changed, 17 insertions, 8 deletions

diff --git a/binary_tarball/scripts/1_Install_Dependencies.sh b/binary_tarball/scripts/1_Install_Dependencies.sh
index 9ff101a..6d88bbb 100755
--- a/binary_tarball/scripts/1_Install_Dependencies.sh
+++ b/binary_tarball/scripts/1_Install_Dependencies.sh
@@ -53,10 +53,10 @@ apt-get -y -qq install $_DEPENDENCIES;
 if [[ $CARCH == 'x86_64' ]];then
     # Installs (non-ancient) clang
     apt install -y software-properties-common apt-transport-https ca-certificates
-    apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
+    apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-11 main"
     wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
     apt-get update
-    apt-get -y install clang-9 libclang-9-dev
+    apt-get -y install clang-11 libclang-11-dev
 else
     apt-get -y install clang-8 libclang-8-dev
 fi
diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh
index ba6879a..37a6ae5 100755
--- a/binary_tarball/scripts/3_Configure_Source_Code.sh
+++ b/binary_tarball/scripts/3_Configure_Source_Code.sh
@@ -99,11 +99,11 @@ else
 # ubuntu seems to recommend this
 ac_add_options --disable-elf-hack
 
-export CC='clang-9'
-export CXX='clang++-9'
-export AR=llvm-ar-9
-export NM=llvm-nm-9
-export RANLIB=llvm-ranlib-9
+export CC='clang-11'
+export CXX='clang++-11'
+export AR=llvm-ar-11
+export NM=llvm-nm-11
+export RANLIB=llvm-ranlib-11
 
 # probably not needed, enabled by default?
 ac_add_options --enable-optimize
@@ -118,6 +118,10 @@ patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/build-with-libstdc++-7.patch"
 patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/fix-armhf-webrtc-build.patch"
 patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch"
 patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-variable-annotations.patch"
+patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-fstrings.patch"
+patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-pep487.patch"
+patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/silence-gtk-style-assertions.patch"
+patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/sandbox-update-arm-syscall-numbers.patch"
 
 # Remove some pre-installed addons that might be questionable
 patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch
diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh
index 23c2ca2..bfd536c 100755
--- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh
+++ b/binary_tarball/scripts/4_Build_Binary_Tarball.sh
@@ -33,6 +33,7 @@ fi
 
 export MOZ_NOSPAM=1
 export MOZBUILD_STATE_PATH="${_MOZBUILD}"
+export MACH_USE_SYSTEM_PYTHON=1
 
 if [[ $CARCH == 'aarch64' ]]; then
   export MOZ_DEBUG_FLAGS=" "
@@ -63,7 +64,7 @@ rm -f mozconfig
 # source /root/.cargo/env
 
 # install cbindgen
-cargo install --version 0.14.3 cbindgen
+cargo install --version 0.15.0 cbindgen
 
 if [[ $CARCH == 'aarch64' ]]; then
 
diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
index c7517d1..04bc086 100755
--- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
+++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
@@ -11,6 +11,7 @@ LAUNCHER_SCRIPT=$3;
 CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)}
 _SCRIPT_FOLDER=$(realpath $(dirname $0));
 _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
+_SETTINGS_COMMIT=2f76ae07f7016034273f1887b7f1bedab997909c
 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball
@@ -22,6 +23,9 @@ tar --strip-components=1 -xf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER
 printf "\nCopying librewolf settings to extracted binary tarball\n";
 
 git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings;
+cd $_EXTRACTED_TARBALL_FOLDER/settings
+git checkout $_SETTINGS_COMMIT
+cd -
 # no need to keep that in there:
 rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git";
 cp $TOGGLE_SETTINGS_SCRIPT $_EXTRACTED_TARBALL_FOLDER/settings;