.gitignore

@@ -0,0 +1,15 @@
+/firefox-*
+/librewolf-*
+/librewolf
+/mozilla-unified
+/tor-browser
+/gecko-dev
+/bootstrap.py
+/mozconfig
+/dist
+/tmp.nsi
+/tmp-permissive.nsi
+/tmp-strict.nsi
+/__pycache__
+/sha256sums.txt
+/upload.txt

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "settings"]
+	path = settings
+	url = https://gitlab.com/librewolf-community/settings.git
+[submodule "common"]
+	path = common
+	url = https://gitlab.com/librewolf-community/browser/common.git

Makefile

@@ -0,0 +1,39 @@
+.phony: all clean veryclean  fetch extract lw_do_patches build lw_post_build package lw_artifacts
+
+BUILD=python3 build.py ${OPTS}
+
+all :
+	$(BUILD) all
+clean :
+	$(BUILD) clean
+veryclean :
+	$(BUILD) veryclean
+
+fetch :
+	$(BUILD) fetch
+extract :
+	$(BUILD) extract
+do_patches lw_do_patches :
+	$(BUILD) lw_do_patches
+build :
+	$(BUILD) build
+post_build lw_post_build :
+	$(BUILD) lw_post_build
+package :
+	$(BUILD) package
+artifacts lw_artifacts :
+	$(BUILD) lw_artifacts
+
+update update_submodules :
+	$(BUILD) update_submodules
+upload :
+	$(BUILD) upload
+git_init :
+	$(BUILD) git_init
+reset :
+	$(BUILD) reset
+
+
+
+
+

README.md

@@ -1,30 +1,15 @@
-# LibreWolf Issue Tracker & Update Tools 🚀
+# LibreWolf for windows
 
