Updated build scripts to match upstream changes

5 files changed, 76 insertions, 50 deletions

diff --git a/data/buildscripts/build-gnulinux.sh b/data/buildscripts/build-gnulinux.sh
index 6fb9667..e3fdb70 100644
--- a/data/buildscripts/build-gnulinux.sh
+++ b/data/buildscripts/build-gnulinux.sh
@@ -2,8 +2,17 @@
 set -e
 set -x
 
+wget https://deb.nodesource.com/setup_16.x -O /tmp/nodesource_setup.sh
+sed '/toutatis/s|precise|focal|;s/toutatis/nabia/' -i /tmp/nodesource_setup.sh
+bash /tmp/nodesource_setup.sh
+
 apt-get update
-apt-get -q -y --force-yes build-dep firefox
+apt install nodejs
+aptitude -q -y  build-dep firefox
+cargo install cbindgen --version 0.23.0
+
+ln -s /usr/lib/llvm*/bin/clang /bin/clang -f
+ln -s /usr/lib/llvm*/bin/clang++ /bin/clang++ -f
 
 cp ../../data/buildscripts/mozconfig-common .mozconfig
 cat ../../data/buildscripts/mozconfig-gnulinux >> .mozconfig
diff --git a/data/buildscripts/buildall-sbuild.sh b/data/buildscripts/buildall-sbuild.sh
new file mode 100644
index 0000000..43cef41
--- /dev/null
+++ b/data/buildscripts/buildall-sbuild.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# This script expects a Trisquel sbuild environment, such as the one provided by https://gitlab.trisquel.org/trisquel/trisquel-builder/-/blob/master/sbuild-create.sh
+
+set -e
+set -x
+
+if [ $# != 1 ]; then
+  echo E: pass the source dir as parameter
+  exit 1
+fi
+
+SRCDIR=$(readlink -f $1)
+VERSION=$(echo $1|sed 's|.*icecat-||')
+ROOTDIR=$(readlink -f $SRCDIR/../../)
+BUILDDIR=/var/lib/sbuild/build/
+BUILDDIST=nabia
+
+sudo rm -rf /var/lib/sbuild/build/gnuzilla
+cp -a $ROOTDIR $BUILDDIR/gnuzilla
+
+
+function buildpackage(){
+cat << EOF > $BUILDDIR/run.sh
+set -e
+set -x
+
+apt update
+apt-get build-dep -y --force-yes firefox 
+
+apt-get install -y --force-yes mercurial python-setuptools
+cd /usr/local/src
+hg clone http://hg.mozilla.org/l10n/compare-locales/
+cd compare-locales/
+hg checkout RELEASE_3_3_0
+python2 setup.py install
+cp /usr/local/bin/compare* /usr/bin
+
+cd /build/gnuzilla/output/icecat-$VERSION
+
+bash ../../data/buildscripts/build-${1}.sh
+bash
+rm /build/run.sh
+
+EOF
+
+env -i sudo schroot --directory / -c $BUILDDIST-$3 -- bash  /build/run.sh
+}
+
+#buildpackage windows $BUILDDIST amd64 |tee  windows.log 2>&1
+#buildpackage mac $BUILDDIST amd64 |tee mac.log 2>&1
+#buildpackage gnulinux $BUILDDIST i386 |tee gnulinux-i386.log 2>&1
+#sudo mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-i386
+buildpackage gnulinux $BUILDDIST amd64 |tee gnulinux-amd64.log 2>&1
+sudo mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64
+#buildpackage android $BUILDDIST amd64  |tee android.log 2>&1
+
+rm binaries -rf
+mkdir binaries/langpacks -p
+#cp $1/obj-windows/dist/icecat*.zip binaries
+#cp $1/obj-mac/dist/icecat/icecat*.dmg binaries
+cp $1/obj-gnulinux*/dist/icecat*.bz2 binaries
+#cp $1/obj-android/dist/icecat*.apk binaries
+cp $1/obj-gnulinux-amd64/dist/linux-x86_64/xpi/* binaries/langpacks
+rename 's/linux/gnulinux/' binaries/*
diff --git a/data/buildscripts/mozconfig-common b/data/buildscripts/mozconfig-common
index 0b2b9e0..581d55f 100644
--- a/data/buildscripts/mozconfig-common
+++ b/data/buildscripts/mozconfig-common
@@ -1,8 +1,6 @@
 ac_add_options --with-l10n-base=$PWD/l10n
 ac_add_options --enable-official-branding
 ac_add_options --with-distribution-id=org.gnu
-mk_add_options MOZ_MAKE_FLAGS=-j7
-ac_add_options --with-ccache=/usr/bin/ccache
 ac_add_options --enable-release
 ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
@@ -13,3 +11,4 @@ ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-crashreporter
 ac_add_options --disable-eme
+ac_add_options --without-wasm-sandboxed-libraries
diff --git a/data/patches/disable-settings-services.patch b/data/patches/disable-settings-services.patch
deleted file mode 100644
index a79d0e4..0000000
--- a/data/patches/disable-settings-services.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/services/settings/Utils.jsm.orig	2021-08-17 16:32:27.475448626 -0400
-+++ b/services/settings/Utils.jsm	2021-08-17 16:32:40.859457980 -0400
-@@ -60,12 +60,7 @@
-     );
-     const isXpcshell = env.exists("XPCSHELL_TEST_PROFILE_DIR");
-     const isNotThunderbird = AppConstants.MOZ_APP_NAME != "thunderbird";
--    return AppConstants.RELEASE_OR_BETA &&
--      !Cu.isInAutomation &&
--      !isXpcshell &&
--      isNotThunderbird
--      ? "https://firefox.settings.services.mozilla.com/v1"
--      : gServerURL;
-+    return gServerURL;
-   },
- 
-   CHANGES_PATH: "/buckets/monitor/collections/changes/changeset",
diff --git a/data/patches/hide-protections-dashboard.patch b/data/patches/hide-protections-dashboard.patch
deleted file mode 100644
index d1eb999..0000000
--- a/data/patches/hide-protections-dashboard.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/browser/base/content/appmenu-viewcache.inc.xhtml.orig	2021-08-17 16:54:44.323100518 -0400
-+++ b/browser/base/content/appmenu-viewcache.inc.xhtml	2021-08-17 16:55:42.131053772 -0400
-@@ -24,7 +24,7 @@
-                       oncommand="gSync.toggleAccountPanel(this, event)"/>
-       </toolbaritem>
-       <toolbarseparator class="sync-ui-item"/>
--      <toolbaritem>
-+      <toolbaritem hidden="true">
-         <toolbarbutton id="appMenu-protection-report-button"
-              class="subviewbutton subviewbutton-iconic"
-              oncommand="gProtectionsHandler.openProtections(); gProtectionsHandler.recordClick('open_full_report', null, 'app_menu');">
-@@ -35,7 +35,7 @@
-           </label>
-         </toolbarbutton>
-       </toolbaritem>
--      <toolbarseparator id="appMenu-tp-separator"/>
-+      <toolbarseparator id="appMenu-tp-separator" hidden="true"/>
-       <toolbarbutton id="appMenu-new-window-button"
-                      class="subviewbutton subviewbutton-iconic"
-                      data-l10n-id="appmenuitem-new-window"
---- a/browser/base/content/browser-siteProtections.js.orig	2021-08-17 16:52:32.107227395 -0400
-+++ b/browser/base/content/browser-siteProtections.js	2021-08-17 16:52:39.303219686 -0400
-@@ -1558,7 +1558,7 @@
-       this._trackingProtectionIconContainer.hidden = true;
-       return;
-     }
--    this._trackingProtectionIconContainer.hidden = false;
-+    this._trackingProtectionIconContainer.hidden = true;
- 
-     // Check whether the user has added an exception for this site.
-     this.hasException = ContentBlockingAllowList.includes(