From 21abdd645dec688c9da45928956656b4ee1ad952 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 29 Mar 2021 07:52:37 +0200
Subject: [PATCH] Moved experimental patches into patches/experimental

---
 artifacts_deb.sh                              |  4 +--
 artifacts_rpm.sh                              |  4 +--
 artifacts_win.sh                              |  4 +--
 build.sh                                      | 25 ++++++++++++++++---
 .../{ => experimental}/librewolf-config.patch |  0
 .../librewolf-policies.patch                  |  0
 6 files changed, 28 insertions(+), 9 deletions(-)
 rename patches/{ => experimental}/librewolf-config.patch (100%)
 rename patches/{ => experimental}/librewolf-policies.patch (100%)

diff --git a/artifacts_deb.sh b/artifacts_deb.sh
index 4c28ef2..b7bbac5 100644
--- a/artifacts_deb.sh
+++ b/artifacts_deb.sh
@@ -36,9 +36,9 @@ if [ $? -ne 0 ]; then exit 1; fi
 if [ ! -z $experimental ]; then
     pushd librewolf
     echo "Applying experimental patches..."
-    patch -p1 -i ../patches/librewolf-config.patch
+    patch -p1 -i ../patches/experimental/librewolf-config.patch
     if [ $? -ne 0 ]; then exit 1; fi
-    patch -p1 -i ../patches/librewolf-policies.patch
+    patch -p1 -i ../patches/experimental/librewolf-policies.patch
     if [ $? -ne 0 ]; then exit 1; fi
     popd
 
diff --git a/artifacts_rpm.sh b/artifacts_rpm.sh
index 3f00162..54548dd 100644
--- a/artifacts_rpm.sh
+++ b/artifacts_rpm.sh
@@ -37,9 +37,9 @@ if [ $? -ne 0 ]; then exit 1; fi
 if [ ! -z $experimental ]; then
     pushd librewolf
     echo "Applying experimental patches..."
-    patch -p1 -i ../patches/librewolf-config.patch
+    patch -p1 -i ../patches/experimental/librewolf-config.patch
     if [ $? -ne 0 ]; then exit 1; fi
-    patch -p1 -i ../patches/librewolf-policies.patch
+    patch -p1 -i ../patches/experimental/librewolf-policies.patch
     if [ $? -ne 0 ]; then exit 1; fi
     popd
 
diff --git a/artifacts_win.sh b/artifacts_win.sh
index b7429ca..bea64db 100644
--- a/artifacts_win.sh
+++ b/artifacts_win.sh
@@ -39,9 +39,9 @@ if [ $? -ne 0 ]; then exit 1; fi
 if [ ! -z $experimental ]; then
     pushd librewolf
     echo "Applying experimental patches..."
-    patch -p1 -i ../patches/librewolf-config.patch
+    patch -p1 -i ../patches/experimental/librewolf-config.patch
     if [ $? -ne 0 ]; then exit 1; fi
-    patch -p1 -i ../patches/librewolf-policies.patch
+    patch -p1 -i ../patches/experimental/librewolf-policies.patch
     if [ $? -ne 0 ]; then exit 1; fi
     popd
 
diff --git a/build.sh b/build.sh
index e0a4c35..435d113 100755
--- a/build.sh
+++ b/build.sh
@@ -10,6 +10,9 @@ set -e
 
 pkgver=87.0
 
+#
+# Dependencies for linux/freebsd.
+#
 
 deps_deb() {
     echo "deps_deb: begin."
@@ -32,6 +35,10 @@ deps_pkg() {
     echo "deps_pkg: done."
 }
 
+#
+# Basic functionality
+#
+
 clean() {
     echo "clean: begin."
     
@@ -90,6 +97,11 @@ extract() {
 }
 
 
+#
+# LibreWolf specific mozconfig and patches
+#
+
+
 create_mozconfig() {
     cat >../mozconfig <<END
 ac_add_options --enable-application=browser
@@ -129,6 +141,7 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0
 END
 }
 
+
 do_patches() {
     echo "do_patches: begin."
     
@@ -177,7 +190,6 @@ do_patches() {
     # just a straight copy for now..
     cp -v ../mozconfig .
 
-    
     # on freebsd we're called gsed..
     set +e
     sed=sed
@@ -363,7 +375,8 @@ git_subs() {
 config_diff() {
     pushd settings > /dev/null
       cp "/c/Program Files/LibreWolf/librewolf.cfg" librewolf.cfg
-      git diff librewolf.cfg > ../patches/librewolf-config.patch
+      if [ $? -ne 0 ]; then exit 1; fi
+      git diff librewolf.cfg > ../patches/experimental/librewolf-config.patch
       git diff librewolf.cfg
       git checkout librewolf.cfg > /dev/null 2>&1
     popd > /dev/null
@@ -372,7 +385,8 @@ config_diff() {
 policies_diff() {
     pushd settings/distribution > /dev/null
       cp "/c/Program Files/LibreWolf/distribution/policies.json" policies.json
-      git diff policies.json > ../../patches/librewolf-policies.patch
+      if [ $? -ne 0 ]; then exit 1; fi
+      git diff policies.json > ../../patches/experimental/librewolf-policies.patch
       git diff policies.json
       git checkout policies.json > /dev/null 2>&1 
     popd > /dev/null
@@ -402,6 +416,8 @@ git_init() {
 
 
 
+
+
 # windows: change $PATH to find all the build tools in .mozbuild
 # this might do the trick on macos aswell?
 if [ -f '/c/mozilla-build/start-shell.bat' ]; then
@@ -418,7 +434,10 @@ fi
 
 
 
+#
 # process commandline arguments and do something
+#
+
 
 done_something=0
 
diff --git a/patches/librewolf-config.patch b/patches/experimental/librewolf-config.patch
similarity index 100%
rename from patches/librewolf-config.patch
rename to patches/experimental/librewolf-config.patch
diff --git a/patches/librewolf-policies.patch b/patches/experimental/librewolf-policies.patch
similarity index 100%
rename from patches/librewolf-policies.patch
rename to patches/experimental/librewolf-policies.patch