-Welcome to the **LibreWolf for Windows** repository! This repository is now dedicated to the **Issue Tracker**. Submit your issues and get the latest updates on LibreWolf for Windows. 
+* **[download latest release](https://gitlab.com/librewolf-community/browser/windows/-/releases)**
+* or install via [chocolatey](https://community.chocolatey.org/packages/librewolf): `choco install librewolf`
+* [issue tracker](https://gitlab.com/librewolf-community/browser/windows/-/issues).
 
-To download the latest release, visit the [official LibreWolf release page](https://gitlab.com/librewolf-community/browser/bsys6/-/releases). For installation options, check out the [FAQ](https://librewolf.net/docs/faq/).
+# Settings repository
 
-## Update Tools 🛠️
+* [[settings repository](https://gitlab.com/librewolf-community/settings)] - all _librewolf.cfg_ stuff.. _([issues](https://gitlab.com/librewolf-community/settings/-/issues))_
 
-Stay secure and up-to-date with these LibreWolf update tools:
+# Community links
 
-1. **LibreWolf WinUpdater**: Kudos to @ltguillaume for this [automatic updater](https://codeberg.org/ltguillaume/librewolf-winupdater) that can be set up to update LibreWolf automatically or run manually.
+* If at all possible, pleasse go to the relevant 'issues' link and start discussing thing there.
-
+* [[reddit](https://www.reddit.com/r/LibreWolf/)] - [r/LibreWolf](https://www.reddit.com/r/LibreWolf/) 😺
-2. **LibreWolf Update Checker Extension**: Created by Defkev, this [extension](https://addons.mozilla.org/en-US/firefox/addon/librewolf-updater/) will notify you when an update is available and guide you to the download link.
+* [[gitter](https://gitter.im/librewolf-community/librewolf)], and the same room on [matrix](https://app.element.io/#/room/#librewolf-community_librewolf:gitter.im) (element.io).
-
-> Please note: The *updater* can _install_ updates automatically, while the *extension* can only _check_ for updates.
-
-## LibreWolf for Windows 🖥️
-
-- LibreWolf supports multiple UI languages, available in settings.
-- The latest **-portable.zip** release is self-contained and can be run on removable storage.
-
-## Issue Tracker 🎫
-
-- For issues with Settings or Advanced Settings (`about:config`), submit them to the [settings repository](https://gitlab.com/librewolf-community/settings/-/issues).
-- For other issues, such as crashes/theme/graphics/speed problems, submit them to [issues for windows repository](https://gitlab.com/librewolf-community/browser/windows/-/issues).
-
-## Building from Source 🏗️
-
-- Our `bsys` build system supports cross-compiling from Linux to Windows. Building the Windows version from within Windows is not tested yet.
-- The build system can be found here: [bsys6](https://gitlab.com/librewolf-community/browser/bsys6).

build.py

@@ -0,0 +1,737 @@
+#!env python3
+# tag: v90.0.2
+
+pkgver = '90.0.2'
+nightly_ver = '92.0a1'
+
+#
+# build.py - try move functionality away from that too big/horrible build script.
+#
+
+
+import optparse
+import sys
+import os
+import glob
+import time
+
+
+start_time = time.time()
+parser = optparse.OptionParser()
+
+parser.add_option('-x', '--cross',         dest='cross_compile', default=False, action="store_true")
+parser.add_option('-n', '--no-execute',    dest='no_execute',    default=False, action="store_true")
+parser.add_option('-l', '--no-librewolf',  dest='no_librewolf',  default=False, action="store_true")
+parser.add_option('-s', '--src',           dest='src',           default='release')
+parser.add_option('-t', '--distro',        dest='distro',        default='autodetect')
+parser.add_option('-T', '--token',         dest='token',         default='')
+parser.add_option('-3', '--i386',          dest='i386',          default=False, action="store_true")
+parser.add_option('-P', '--settings-pane', dest='settings_pane', default=False, action="store_true")
+
+options, remainder = parser.parse_args()
+
+# try autodetecting options.distro
+if options.distro == 'autodetect':
+    options.distro = 'win'
+    if os.path.isdir('/Applications'):
+        options.distro = 'osx'
+    elif os.path.isdir('/etc'):
+        options.distro = 'rpm'
+        if os.path.isdir('/etc/apt'):
+            options.distro = 'deb'
+
+
+
+
+
+
+
+                
+def script_exit(statuscode):
+        if (time.time() - start_time) > 60:
+                # print elapsed time
+                elapsed = time.strftime("%H:%M:%S", time.gmtime(time.time() - start_time))
+                print(f"\n\aElapsed time: {elapsed}")
+
+        sys.exit(statuscode)
+        
+def enter_srcdir():
+        dir = "firefox-{}".format(pkgver)
+        if options.src == 'nightly':
+                dir = 'mozilla-unified'
+        elif options.src == 'tor-browser':
+                dir = 'tor-browser'
+        elif options.src == 'gecko-dev':
+            dir = 'gecko-dev'
+        print("cd {}".format(dir))
+        if not options.no_execute:
+                try:
+                        os.chdir(dir)
+                except:
+                        print("fatal error: can't change to '{}' folder.".format(dir))
+                        script_exit(1)
+                
+def leave_srcdir():
+        print("cd ..")
+        if not options.no_execute:
+                os.chdir("..")
+        
+def exec(cmd):
+    if cmd != '':
+        print(cmd)
+        if not options.no_execute:
+                retval = os.system(cmd)
+                if retval != 0:
+                        print("fatal error: command '{}' failed".format(cmd))
+                        script_exit(1)
+
+def patch(patchfile):
+        cmd = "patch -p1 -i {}".format(patchfile)
+        print("\n*** -> {}".format(cmd))
+        if not options.no_execute:
+                retval = os.system(cmd)
+                if retval != 0:
+                        print("fatal error: patch '{}' failed".format(patchfile))
+                        script_exit(1)
+
+
+#        
+# Utilities:
+#
+
+
+
+def execute_update_submodules():
+        exec("git submodule update --recursive")
+        exec("git submodule foreach git pull origin master")
+        exec("git submodule foreach git merge origin master")
+
+def execute_git_init():
+        if options.src != 'release':
+            print("fatal error: git_init only works with the release source (--src release)")
+            script_exit(1)
+        enter_srcdir()
+        exec("rm -rf .git")
+        exec("git init")
+        exec("git config core.safecrlf false")
+        exec("git config commit.gpgsign false")
+        exec("git add -f * .[a-z]*")
+        exec("git commit -am initial")
+        leave_srcdir()
+        
+        
+def execute_deps_deb():
+        deps1 = "python python-dev python3 python3-dev python3-distutils clang pkg-config libpulse-dev gcc"
+        deps2 = "curl wget nodejs libpango1.0-dev nasm yasm zip m4 libgtk-3-dev libgtk2.0-dev libdbus-glib-1-dev"
+        deps3 = "libxt-dev python3-pip mercurial automake autoconf libtool m4"
+        exec("apt install -y {} {} {}".format(deps1,deps2,deps3))
+        
+def execute_deps_rpm():
+        deps1 = "python3 python3-distutils-extra clang pkg-config gcc curl wget nodejs nasm yasm zip m4"
+        deps2 = "python3-zstandard python-zstandard python-devel python3-devel gtk3-devel llvm gtk2-devel dbus-glib-devel libXt-devel pulseaudio-libs-devel"
+        exec("dnf -y install {} {}".format(deps1,deps2))
+        
+def execute_deps_pkg():
+        deps = "wget gmake m4 python3 py37-sqlite3 pkgconf llvm node nasm zip unzip yasm"
+        exec("pkg install {}".format(deps))
+
+        
+def execute_rustup():        
+        # rust needs special love: https://www.atechtown.com/install-rust-language-on-debian-10/
+        exec("curl https://sh.rustup.rs -sSf | sh")
+        exec("cargo install cbindgen")
+        
+def execute_mach_env():
+        enter_srcdir()
+        exec("bash ./mach create-mach-environment")
+        leave_srcdir()
+        
+
+def execute_reset():
+        if options.src == 'release':
+                path = "firefox-{}/.git/index".format(pkgver)
+                if not os.path.isfile(path):
+                        print("fatal error: cannot reset '--src release' sources as it's not under version control.")
+                        script_exit(1)
+                enter_srcdir()
+                exec("git reset --hard")
+                leave_srcdir()
+        elif options.src == 'nightly':
+                enter_srcdir()
+                exec("hg up -C")
+                exec("hg purge")
+                exec("hg pull -u")
+                leave_srcdir()
+        elif options.src == 'tor-browser':
+                enter_srcdir()
+                exec("git reset --hard")
+                leave_srcidr()
+        elif options.src == 'gecko-dev':
+                enter_srcdir()
+                exec("git reset --hard")
+                leave_srcdir()
+
+        
+
+#
+# Targets:
+#
+
+
+def execute_fetch():
+        if options.src == 'release':
+                exec("rm -f firefox-{}.source.tar.xz".format(pkgver))
+                exec("wget -q https://archive.mozilla.org/pub/firefox/releases/{}/source/firefox-{}.source.tar.xz".format(pkgver, pkgver))
+        elif options.src == 'nightly':
+            if not os.path.isdir('mozilla-unified'):
+                exec("rm -f bootstrap.py")
+                exec("rm -rf mozilla-unified")
+                exec("wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py")
+            exec("python3 bootstrap.py --no-interactive --application-choice=browser")
+        elif options.src == 'tor-browser':
+            if not os.path.isdir('tor-browser'):
+                exec("rm -rf tor-browser")
+                exec("git clone --no-checkout --recursive https://git.torproject.org/tor-browser.git")
+                patch("../patches/tb-mozconfig-win10.patch")
+            enter_srcdir()
+            exec("git checkout tor-browser-89.0-10.5-1-build1")
+            exec("git submodule update --recursive")
+            leave_srcdir()
+        elif options.src == 'gecko-dev':
+            if not os.path.isdir('gecko-dev'):
+                exec("rm -rf gecko-dev")
+                exec("git clone --depth=1 https://github.com/mozilla/gecko-dev.git")
+
+def execute_extract():
+        if options.src == 'release':
+                exec("rm -rf firefox-{}".format(pkgver))
+                exec("tar xf firefox-{}.source.tar.xz".format(pkgver))
+        
+def execute_build():
+        enter_srcdir()
+        exec("bash ./mach build")
+        leave_srcdir()
+        
+def execute_package():
+        enter_srcdir()
+        exec("bash ./mach package")
+        leave_srcdir()
+
+
+
+
+
+
+
+
+        
+#
+# LibreWolf specific:
+#
+
+def create_mozconfig(contents):
+        if not options.no_execute:
+                f = open('mozconfig', 'w')
+                f.write(contents)
+                if not options.distro == 'win':
+                    f.write("\nac_add_options --with-app-name=librewolf")
+                if options.distro == 'osx' and options.cross_compile:
+                    f.write("\nac_add_options --target=aarch64")
+                if options.i386:
+                    f.write("\nac_add_options --target=i386")
+                f.write("\n")
+                f.close()
+
+def execute_lw_do_patches():
+        if options.no_librewolf:
+                return
+        if not options.src in ['release','nightly','gecko-dev']:
+                return
+
+        enter_srcdir()
+        # create the right mozconfig file..
+        create_mozconfig(mozconfig_release)
+
+        # macos : if have compatibilty osx api headers, add that to mozconfig_release
+        dir = os.environ['HOME'] + '/.mozbuild/macos-sdk/MacOSX11.1.sdk'
+        if os.path.isdir(dir):
+                with open('mozconfig','a') as f:
+                        f.write("\nac_add_options --with-macos-sdk=$HOME/.mozbuild/macos-sdk/MacOSX11.1.sdk")
+                        f.close()
+
+        
+        # copy branding files..
+        exec("cp -vr ../common/source_files/* .")
+        exec("cp -v ../files/configure.sh browser/branding/librewolf")
+
+        patches = []
+        
+        if options.src == 'release':
+                # production patches
+                patches = [
+                    "../common/patches/context-menu.patch",
+                    "../common/patches/remove_addons.patch",
+                    "../common/patches/megabar.patch",
+                    "../common/patches/mozilla-vpn-ad.patch",
+                    "../common/patches/allow_dark_preference_with_rfp.patch",
+                    "../common/patches/about-dialog.patch",
+                    
+                    # sed patches..
+                    "../common/patches/sed-patches/allow-searchengines-non-esr.patch",
+                    "../common/patches/sed-patches/disable-pocket.patch",
+                    "../common/patches/sed-patches/remove-internal-plugin-certs.patch",
+                    "../common/patches/sed-patches/stop-undesired-requests.patch",
+                ]
+                
+        elif options.src == 'nightly' or options.src == 'gecko-dev':
+                # patches for future releases are caught with nightly
+                patches = [
+                    "../common/patches/context-menu.patch",
+                    "../patches/remove_addons-91.0a1-nightly.patch",                        
+                    ##"../common/patches/megabar.patch",
+                    "../patches/vpn-patch-91.0a1-nightly.patch",
+                    "../common/patches/allow_dark_preference_with_rfp.patch",
+                    "../common/patches/about-dialog.patch",
+                
+                    # sed patches..
+                    "../common/patches/sed-patches/allow-searchengines-non-esr.patch",
+                    "../common/patches/sed-patches/disable-pocket.patch",
+                    "../common/patches/sed-patches/remove-internal-plugin-certs.patch",
+                    ##"../common/patches/sed-patches/stop-undesired-requests.patch",
+                ]
+
+                
+        for p in patches:
+            patch(p)
+            
+        # local windows patches
+        for p in ["../patches/browser-confvars.patch", "../patches/package-manifest.patch"]:
+            patch(p)
+
+        # insert the settings pane source (experimental)
+        if options.settings_pane:
+            exec('rm -rf librewolf-pref-pane')
+            exec('git clone https://gitlab.com/ohfp/librewolf-pref-pane.git')
+            exec('cp -vrf librewolf-pref-pane/browser/* browser')
+            exec('touch browser/themes/shared/newInstall.css')
+            exec('touch browser/themes/shared/newInstallPage.css')
+            exec('cp browser/themes/shared/icons/pin-12.svg browser/themes/shared/icons/pin-tab.svg')
+            exec('cp browser/themes/shared/icons/stop-to-reload.svg browser/themes/shared/icons/stop.svg')
+            exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/icons/unpin-tab.svg')
+
+            if options.src == 'nightly' or options.src == 'gecko-dev':
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/controlcenter/3rdpartycookies-disabled.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/controlcenter/cryptominers-disabled.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/controlcenter/fingerprinters.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/controlcenter/fingerprinters-disabled.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/controlcenter/socialblock-disabled.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/controlcenter/tracker-image.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/controlcenter/tracker-image-disabled.svg')
+                
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/customizableui/menu-arrow.svg')
+                
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/illustrations/blue-berror.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/illustrations/error-connection-failure.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/illustrations/error-server-not-found.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/illustrations/error-session-restore.svg')
+                
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/canvas-blocked.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/canvas.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/indexedDB.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/indexedDB.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/popup-subitem.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/update.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/webauthn.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/webauthn.svg')                
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/block-cryptominer.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/block-social.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/notification-icons/block-fingerprinter.svg')
+                
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/preferences/no-search-results.svg')                
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/icons/back-12.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/icons/restore-session.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/icons/quit.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/icons/reload.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/icons/send-to-device.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/icons/sign-out.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/icons/tab-12.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/icons/zoom-in.svg')
+                
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/tabbrowser/indicator-tab-attention.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/tabbrowser/tab-audio-blocked.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/tabbrowser/tab-overflow-indicator.png')
+
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/update-circle-fill-12.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/incontent-icons/welcome-back.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/places/folder.svg')
+                exec('cp browser/themes/shared/icons/stop.svg browser/themes/shared/places/history.svg')
+                
+                # this code ultimately does not work, it remains stuck on 'tab-overflow-indicator.svg
+                pass
+
+        leave_srcdir()
+
+
+def get_objdir():
+        pattern = "obj-*"
+        retval = glob.glob(pattern)
+        if options.no_execute:
+                return "obj-XXX"
+        if len(retval) != 1:
+                print("fatal error: in execute_lw_post_build(): cannot glob build output folder '{}'".format(pattern))
+                script_exit(1)
+        return retval[0]
+        
+def execute_lw_post_build():
+        if options.no_librewolf:
+                return
+        enter_srcdir()
+        dirname = get_objdir()
+
+        distfolder = "dist/bin"
+        if options.distro == 'osx':
+                distfolder = 'dist/LibreWolf.app/Contents/Resources'
+
+        if not options.no_execute:
+                os.makedirs("{}/{}/defaults/pref".format(dirname,distfolder), exist_ok=True)
+                os.makedirs("{}/{}/distribution".format(dirname,distfolder), exist_ok=True)
+        exec("cp -v ../settings/defaults/pref/local-settings.js {}/{}/defaults/pref/".format(dirname,distfolder))
+        exec("cp -v ../settings/distribution/policies.json {}/{}/distribution/".format(dirname,distfolder))
+        exec("cp -v ../settings/librewolf.cfg {}/{}/".format(dirname,distfolder))
+        leave_srcdir()
+        
+def execute_lw_artifacts():
+        if options.no_librewolf:
+                return
+        
+        enter_srcdir()
+        
+        if options.distro == 'win':
+                exe = ".exe"
+                ospkg = "win64"
+                dirname = "{}/dist/firefox".format(get_objdir())
+        elif options.distro == 'deb':
+                exe = ""
+                ospkg = "deb"
+                dirname = "{}/dist/firefox".format(get_objdir())
+        elif options.distro == 'rpm':
+                exe = ""
+                ospkg = "rpm"
+                dirname = "{}/dist/firefox".format(get_objdir())
+        elif options.distro == 'osx':
+            #exe = ""
+            #ospkg = "osx"
+            #dirname = "{}/dist/firefox".format(get_objdir())
+            exec("cp {}/dist/librewolf*.dmg ..".format(get_objdir()))
+            leave_srcdir()
+            return
+
+        exec("rm -rf ../firefox ../librewolf")
+        exec("cp -rv {} ..".format(dirname))
+        leave_srcdir()
+
+        librewolfdir = "librewolf"
+        if options.distro == 'osx':
+                librewolfdir = 'librewolf/Librewolf.app'
+        exec("mv firefox librewolf")
+        if options.distro != 'osx':
+                exec("mv -v {}/firefox{} {}/librewolf{}".format(librewolfdir,exe,librewolfdir,exe));
+                exec("rm -rf {}/maintainanceservice* {}/pingsender* {}/firefox.*.xml {}/precomplete {}/removed-files {}/uninstall"
+                     .format(librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir,librewolfdir))
+                exec("cp -v common/source_files/browser/branding/librewolf/firefox.ico {}/librewolf.ico".format(librewolfdir))
+                if options.distro != 'win':
+                        exec("cp -v files/register-librewolf files/start-librewolf files/start-librewolf.desktop.in librewolf")
+        
+        # create zip file
+        if options.src == 'release':
+                zipname = "librewolf-{}.en-US.{}.zip".format(pkgver,ospkg)
+        elif options.src == 'nightly':
+                zipname = "librewolf-{}.en-US.{}-nightly.zip".format(nightly_ver,ospkg)
+        elif options.src == 'gecko-dev':
+                zipname = "librewolf-{}.en-US.{}-gecko-dev.zip".format(nightly_ver,ospkg)
+
+        exec("rm -f {}".format(zipname))
+        exec("zip -qr9 {} librewolf".format(zipname))
+        
+        # create installer
+        if options.distro == 'win':
+                setupname = "librewolf-{}.en-US.win64-setup.exe".format(pkgver)
+                if options.src == 'nightly':
+                        if os.path.isfile(setupname):
+                                exec("rm -f tmp.exe")
+                                exec("mv {} tmp.exe".format(setupname))
+                        setupname = "librewolf-{}.en-US.win64-nightly-setup.exe".format(nightly_ver)
+                elif options.src == 'gecko-dev':
+                    if os.path.isfile(setupname):
+                        exec("rm -f tmp.exe")
+                        exec("mv {} tmp.exe".format(setupname))
+                    setupname = "librewolf-{}.en-US.win64-gecko-dev-setup.exe".format(nightly_ver)
+                        
+                exec("rm -f {} tmp.nsi".format(setupname))
+                s = pkgver
+                if options.src == 'nightly' or options.src == 'gecko-dev':
+                    s = nightly_ver
+                exec("sed \"s/pkg_version/{}/g\" < setup.nsi > tmp.nsi".format(s))
+                exec("makensis-3.01.exe -V1 tmp.nsi")
+                exec("rm -f tmp.nsi")
+                from_name = 'librewolf-{}.en-US.win64-setup.exe'.format(s)
+                if from_name != setupname:
+                    exec("mv {} {}".format(from_name,setupname))
+                if os.path.isfile("tmp.exe"):
+                        exec("mv tmp.exe librewolf-{}.en-US.win64-setup.exe".format(pkgver))
+
+def do_upload(filename):
+        exec("echo \".\" >> upload.txt")
+        exec("curl --request POST --header \"PRIVATE-TOKEN: {}\" --form \"file=@{}\" \"https://gitlab.com/api/v4/projects/13852981/uploads\" >> upload.txt".format(options.token,filename))
+        exec("echo \".\" >> upload.txt")
+        
+def execute_upload():
+        if options.token =='':
+                print("fatal error: You must specify a private token when using the 'upload' command.")
+                script_exit(1)
+
+        if options.distro == 'win':
+                ospkg = "win64"
+        elif options.distro == 'deb':
+                ospkg = "deb"
+        elif options.distro == 'rpm':
+                ospkg = "rpm"
+        elif options.distro == 'osx':
+                ospkg = "osx"
+
+                
+        zip_filename = "librewolf-{}.en-US.{}.zip".format(pkgver,ospkg)
+        setup_filename = "librewolf-{}.en-US.{}-setup.exe".format(pkgver,ospkg)
+        nightly_setup_filename = "librewolf-{}.en-US.{}-gecko-dev-setup.exe".format(nightly_ver,ospkg)
+        
+        if not os.path.isfile(zip_filename):
+                print("fatal error: File '{}' not found.".format(zip_filename))
+                script_exit(1)
+        if not os.path.isfile(setup_filename):
+                print("fatal error: File '{}' not found.".format(setup_filename))
+                script_exit(1)
+        if not os.path.isfile(nightly_setup_filename):
+                print("fatal error: File '{}' not found.".format(nightly_setup_filename))
+                script_exit(1)
+
+        exec("sha256sum {} {} {} > sha256sums.txt".format(zip_filename,setup_filename,nightly_setup_filename))
+        exec("rm -f upload.txt")
+        do_upload(setup_filename)
+        do_upload(zip_filename)
+        do_upload(nightly_setup_filename)
+        do_upload("sha256sums.txt")
+        print("upload.txt: Upload JSON api results are in the file \'upload.txt\'.")
+
+
+
+
+#
+# Main targets:
+#
+
+
+
+
+def execute_all():
+        execute_fetch()
+        execute_extract()
+        execute_lw_do_patches()
+        execute_build()
+        execute_lw_post_build()
+        execute_package()
+        execute_lw_artifacts() 
+
+def execute_clean():
+        exec("rm -rf firefox-{}".format(pkgver))
+        exec("rm -rf librewolf bootstrap.py tmp.nsi tmp.exe sha256sums.txt upload.txt")
+        for filename in glob.glob("librewolf-*"):
+                os.remove(filename)
+
+def execute_veryclean():
+        exec("rm -rf firefox-{}.source.tar.xz mozilla-unified tor-browser gecko-dev".format(pkgver))
+        execute_clean()
+        
+
+
+
+
+
+        
+
+
+
+#
+# main commandline interface
+#
+
+def main():
+        if options.src == 'tor-browser':
+                options.no_librewolf = True
+
+        if len(remainder) > 0:
+                if not options.src in ['release','nightly','tor-browser','gecko-dev']:
+                        print("error: option --src invalid value")
+                        script_exit(1)
+                if not options.distro in ['deb','rpm', 'win','osx']:
+                        print("error: option --distro invalid value")
+                        script_exit(1)
+
+                for arg in remainder:
+                        if arg == 'all':
+                                execute_all()
+                        elif arg == 'clean':
+                                execute_clean()
+                        elif arg == 'veryclean':
+                                execute_veryclean()
+                        
+                        # Targets:
+                        
+                        elif arg == 'fetch':
+                                execute_fetch()
+                        elif arg == 'extract':
+                                execute_extract()
+                        elif arg == 'lw_do_patches':
+                                execute_lw_do_patches()
+                        elif arg == 'build':
+                                execute_build()
+                        elif arg == 'lw_post_build':
+                                execute_lw_post_build()
+                        elif arg == 'package':
+                                execute_package()
+                        elif arg == 'lw_artifacts':
+                                execute_lw_artifacts()
+
+                        # Utilities
+                        
+                        elif arg == 'update_submodules':
+                                execute_update_submodules()
+                        elif arg == 'upload':
+                                execute_upload()
+                        
+                        elif arg == 'git_init':
+                                execute_git_init()
+                        
+                        elif arg == 'deps_deb':
+                                execute_deps_deb()
+                        elif arg == 'deps_rpm':
+                                execute_deps_rpm()
+                        elif arg == 'deps_pkg':
+                                execute_deps_pkg()
+                        
+                        elif arg == 'rustup':
+                                execute_rustup()
+                        elif arg == 'mach_env':
+                                execute_mach_env()
+                        elif arg == 'reset':
+                                execute_reset()
+                        
+                        else:
+                                print("error: unknown command on command line: ", arg)
+                                script_exit(1)
+        else:
+                # Print help message
+                print(help_message.format(options.distro))
+
+
+
+
+#
+# Large multiline strings
+#
+
+
+
+help_message = """# Use: 
+
+     build.py [<options>] clean | all | <targets> | <utilities>
+
+# Options:
+
+    -n,--no-execute            - print commands, don't execute them
+    -l,--no-librewolf          - skip LibreWolf specific stages.
+    -x,--cross                 - crosscompile from linux, implies -t win
+    -s,--src <src>             - release,nightly,tor-browser,gecko-dev
+                                 (default=release)
+    -t,--distro <distro>       - deb,rpm,win,osx (default={})
+    -T,--token <private_token> - private token used to upload to gitlab.com
+    -3,--i386                  - build 32-bit
+    -P,--settings-pane         - build with the experimental settings pane
+
+# Targets:
+
+    all        - all steps from fetch to producing setup.exe
+    clean      - clean everything, including extracted/fetched sources
+    veryclean  - clean like above, and also remove build artifacts.
+
+    fetch               - wget or hg clone or git pull
+    extract             - when using wget, extract the archive.
+    lw_do_patches       - [librewolf] patch the source
+    build               - build the browser
+    lw_post_build       - [librewolf] insert our settings
+    package             - package the browser into zip/apk
+    lw_artifacts        - [librewolf] build setup.exe
+
+# Utilities:
+
+    update_submodules   - git update submodules
+    upload              - upload the build artifacts to gitlab.com
+
+    git_init    - put the source folder in a .git repository
+    reset       - use git/mercurial to revert changes to a clean state
+
+    deps_deb    - install dependencies with apt
+    deps_rpm    - install dependencies with dnf
+    deps_pkg    - install dependencies on freebsd
+
+    rustup      - update rust
+    mach_env    - create mach environment
+"""
+
+#
+# mozconfig files:
+#
+
+mozconfig_release = """
+ac_add_options --enable-application=browser
+
+# This supposedly speeds up compilation (We test through dogfooding anyway)
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+
+ac_add_options --enable-release
+ac_add_options --enable-hardening
+ac_add_options --enable-rust-simd
+ac_add_options --enable-optimize
+
+
+# Branding
+ac_add_options --enable-update-channel=release
+# theming bugs: ac_add_options --with-app-name=librewolf
+# theming bugs: ac_add_options --with-app-basename=LibreWolf
+ac_add_options --with-branding=browser/branding/librewolf
+ac_add_options --with-distribution-id=io.gitlab.librewolf-community
+ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+#export MOZ_REQUIRE_SIGNING=0
+
+# Features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+
+# Disables crash reporting, telemetry and other data gathering tools
+mk_add_options MOZ_CRASHREPORTER=0
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=0
+
+# testing..
+# MOZ_APP_NAME=librewolf
+# This gives the same theming issue as --with-app-name=librewolf
+"""
+
+
+
+
+
+main()
+script_exit(0)

common

@@ -0,0 +1 @@
+Subproject commit 240c297fb8f2c102f014a410755fe6cf783dbc9f

files/attic/artifacts_all.sh

@@ -0,0 +1,137 @@
+function artifacts_win_details() {
+    
+exe=.exe
+objdir=obj-x86_64-pc-mingw32/dist/firefox
+ospkg=win64
+
+# sanity checks
+if [ ! -d $objdir ]; then
+    echo "artifacts_win.sh: directory $objdir not found. did you run './build.sh build'?"
+    exit 1;
+fi
+
+rm -rf ../firefox ../librewolf
+cp -r $objdir ..
+
+pushd ..
+
+mv firefox librewolf
+# apply the LibreWolf settings
+cp -rv settings/* librewolf
+# rename the executable manually
+pushd librewolf ; mv -v firefox$exe librewolf$exe ; popd
+# clean garbage files
+cd librewolf ; rm -rf maintenanceservice* pingsender* firefox.*.xml precomplete removed-files uninstall ; cd ..
+# copy the windows icon
+cp -v common/source_files/browser/branding/librewolf/firefox.ico librewolf/librewolf.ico
+
+# create the final zip/exe artifacts
+
+rm -f librewolf-$pkgver.en-US.$ospkg.zip
+zip -qr9 librewolf-$pkgver.en-US.$ospkg.zip librewolf
+if [ $? -ne 0 ]; then exit 1; fi
+
+# now to try to make the installer
+rm -f librewolf-$pkgver.en-US.win64-setup.exe tmp.nsi
+sed "s/pkg_version/$pkgver/g" < artifacts_win.nsi > tmp.nsi
+makensis-3.01.exe -V1 tmp.nsi
+if [ $? -ne 0 ]; then exit 1; fi
+
+
+popd
+}
+
+
+
+
+
+
+
+function artifacts_deb_details() {
+    
+exe=
+objdir=obj-x86_64-pc-linux-gnu/dist/firefox
+ospkg=deb
+
+# sanity checks
+if [ ! -d $objdir ]; then
+    echo "artifacts_win.sh: directory $objdir not found. did you run './build.sh build'?"
+    exit 1;
+fi
+
+rm -rf ../firefox ../librewolf
+cp -r $objdir ..
+
+pushd ..
+
+mv firefox librewolf
+# apply the LibreWolf settings
+cp -rv settings/* librewolf
+# rename the executable manually
+pushd librewolf ; mv -v firefox$exe librewolf$exe ; popd
+# clean garbage files
+cd librewolf ; rm -rf maintenanceservice* pingsender* firefox.*.xml precomplete removed-files uninstall ; cd ..
+# copy the windows icon
+cp -v common/source_files/browser/branding/librewolf/firefox.ico librewolf/librewolf.ico
+
+# create the final zip artifact
+rm -f librewolf-$pkgver.en-US.$ospkg.zip
+zip -qr9 librewolf-$pkgver.en-US.$ospkg.zip librewolf
+if [ $? -ne 0 ]; then exit 1; fi
+
+# now to try to make the installer
+# (create a .deb here)
+
+popd
+}
+
+
+
+
+
+
+
+
+
+
+
+function artifacts_rpm_details(){
+exe=
+objdir=obj-x86_64-pc-linux-gnu/dist/firefox
+ospkg=rpm
+
+# sanity checks
+if [ ! -d $objdir ]; then
+    echo "artifacts_win.sh: directory $objdir not found. did you run './build.sh build'?"
+    exit 1;
+fi
+
+rm -rf ../firefox ../librewolf
+cp -r $objdir ..
+
+pushd ..
+
+mv firefox librewolf
+# apply the LibreWolf settings
+cp -rv settings/* librewolf
+# rename the executable manually
+pushd librewolf ; mv -v firefox$exe librewolf$exe ; popd
+# clean garbage files
+cd librewolf ; rm -rf maintenanceservice* pingsender* firefox.*.xml precomplete removed-files ; cd ..
+
+# linux: copy app icon stuff
+cp files/register-librewolf files/start-librewolf files/start-librewolf.desktop.in librewolf
+
+# create the final zip artifact
+rm -f librewolf-$pkgver.en-US.$ospkg.zip
+zip -qr9 librewolf-$pkgver.en-US.$ospkg.zip librewolf
+if [ $? -ne 0 ]; then exit 1; fi
+
+# now to try to make the installer
+# (create a .rpm here)
+
+popd
+}
+
+
+

files/attic/build.sh

@@ -0,0 +1,600 @@
+#!/bin/bash
+# build.sh - build librewolf on windows
+# derived from https://gitlab.com/librewolf-community/browser/linux/-/blob/master/PKGBUILD
+#
+# This script is set up like a Makefile, it's a list of functions that perform a
+# certain sub-task, that function can be called as a commandline argument to the script.
+#
+
+set -e
+
+. ./version.sh
+
+srcdir=firefox-$pkgver
+
+#
+# Basic functionality
+#
+
+fetch() {
+    echo "fetch: begin."
+
+    # fetch the firefox source.
+    rm -f firefox-$pkgver.source.tar.xz
+    echo "Downloading firefox-$pkgver.source.tar.xz ..."
+    wget -q https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
+    if [ $? -ne 0 ]; then exit 1; fi
+    if [ ! -f firefox-$pkgver.source.tar.xz ]; then exit 1; fi
+    
+    echo "fetch: done."
+}
+
+
+
+extract() {
+    echo "extract: begin."
+    
+    echo "Deleting previous firefox-$pkgver ..."
+    rm -rf firefox-$pkgver
+    
+    echo "Extracting firefox-$pkgver.source.tar.xz ..."
+    tar xf firefox-$pkgver.source.tar.xz
+    if [ $? -ne 0 ]; then exit 1; fi
+    if [ ! -d firefox-$pkgver ]; then exit 1; fi
+    
+    echo "extract: done."
+}
+
+. ./mozconfigs.sh
+
+do_patches() {
+    echo "do_patches: begin. (srcdir=$srcdir)"
+
+    if [ "$srcdir" == "tor-browser" ]; then
+	echo "do_patches: warning: not running do_patches on tor-browser. done."
+	return
+    fi
+
+    if [ ! -d $srcdir ]; then exit 1; fi
+    cd $srcdir
+
+    echo 'Creating mozconfig...'
+
+    if [ "$mozconfig_mode" == "xcompile" ]; then
+	create_mozconfig_xcompile
+	cp -v ../mozconfig .
+    elif [ "$strict" == "strict" ]; then
+	create_mozconfig_strict
+	cp -v ../mozconfig .
+    elif [ "$android" == "android" ]; then
+	create_mozconfig_android
+	cp -v ../mozconfig .
+    else
+	create_mozconfig_default
+	cp -v ../mozconfig .
+    fi
+    
+
+    echo 'Copy librewolf branding files...'
+    
+    cp -vr ../common/source_files/* ./
+    # new branding stuff
+    cp -v ../files/configure.sh browser/branding/librewolf
+
+    echo 'Applying patches...'
+
+    echo "patch -p1 -i ../common/patches/nightly/context-menu2.patch"
+    patch -p1 -i ../common/patches/nightly/context-menu2.patch
+    echo "patch -p1 -i ../common/patches/remove_addons.patch"
+    patch -p1 -i ../common/patches/remove_addons.patch
+    echo 'patch -p1 -i ../common/patches/nightly/megabar2.patch'
+    patch -p1 -i ../common/patches/nightly/megabar3.patch	
+    echo "patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch"
+    patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch
+	
+    echo 'GNU sed patches...'
+    
+    echo 'patch -p1 -i ../common/patches/sed-patches/allow-searchengines-non-esr.patch'
+    patch -p1 -i ../common/patches/sed-patches/allow-searchengines-non-esr.patch    
+    echo 'patch -p1 -i ../common/patches/sed-patches/disable-pocket.patch'
+    patch -p1 -i ../common/patches/sed-patches/disable-pocket.patch
+    echo 'patch -p1 -i ../common/patches/sed-patches/remove-internal-plugin-certs.patch'
+    patch -p1 -i ../common/patches/sed-patches/remove-internal-plugin-certs.patch
+    echo 'patch -p1 -i ../common/patches/sed-patches/stop-undesired-requests.patch'
+    patch -p1 -i ../common/patches/sed-patches/stop-undesired-requests.patch
+    
+    echo 'Local patches...'
+    
+    # local win10 patches
+    echo 'patch -p1 -i ../patches/browser-confvars.patch'
+    patch -p1 -i ../patches/browser-confvars.patch # not sure about this one yet!
+    
+    cd ..
+    echo "do_patches: done."
+}
+
+
+
+build() {
+    echo "build: begin."
+    if [ ! -d $srcdir ]; then exit 1; fi
+    cd $srcdir
+    
+    ./mach build
+    if [ $? -ne 0 ]; then exit 1; fi
+    
+    cd ..
+    echo "build: done."
+}
+
+
+. ./artifacts_all.sh
+
+artifacts_win() {
+    echo "artifacts_win: begin."
+    if [ ! -d $srcdir ]; then exit 1; fi
+    cd $srcdir
+
+    ./mach package
+    if [ $? -ne 0 ]; then exit 1; fi
+    
+    echo ""
+    echo "artifacts_win: Creating final artifacts."
+    echo ""
+    
+    artifacts_win_details
+
+    cd ..
+    echo "artifacts_win: done."
+}
+
+artifacts_deb()
+{
+    echo "artifacts_deb: begin."
+    if [ ! -d $srcdir ]; then exit 1; fi
+    cd $srcdir
+
+    ./mach package
+    if [ $? -ne 0 ]; then exit 1; fi
+    
+    echo ""
+    echo "artifacts_deb: Creating final artifacts."
+    echo ""
+    
+    artifacts_deb_details
+
+    cd ..
+    echo "artifacts_deb: done."
+}
+
+
+artifacts_rpm()
+{
+    echo "artifacts_rpm: begin."
+    if [ ! -d $srcdir ]; then exit 1; fi
+    cd $srcdir
+
+    ./mach package
+    if [ $? -ne 0 ]; then exit 1; fi
+    
+    echo ""
+    echo "artifacts_rpm: Creating final artifacts."
+    echo ""
+    
+    artifacts_rpm_details
+
+    cd ..
+    echo "artifacts_rpm: done."
+}
+
+
+
+# Dependencies for linux/freebsd.
+deps_deb() {
+    echo "deps_deb: begin."
+    deps1="python python-dev python3 python3-dev python3-distutils clang pkg-config libpulse-dev gcc"
+    deps2="curl wget nodejs libpango1.0-dev nasm yasm zip m4 libgtk-3-dev libgtk2.0-dev libdbus-glib-1-dev"
+    deps3="libxt-dev python3-pip mercurial automake autoconf libtool m4"
+    apt install -y $deps1
+    apt install -y $deps2
+    apt install -y $deps3
+    echo "deps_deb: done."
+}
+
+deps_rpm() {
+    echo "deps_rpm: begin."
+    deps="python3 python3-distutils-extra clang pkg-config gcc curl wget nodejs nasm yasm zip m4 python3-zstandard python-zstandard python-devel python3-devel gtk3-devel llvm gtk2-devel dbus-glib-devel libXt-devel pulseaudio-libs-devel"
+    dnf -y install $deps
+    echo "deps_rpm: done."
+}
+
+deps_pkg() {
+    echo "deps_pkg: begin."
+    deps="wget gmake m4 python3 py37-sqlite3 pkgconf llvm node nasm zip unzip yasm"
+    pkg install $deps
+    echo "deps_pkg: done."
+}
+
+# these utilities should work everywhere
+clean() {
+    echo "clean: begin."
+    
+    echo "Deleting firefox-${pkgver} ..."
+    rm -rf firefox-$pkgver
+    
+    echo "Deleting other cruft ..."
+    rm -rf librewolf
+    rm -f firefox-$pkgver.source.tar.xz
+    rm -f mozconfig
+    rm -f bootstrap.py
+    
+    # windows
+    rm -f librewolf-$pkgver.en-US.win64.zip
+    rm -f librewolf-$pkgver.en-US.win64-setup.exe
+    rm -f librewolf-$pkgver.en-US.win64-permissive.zip
+    rm -f librewolf-$pkgver.en-US.win64-permissive-setup.exe
+    rm -f librewolf-$pkgver.en-US.win64-strict.zip
+    rm -f librewolf-$pkgver.en-US.win64-strict-setup.exe
+    rm -f tmp.nsi tmp-permissive.nsi tmp-strict.nsi
+    
+    # linux
+    rm -f librewolf-$pkgver.en-US.deb.zip
+    rm -f librewolf-$pkgver.en-US.deb-permissive.zip
+    rm -f librewolf-$pkgver.en-US.deb-strict.zip
+    rm -f librewolf-$pkgver.en-US.rpm.zip
+    rm -f librewolf-$pkgver.en-US.rpm-permissive.zip
+    rm -f librewolf-$pkgver.en-US.rpm-strict.zip
+
+    echo "clean: done."
+}
+
+
+rustup() {
+    # rust needs special love: https://www.atechtown.com/install-rust-language-on-debian-10/
+    echo "rustup: begin."
+    curl https://sh.rustup.rs -sSf | sh
+    . "$HOME/.cargo/env"
+    cargo install cbindgen
+    echo "rustup: done."
+}
+
+mach_env() {
+    echo "mach_env: begin."
+    if [ ! -d $srcdir ]; then exit 1; fi
+    cd $srcdir
+    ./mach create-mach-environment
+    if [ $? -ne 0 ]; then exit 1; fi
+    cd ..
+    echo "mach_env: done."    
+}
+
+git_subs() {
+    echo "git_subs: begin."
+    git submodule update --recursive
+    git submodule foreach git pull origin master
+    git submodule foreach git merge origin master
+    echo "git_subs: done."
+}
+
+git_init() {
+    echo "git_init: begin."
+    echo "srcdir = $srcdir"
+    if [ ! -d $srcdir ]; then exit 1; fi
+    cd $srcdir
+
+    echo "Removing old .git folder..."
+    rm -rf .git
+
+    echo "Creating new .git folder..."
+    git init
+    git config core.safecrlf false
+    git config commit.gpgsign false
+    git add -f * .[a-z]*
+    git commit -am 'Initial commit'
+    
+    cd ..
+    echo "git_init: done."
+}
+
+#
+# Nightly builds, alternative builds.
+#
+
+init_mozilla_unified() {
+    rm -f bootstrap.py
+    wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py
+    python3 bootstrap.py
+}
+set_mozilla_unified() {
+    srcdir=mozilla-unified
+}
+reset_mozilla_unified() {
+    echo "reset_mozilla_unified: begin."
+    if [ ! -d mozilla-unified ]; then
+	echo "Error: mozilla-unified folder not found. use init_mozilla_unified() to create one"
+	exit 1;
+    fi
+    cd mozilla-unified
+
+    echo "Resetting mozilla-unified..."
+    hg up -C
+    hg purge
+    echo "Mercurial pull..."
+    hg pull -u
+    
+    cd ..
+    echo "reset_mozilla_unified: done."
+}
+
+# tor-browser.. (experimental)
+init_tor_browser() {
+    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 submodule update --recursive
+      patch -p1 -i ../patches/tb-mozconfig-win10.patch 
+    cd ..
+}
+set_tor_browser() {
+    srcdir=tor-browser
+}
+reset_tor_browser() {
+    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."
+}
+
+
+
+# cross-compile actions...
+#
+#   linux_patches    - the 'do_patches' for linux->win crosscompile.
+#   linux_artifacts  - standard artifact zip file. perhaps a -setup.exe.
+#   setup_deb_root   - setup compile environment (root stuff)
+#   setup_deb_user   - setup compile environmnet (build user)
+#   setup_rpm_root   - setup compile environment (root stuff)
+#   setup_rpm_user   - setup compile environmnet (build user)
+
+. ./linux_xcompile.sh
+
+
+
+
+#
+# process commandline arguments and do something
+#
+
+done_something=0
+
+
+if [[ "$*" == *linux_patches* ]]; then
+    linux_patches
+    done_something=1
+fi
+if [[ "$*" == *linux_artifacts* ]]; then
+    linux_artifacts
+    done_something=1
+fi
+if [[ "$*" == *setup_deb_root* ]]; then
+    setup_deb_root
+    done_something=1
+fi
+if [[ "$*" == *setup_deb_user* ]]; then
+    setup_deb_user
+    done_something=1
+fi
+if [[ "$*" == *setup_rpm_root* ]]; then
+    setup_rpm_root
+    done_something=1
+fi
+if [[ "$*" == *setup_rpm_user* ]]; then
+    setup_rpm_user
+    done_something=1
+fi
+
+
+# android
+if [[ "$*" == *set_android* ]]; then
+    android=android
+    done_something=1
+fi
+
+
+# various administrative actions...
+
+if [[ "$*" == *init_mozilla_unified* ]]; then
+    init_mozilla_unified
+    done_something=1
+fi
+if [[ "$*" == *set_mozilla_unified* ]]; then
+    set_mozilla_unified
+    done_something=1
+fi
+if [[ "$*" == *reset_mozilla_unified* ]]; then
+    reset_mozilla_unified
+    done_something=1
+fi
+if [[ "$*" == *init_tor_browser* ]]; then
+    init_tor_browser
+    done_something=1
+fi
+if [[ "$*" == *set_tor_browser* ]]; then
+    set_tor_browser
+    done_something=1
+fi
+if [[ "$*" == *reset_tor_browser* ]]; then
+    reset_tor_browser
+    done_something=1
+fi
+
+
+
+
+if [[ "$*" == *clean* ]]; then
+    clean
+    done_something=1
+fi
+if [[ "$*" == *all* ]]; then
+    fetch
+    extract
+    do_patches
+    build
+    artifacts_win
+    done_something=1
+fi
+
+
+
+if [[ "$*" == *git_subs* ]]; then
+    git_subs
+    done_something=1
+fi
+if [[ "$*" == *rustup* ]]; then
+    rustup
+    done_something=1
+fi
+if [[ "$*" == *mach_env* ]]; then
+    mach_env
+    done_something=1
+fi
+
+# dependencies on various platforms...
+
+if [[ "$*" == *deps_deb* ]]; then
+    deps_deb
+    done_something=1
+fi
+if [[ "$*" == *deps_rpm* ]]; then
+    deps_rpm
+    done_something=1
+fi
+if [[ "$*" == *deps_pkg* ]]; then
+    deps_pkg
+    done_something=1
+fi
+
+# main building actions...
+
+if [[ "$*" == *fetch* ]]; then
+    fetch
+    done_something=1
+fi
+if [[ "$*" == *extract* ]]; then
+    extract
+    done_something=1
+fi
+if [[ "$*" == *do_patches* ]]; then
+    do_patches
+    done_something=1
+fi
+if [[ "$*" == *git_init* ]]; then
+    git_init
+    done_something=1
+fi
+if [[ "$*" == *build* ]]; then
+    build
+    done_something=1
+fi
+
+# creating the artifacts...
+
+if [[ "$*" == *artifacts_win* ]]; then
+    artifacts_win
+    done_something=1
+fi
+if [[ "$*" == *artifacts_deb* ]]; then
+    artifacts_deb
+    done_something=1
+fi
+if [[ "$*" == *artifacts_rpm* ]]; then
+    artifacts_rpm
+    done_something=1
+fi
+
+# by default, give help..
+if (( done_something == 0 )); then
+    cat << EOF
+Use: ./build.sh clean | all | [other stuff...]
+
+    fetch            - fetch the tarball.
+    extract          - extract the tarball.
+    do_patches       - create a mozconfig, and patch the source.
+    build            - the actual build.
+
+    artifacts_win    - apply .cfg, build the zip file and NSIS setup.exe installer.
+
+# Basic functionality:
+
+    all                - build all (fetch extract do_patches build artifacts_win)
+    clean              - remove generated cruft.
+
+# Linux related functions:
+
+    deps_deb            - install dependencies with apt.
+    deps_rpm            - install dependencies with dnf.
+    deps_pkg            - install dependencies with pkg.  (experimental)
+
+    artifacts_deb       - apply .cfg, create a dist zip file (for debian10).
+    artifacts_rpm       - apply .cfg, create a dist zip file (for fedora33).
+
+# Generic utility functionality:
+
+    mach_env           - create mach build environment.
+    rustup             - perform a rustup for this user.
+    git_subs           - update git submodules.
+    git_init           - create .git folder in firefox-$pkgver for creating patches.
+
+# Cross-compile from linux: (in development)
+
+    linux_patches    - the 'do_patches' for linux->win crosscompile.
+    linux_artifacts  - standard artifact zip file. perhaps a -setup.exe.
+    setup_deb_root   - setup compile environment (root stuff)
+    setup_deb_user   - setup compile environmnet (build user)
+    setup_rpm_root   - setup compile environment (root stuff)
+    setup_rpm_user   - setup compile environmnet (build user)
+
+# Nightly etc.:
+
+    init_mozilla_unified   - use bootstrap.py to grab the latest mozilla-unified.
+    set_mozilla_unified    - use mozilla-unified instead of firefox-87.0 source.
+    reset_mozilla_unified  - clean mozilla-unified and pull latest git changes.
+s   set_android            - attempt andorid build (experimental).
+
+You can use init_tor_browser, set_tor_browser as above, but it attempts a Tor
+Browser build instead (esr releases). (experimental) or use set_strict to get
+a more restricted version (experimental).
+
+# Installation from linux zip file:
+
+Copy the zip file in your $HOME folder, then:
+
+    unzip librewolf-*.zip
+    cd librewolf
+    ./register-librewolf
+
+That should give an app icon. You can unzip it elsewhere and it will work.
+
+# Examples:
+  
+    For windows, use:
+      ./build.sh fetch extract do_patches build artifacts_win
+      ./build.sh all
+
+    For debian, use: 
+      sudo ./build.sh deps_deb 
+      ./build.sh rustup mach_env
+      ./build.sh fetch extract do_patches build artifacts_deb
+
+EOF
+    exit 1
+fi

files/attic/linux_xcompile.sh

@@ -0,0 +1,144 @@
+# Crosscompile on linux (debian,fedora)
+
+
+
+#
+# Creating the crosscompile environment on linux
+#
+
+
+
+setup_deb_root() {
+    echo "setup_deb_root: begin."
+
+    # (implementation...)
+    
+    echo "setup_deb_root: done."
+}
+setup_deb_user() {
+    echo "setup_deb_user: begin."
+
+    # (implementation...)
+    
+    echo "setup_deb_user: done."
+}
+setup_rpm_root() {
+    echo "setup_rpm_root: begin."
+
+    # (implementation...)
+    
+    echo "setup_rpm_root: done."
+}
+setup_rpm_user() {
+    echo "setup_rpm_user: begin."
+
+    # (implementation...)
+    
+    echo "setup_rpm_user: done."
+}
+
+
+
+
+
+
+#
+# linux_patches() and linux_artifacts()
+#
+
+
+
+
+
+
+
+linux_patches() {
+    mozconfig_mode=xcompile
+    do_patches
+}
+
+
+
+linux_artifacts_details() {
+exe=.exe
+objdir=obj-x86_64-pc-mingw32/dist/firefox
+ospkg=win64
+
+# sanity checks
+if [ ! -d $objdir ]; then
+    echo "artifacts_win.sh: directory $objdir not found. did you run './build.sh build'?"
+    exit 1;
+fi
+
+rm -rf ../firefox ../librewolf
+cp -r $objdir ..
+
+pushd ..
+
+mv firefox librewolf
+# apply the LibreWolf settings
+cp -rv settings/* librewolf
+# rename the executable manually
+pushd librewolf ; mv -v firefox$exe librewolf$exe ; popd
+# clean garbage files
+cd librewolf ; rm -rf maintenanceservice* pingsender* firefox.*.xml precomplete removed-files ; cd ..
+
+# windows: copy the windows icon
+cp -v common/source_files/browser/branding/librewolf/firefox.ico librewolf/librewolf.ico
+
+# create the final zip artifact
+rm -f librewolf-$pkgver.en-US.$ospkg.zip
+zip -qr9 librewolf-$pkgver.en-US.$ospkg.zip librewolf
+if [ $? -ne 0 ]; then exit 1; fi
+
+# now to try to make the installer
+rm -f librewolf-$pkgver.en-US.win64-setup.exe tmp.nsi
+sed "s/pkg_version/$pkgver/g" < artifacts_win.nsi > tmp.nsi
+makensis-3.01.exe -V1 tmp.nsi
+if [ $? -ne 0 ]; then exit 1; fi
+
+# patch to permissive config
+if [ ! -z $permissive ]; then
+    pushd librewolf
+    echo "Applying permissive patches..."
+    patch -p1 -i ../patches/permissive/librewolf-config.patch
+    if [ $? -ne 0 ]; then exit 1; fi
+    patch -p1 -i ../patches/permissive/librewolf-policies.patch
+    if [ $? -ne 0 ]; then exit 1; fi
+    popd
+
+    # create the final zip artifact
+    rm -f librewolf-$pkgver.en-US.$ospkg-permissive.zip
+    zip -qr9 librewolf-$pkgver.en-US.$ospkg-permissive.zip librewolf
+    if [ $? -ne 0 ]; then exit 1; fi
+
+    # now to try to make the installer
+    rm -f librewolf-$pkgver.en-US.win64-permissive-setup.exe tmp-permissive.nsi
+    sed "s/win64-setup/win64-permissive-setup/g" < tmp.nsi > tmp-permissive.nsi
+    makensis-3.01.exe -V1 tmp-permissive.nsi
+    if [ $? -ne 0 ]; then exit 1; fi
+fi
+
+popd
+}
+
+
+linux_artifacts() {
+    echo "linux_artifacts: begin."
+
+    if [ ! -d firefox-$pkgver ]; then exit 1; fi
+    cd firefox-$pkgver
+
+    ./mach package
+    if [ $? -ne 0 ]; then exit 1; fi
+    
+    echo ""
+    echo "artifacts_win: Creating final artifacts."
+    echo ""
+    
+    linux_artifacts_details
+
+    cd ..
+    
+    echo "linux_artifacts: done."
+}

files/attic/mozconfigs.sh

@@ -0,0 +1,236 @@
+create_mozconfig_default() {
+    cat >../mozconfig <<END
+ac_add_options --enable-application=browser
+
+# This supposedly speeds up compilation (We test through dogfooding anyway)
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+
+ac_add_options --enable-release
+ac_add_options --enable-hardening
+ac_add_options --enable-rust-simd
+ac_add_options --enable-optimize
+
+
+# Branding
+ac_add_options --enable-update-channel=release
+# theming bugs: ac_add_options --with-app-name=librewolf
+# theming bugs: ac_add_options --with-app-basename=LibreWolf
+ac_add_options --with-branding=browser/branding/librewolf
+ac_add_options --with-distribution-id=io.gitlab.librewolf-community
+ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+#export MOZ_REQUIRE_SIGNING=0
+
+# Features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+
+# Disables crash reporting, telemetry and other data gathering tools
+mk_add_options MOZ_CRASHREPORTER=0
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=0
+
+# first attempt to fix the win32 vcredist issue results in build errors..
+#WIN32_REDIST_DIR=$VCINSTALLDIR\redist\x86\Microsoft.VC141.CRT
+END
+}
+
+create_mozconfig_xcompile() {
+    cat >../mozconfig <<END
+# Crosscompile to windows..
+
+ac_add_options --enable-application=browser
+
+# This supposedly speeds up compilation (We test through dogfooding anyway)
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+
+ac_add_options --enable-release
+ac_add_options --enable-hardening
+ac_add_options --enable-rust-simd
+ac_add_options --enable-optimize
+
+
+# Branding
+ac_add_options --enable-update-channel=release
+# theming bugs: ac_add_options --with-app-name=librewolf
+# theming bugs: ac_add_options --with-app-basename=LibreWolf
+ac_add_options --with-branding=browser/branding/librewolf
+ac_add_options --with-distribution-id=io.gitlab.librewolf-community
+ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+export MOZ_REQUIRE_SIGNING=0
+
+# Features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+
+# Disables crash reporting, telemetry and other data gathering tools
+mk_add_options MOZ_CRASHREPORTER=0
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=0
+
+# first attempt to fix the win32 vcredist issue results in build errors..
+#WIN32_REDIST_DIR=$VCINSTALLDIR\redist\x86\Microsoft.VC141.CRT
+END
+}
+
+create_mozconfig_strict() {
+    cat >../mozconfig <<END
+# Balls to the wall edition..
+ac_add_options --disable-webrtc
+
+
+ac_add_options --enable-application=browser
+
+# This supposedly speeds up compilation (We test through dogfooding anyway)
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+
+ac_add_options --enable-release
+ac_add_options --enable-hardening
+ac_add_options --enable-rust-simd
+ac_add_options --enable-optimize
+
+# Branding
+ac_add_options --enable-update-channel=release
+# theming bugs: ac_add_options --with-app-name=librewolf
+# theming bugs: ac_add_options --with-app-basename=LibreWolf
+ac_add_options --with-branding=browser/branding/librewolf
+ac_add_options --with-distribution-id=io.gitlab.librewolf-community
+ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+export MOZ_REQUIRE_SIGNING=0
+
+# Features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+
+# Disables crash reporting, telemetry and other data gathering tools
+mk_add_options MOZ_CRASHREPORTER=0
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=0
+
+# first attempt to fix the win32 vcredist issue results in build errors..
+#WIN32_REDIST_DIR=$VCINSTALLDIR\redist\x86\Microsoft.VC141.CRT
+END
+}
+
+
+
+
+
+
+
+
+create_mozconfig_android() {
+    cat >../mozconfig <<END
+# Original file is from:
+# https://raw.githubusercontent.com/Divested-Mobile/Mull/master/MOZCONFIG
+#
+# Reference
+# https://gitweb.torproject.org/user/sysrqb/tor-browser.git/tree/.mozconfig-android
+# https://gitlab.com/fdroid/fdroiddata/blob/master/metadata/org.mozilla.fennec_fdroid.txt
+
+
+
+# Build for Android
+ac_add_options --with-android-min-sdk=16
+ac_add_options --enable-application=mobile/android
+ac_add_options --target=arm-linux-androideabi
+#ac_add_options --target=aarch64-linux-android
+#ac_add_options --target=x86_64-linux-android
+
+
+
+
+# Specify paths
+ac_add_options --with-android-sdk="/home/emy/.mozbuild/android-sdk-linux"
+ac_add_options --with-android-ndk="/home/emy/.mozbuild/android-ndk-r17b"
+CC="/home/emy/.mozbuild/clang/bin/clang"
+CXX="/home/emy/.mozbuild/clang/bin/clang++"
+
+
+
+
+# Set branding
+#ac_add_options --with-branding=mobile/android/branding/divestos
+
+
+# Build tweaks
+ac_add_options --disable-tests
+
+
+# Disable malware
+#ac_add_options --disable-eme
+ac_add_options --without-google-play-services
+
+# Disable unneeded extras
+ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
+
+
+# Hardening
+ac_add_options --enable-hardening
+
+# Optimize
+ac_add_options --disable-debug
+ac_add_options --disable-profiling
+ac_add_options --disable-rust-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-release
+ac_add_options --enable-strip
+ac_add_options --enable-rust-simd
+
+export BUILDING_RELEASE=1
+export MOZ_DEBUG=
+export NIGHTLY_BUILD=
+
+
+#The following options are the only way to fully disable debugging
+export MOZILLA_OFFICIAL=1
+
+
+
+
+
+
+#### ORIGINAL MOZCONFIG #####
+#ac_add_options --enable-application=browser
+
+# This supposedly speeds up compilation (We test through dogfooding anyway)
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+
+ac_add_options --enable-release
+ac_add_options --enable-hardening
+ac_add_options --enable-rust-simd
+ac_add_options --enable-optimize
+
+
+# Branding
+ac_add_options --enable-update-channel=release
+# theming bugs: ac_add_options --with-app-name=librewolf
+# theming bugs: ac_add_options --with-app-basename=LibreWolf
+ac_add_options --with-branding=browser/branding/librewolf
+ac_add_options --with-distribution-id=io.gitlab.librewolf-community
+ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+export MOZ_REQUIRE_SIGNING=0
+
+# Features
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+
+# Disables crash reporting, telemetry and other data gathering tools
+mk_add_options MOZ_CRASHREPORTER=0
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=0
+
+END
+}

files/attic/upload-distfiles.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+pkgver=88.0.1
+private_token=$1
+if [ -z $private_token ]; then
+    echo "Please specify the Gitlab PRIVATE TOKEN on the commandline."
+    exit 1
+fi
+
+echo ""
+echo ""
+
+curl --request POST --header "PRIVATE-TOKEN: ${private_token}" --form "file=@librewolf-${pkgver}.en-US.win64-setup.exe" "https://gitlab.com/api/v4/projects/13852981/uploads"
+echo ""
+echo ""
+
+curl --request POST --header "PRIVATE-TOKEN: ${private_token}" --form "file=@librewolf-${pkgver}.en-US.win64.zip" "https://gitlab.com/api/v4/projects/13852981/uploads"
+echo ""
+echo ""
+
+curl --request POST --header "PRIVATE-TOKEN: ${private_token}" --form "file=@librewolf-${pkgver}.en-US.win64-permissive-nightly-setup.exe" "https://gitlab.com/api/v4/projects/13852981/uploads"
+echo ""
+echo ""
+

files/attic/version.sh

@@ -0,0 +1 @@
+pkgver=89.0

files/configure.sh

@@ -0,0 +1,16 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOZ_APP_NAME=librewolf
+MOZ_APP_BASENAME=LibreWolf
+MOZ_APP_PROFILE=LibreWolf
+MOZ_APP_VENDOR="LibreWolf Community"
+MOZ_APP_DISPLAYNAME=LibreWolf
+MOZ_APP_REMOTINGNAME=librewolf
+MOZ_DEV_EDITION=1
+MOZ_TELEMETRY_REPORTING=
+MOZ_SERVICES_HEALTHREPORT=
+MOZ_NORMANDY=
+MOZ_REQUIRE_SIGNING=
+MOZ_DEFAULT_BROWSER_AGENT=0

files/register-librewolf

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+sed "s,MYDIR,$(pwd),g" < start-librewolf.desktop.in > start-librewolf.desktop
+
+mkdir -p "$HOME/.local/share/applications/"
+cp -v ./start-librewolf.desktop "$HOME/.local/share/applications/"
+update-desktop-database "$HOME/.local/share/applications/"

files/start-librewolf

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Do not (try to) connect to the session manager
+unset SESSION_MANAGER
+
+# If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority
+# before we change HOME below.  (See xauth(1) and #1945.)  XDM and KDM rely
+# on applications using this default value.
+if [ -z "$XAUTHORITY" ]; then
+    XAUTHORITY=~/.Xauthority
+    export XAUTHORITY
+fi
+
+# Try to be agnostic to where we're being started from, chdir to where
+# the script is.
+mydir="`dirname "$0"`"
+test -d "$mydir" && cd "$mydir"
+
+#./librewolf --class "LibreWolf" -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null &
+./librewolf --detach --class "LibreWolf" > /dev/null 2>&1 </dev/null &
+
+exit $?

files/start-librewolf.desktop.in

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=LibreWolf
+GenericName=Web Browser
+Comment=LibreWolf Browser
+Categories=Network;WebBrowser;Security;
+Exec=MYDIR/./start-librewolf
+X-TorBrowser-ExecShell=MYDIR/./start-librewolf
+Icon=MYDIR/./browser/chrome/icons/default/default64.png
+StartupWMClass=LibreWolf

patches/browser-confvars.patch

@@ -0,0 +1,29 @@
+diff --git a/browser/confvars.sh b/browser/confvars.sh
+index 92871c9516..1e151180dd 100644
+--- a/browser/confvars.sh
++++ b/browser/confvars.sh
+@@ -3,8 +3,11 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-MOZ_APP_VENDOR=Mozilla
+-MOZ_UPDATER=1
++MOZ_APP_BASENAME=LibreWolf
++MOZ_APP_NAME=librewolf
++MOZ_APP_VENDOR="LibreWolf Community"
++
++MOZ_UPDATER=0
+ 
+ if test "$OS_ARCH" = "WINNT"; then
+   if ! test "$HAVE_64BIT_BUILD"; then
+@@ -34,8 +36,8 @@ BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
+ # For mozilla-beta, mozilla-release, or mozilla-central repositories, use
+ # "unofficial" branding.
+ # For the mozilla-aurora repository, use "aurora".
+-MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
+-MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
++MOZ_BRANDING_DIRECTORY=browser/branding/librewolf
++MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/librewolf
+ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+ 
+ MOZ_PROFILE_MIGRATOR=1

patches/mozilla-vpn-ad-proton.patch

@@ -0,0 +1,17 @@
+diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
+--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
++++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
+@@ -54,13 +54,10 @@
+       <div class="info">
+         <h1 id="info-title" data-l10n-id="about-private-browsing-info-title"></h1>
+         <p id="info-body" data-l10n-id="about-private-browsing-info-description"></p>
+-        <a id="private-browsing-myths" data-l10n-id="about-private-browsing-info-myths"></a>
+       </div>
+     </div>
+ 
+     <div class="promo">
+-      <p id="private-browsing-vpn-text" class="vpn-promo" data-l10n-id="about-private-browsing-need-more-privacy"></p>
+-      <a id="private-browsing-vpn-link" class="vpn-promo" data-l10n-id="about-private-browsing-turn-on-vpn"></a>
+     </div>
+   </body>
+ </html>

patches/package-manifest.patch

@@ -0,0 +1,14 @@
+diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+index 2bdafc86b3..789bece8e6 100644
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -302,6 +302,9 @@
+ ; Technically this is an app pref file, but we are keeping it in the original
+ ; gre location for now.
+ @RESPATH@/defaults/pref/channel-prefs.js
++@RESPATH@/defaults/pref/local-settings.js
++@RESPATH@/distribution/policies.json
++@RESPATH@/librewolf.cfg
+ 
+ ; Background tasks-specific preferences.  These are in the GRE
+ ; location since they apply to all tasks at this time.

patches/remove_addons-91.0a1-nightly.patch

@@ -0,0 +1,70 @@
+diff -r 2689403bd0d2 browser/extensions/moz.build
+--- a/browser/extensions/moz.build	Mon Jun 28 12:08:51 2021 +0000
++++ b/browser/extensions/moz.build	Mon Jun 28 14:29:05 2021 +0200
+@@ -5,11 +5,8 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ DIRS += [
+-    "doh-rollout",
+     "formautofill",
+     "screenshots",
+-    "webcompat",
+-    "report-site-issue",
+     "pictureinpicture",
+ ]
+ 
+diff -r 2689403bd0d2 browser/locales/Makefile.in
+--- a/browser/locales/Makefile.in	Mon Jun 28 12:08:51 2021 +0000
++++ b/browser/locales/Makefile.in	Mon Jun 28 14:29:05 2021 +0200
+@@ -61,7 +61,6 @@
+ ifneq (,$(wildcard ../extensions/formautofill/locales))
+ 	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
+ endif
+-	@$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
+ 	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
+ 	@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
+ 	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
+@@ -82,7 +81,6 @@
+ 	@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
+ 	@$(MAKE) chrome AB_CD=$*
+ 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
+-	@$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
+ 
+ package-win32-installer: $(SUBMAKEFILES)
+ 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
+diff -r 2689403bd0d2 browser/locales/filter.py
+--- a/browser/locales/filter.py	Mon Jun 28 12:08:51 2021 +0000
++++ b/browser/locales/filter.py	Mon Jun 28 14:29:05 2021 +0200
+@@ -19,7 +19,6 @@
+         "devtools/startup",
+         "browser",
+         "browser/extensions/formautofill",
+-        "browser/extensions/report-site-issue",
+         "extensions/spellcheck",
+         "other-licenses/branding/firefox",
+         "browser/branding/official",
+diff -r 2689403bd0d2 browser/locales/l10n.ini
+--- a/browser/locales/l10n.ini	Mon Jun 28 12:08:51 2021 +0000
++++ b/browser/locales/l10n.ini	Mon Jun 28 14:29:05 2021 +0200
+@@ -13,7 +13,6 @@
+      devtools/client
+      devtools/startup
+      browser/extensions/formautofill
+-     browser/extensions/report-site-issue
+ 
+ [includes]
+ # non-central apps might want to use %(topsrcdir)s here, or other vars
+diff -r 2689403bd0d2 browser/locales/l10n.toml
+--- a/browser/locales/l10n.toml	Mon Jun 28 12:08:51 2021 +0000
++++ b/browser/locales/l10n.toml	Mon Jun 28 14:29:05 2021 +0200
+@@ -132,10 +132,6 @@
+     l10n = "{l}browser/extensions/formautofill/**"
+ 
+ [[paths]]
+-    reference = "browser/extensions/report-site-issue/locales/en-US/**"
+-    l10n = "{l}browser/extensions/report-site-issue/**"
+-
+-[[paths]]
+     reference = "services/sync/locales/en-US/**"
+     l10n = "{l}services/sync/**"
+ 

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

patches/urlbarprovider-interventions.patch

@@ -0,0 +1,13 @@
+diff --git a/browser/components/urlbar/UrlbarProviderInterventions.jsm b/browser/components/urlbar/UrlbarProviderInterventions.jsm
+index e22886ce92..d46d8191f2 100644
+--- a/browser/components/urlbar/UrlbarProviderInterventions.jsm
++++ b/browser/components/urlbar/UrlbarProviderInterventions.jsm
+@@ -451,7 +451,7 @@ class ProviderInterventions extends UrlbarProvider {
+         ]),
+       });
+       for (let [id, phrases] of Object.entries(DOCUMENTS)) {
+-        queryScorer.addDocument({ id, phrases });
++//        queryScorer.addDocument({ id, phrases });
+       }
+       return queryScorer;
+     });

patches/vpn-patch-91.0a1-nightly.patch

@@ -0,0 +1,18 @@
+diff -r 536a892dd51f browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
+--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html	Tue Jun 22 16:56:13 2021 +0000
++++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html	Wed Jun 23 07:09:38 2021 +0200
+@@ -58,6 +58,7 @@
+       </div>
+     </div>
+ 
++    <!--
+     <div class="promo">
+       <div class="promo-image-large">
+         <img src="" alt="" />
+@@ -73,5 +74,6 @@
+         </div>
+       </div>
+     </div>
++    -->
+   </body>
+ </html>

settings

@@ -0,0 +1 @@
+Subproject commit 608659d0ed9988da0794cab0af1f65a44b6cb625

setup.nsi

@@ -0,0 +1,124 @@
+#
+# Change these values to fit your application...
+#
+
+!define APPNAME "LibreWolf"        # Full app name, like: "Gtk+ 2.0 Hello World"
+!define PROGNAME "librewolf"       # executable name, like: gtk2hello
+!define PROG_VERSION "pkg_version" # the program version, like: 0.3.0
+!define ICON_NAME "librewolf.ico"  # filename of icon to use for this app
+!define COMPANYNAME "LibreWolf"    # Your name, or company (or just the program name)
+!define ESTIMATED_SIZE 190000      # Estimated size (in KB) of installed program for use in "add or remove programs" / 190 MB
+
+#
+# The actual installer/uninstaller, you should not need to change much here below
+#
+
+Name "${PROGNAME}"
+OutFile "${PROGNAME}-${PROG_VERSION}.en-US.win64-setup.exe"
+InstallDir $PROGRAMFILES64\${APPNAME}
+RequestExecutionLevel admin
+
+Page directory
+Page instfiles
+
+function .onInit
+	setShellVarContext all
+functionEnd
+ 
+Section "${PROGNAME}"
+
+	# Copy files
+	SetOutPath $INSTDIR
+	File /r librewolf\*.*
+
+	# Start Menu
+	createDirectory "$SMPROGRAMS\${COMPANYNAME}"
+	createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\${PROGNAME}.exe" "" "$INSTDIR\${ICON_NAME}"
+	createShortCut "$SMPROGRAMS\${COMPANYNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" ""
+
+	# Uninstaller 
+	writeUninstaller "$INSTDIR\uninstall.exe"
+
+	# Registry information for add/remove programs
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" "${APPNAME}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayIcon" "$\"$INSTDIR\${ICON_NAME}$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "Publisher" "${COMPANYNAME}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayVersion" "${PROG_VERSION}"
+	# There is no option for modifying or repairing the install
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "NoModify" 1
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "NoRepair" 1
+	# Set the INSTALLSIZE constant (!defined at the top of this script) so Add/Remove Programs can accurately report the size
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "EstimatedSize" ${ESTIMATED_SIZE}
+
+
+	#
+	# Registry information to let Windows pick us up in the list of available browsers
+	#
+	
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf" "" "LibreWolf"	
+
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities" "ApplicationDescription" "LibreWolf"
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities" "ApplicationIcon" "$INSTDIR\librewolf.exe,0"
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities" "ApplicationName" "LibreWolf"
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\FileAssociations" ".htm" "LibreWolfHTM"
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\FileAssociations" ".html" "LibreWolfHTM"
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\Startmenu" "StartMenuInternet" "LibreWolf"
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\URLAssociations" "http" "LibreWolfHTM"
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\Capabilities\URLAssociations" "https" "LibreWolfHTM"
+
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\DefaultIcon" "" "$INSTDIR\librewolf.exe,0"
+	WriteRegStr HKLM "Software\Clients\StartMenuInternet\LibreWolf\shell\open\command" "" "$INSTDIR\librewolf.exe"
+	
+	WriteRegStr HKLM "Software\RegisteredApplications" "LibreWolf" "Software\Clients\StartMenuInternet\LibreWolf\Capabilities"
+	
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM" "" "LibreWolf Handler"
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM" "AppUserModelId" "LibreWolf"
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "AppUserModelId" "LibreWolf"
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationIcon" "$INSTDIR\librewolf.exe,0"
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationName" "LibreWolf"
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationDescription" "Howling to Freedom"
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationCompany" "LibreWolf"
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\DefaultIcon" "" "$INSTDIR\librewolf.exe,0"
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\shell\open\command" "" "$INSTDIR\librewolf.exe %1"
+
+SectionEnd
+
+# Before uninstall, ask for confirmation
+function un.onInit
+	SetShellVarContext all
+ 
+	# Verify the uninstaller - last chance to back out
+	# (commented this out, it causes problems with Chocolatey.)
+	# MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" IDOK next
+	# 	Abort
+	# next:
+	
+functionEnd
+
+# Uninstaller
+section "uninstall"
+
+	# Remove Start Menu launcher
+	delete "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk"
+	delete "$SMPROGRAMS\${COMPANYNAME}\Uninstall.lnk"
+	# Try to remove the Start Menu folder - this will only happen if it is empty
+	rmDir "$SMPROGRAMS\${COMPANYNAME}"
+ 
+	# Remove files
+	rmDir /r $INSTDIR
+
+	# Remove uninstaller information from the registry
+	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}"
+	
+	#
+	# Windows default browser integration
+	#
+	
+	DeleteRegKey HKLM "Software\Clients\StartMenuInternet\LibreWolf"
+	DeleteRegKey HKLM "Software\RegisteredApplications"
+	DeleteRegKey HKLM "Software\Classes\LibreWolfHTM"
+
+sectionEnd