From 4cf9ad289f8a5c1cefd042950bbbc9af263508ed Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sun, 11 Apr 2021 04:19:15 +0200
Subject: [PATCH] Before xcompile merge

---
 .gitignore                       | 18 +++++++-----------
 build.sh                         | 30 +++++++++++++++++++++++++++---
 patches/tb-mozconfig-win10.patch | 15 +++++++++++++++
 3 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 patches/tb-mozconfig-win10.patch

diff --git a/.gitignore b/.gitignore
index 7277834..025d4db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,9 @@
 /firefox-*
-librewolf-*
-megabar.patch
-remove_addons.patch
-unity-menubar.patch
-context-menu.patch
-mozilla-vpn-ad.patch
-mozconfig
-librewolf
-tmp.nsi
-tmp-permissive.nsi
+/librewolf-*
+/librewolf
 /mozilla-unified
-bootstrap.py
+/tor-browser
+/bootstrap.py
+/mozconfig
+/tmp.nsi
+/tmp-permissive.nsi
diff --git a/build.sh b/build.sh
index 1ef3c5e..9b79131 100755
--- a/build.sh
+++ b/build.sh
@@ -386,18 +386,42 @@ reset_mozilla_unified() {
 }
 # tor.. experimental
 init_tor_browser() {
-    git clone https://git.torproject.org/tor-browser.git
+    git clone --no-checkout https://git.torproject.org/tor-browser.git
+    
     cd tor-browser
-    git checkout tor-browser-78.8.0esr-10.0-1
+      git checkout tor-browser-78.8.0esr-10.0-1
+      git submodule update --recursive
+      patch -p1 -i ../patches/tb-mozconfig-win10.patch 
     cd ..
 }
 set_tor_browser() {
     srcdir=tor-browser
 }
 reset_tor_browser() {
-    echo "(todo)"
+    echo "reset_tor_browser: begin."
+    if [ ! -d tor-browser ]; then
+	echo "Error: tor-browser folder not found. use init_tor_browser() to create one"
+	exit 1;
+    fi
+    cd tor-browser
+
+    echo "Resetting tor-browser..."
+    git reset --hard
+    
+    cd ..
+    echo "reset_tor_browser: done."
 }
 
+
+
+
+
+
+
+
+
+
+
 #
 # process commandline arguments and do something
 #
diff --git a/patches/tb-mozconfig-win10.patch b/patches/tb-mozconfig-win10.patch
new file mode 100644
index 0000000..927c867
--- /dev/null
+++ b/patches/tb-mozconfig-win10.patch
@@ -0,0 +1,15 @@
+diff --git a/.mozconfig b/.mozconfig
+index d71c858844e3..2d295de7df72 100755
+--- a/.mozconfig
++++ b/.mozconfig
+@@ -16,8 +16,8 @@ export MOZILLA_OFFICIAL=1
+ ac_add_options --enable-optimize
+ ac_add_options --enable-official-branding
+ 
+-# Let's support GTK3 for ESR60
+-ac_add_options --enable-default-toolkit=cairo-gtk3
++## Let's support GTK3 for ESR60
++#ac_add_options --enable-default-toolkit=cairo-gtk3
+ 
+ ac_add_options --disable-strip
+ ac_add_options --disable-install-strip