From 7d208db7c4c1b162099e4c80898b53ce4f82dfca Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 30 Jul 2022 20:35:21 +0200
Subject: [PATCH] Sat 30 Jul 2022 08:35:21 PM CEST

---
 assets/mozconfig.windows |  2 +-
 assets/tools.py          |  2 +-
 mk.py                    | 12 +++++++-----
 source_release           |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/assets/mozconfig.windows b/assets/mozconfig.windows
index eee2ec1..f16ecc9 100644
--- a/assets/mozconfig.windows
+++ b/assets/mozconfig.windows
@@ -40,4 +40,4 @@ ac_add_options --enable-strip
 #ac_add_options --disable-verify-mar
 
 # Internationalization
-ac_add_options --with-l10n-base=$PWD/browser/locales/l10n
+ac_add_options --with-l10n-base=c:/mozilla-source/librewolf/windows/librewolf-103.0-3/browser/locales/l10n
diff --git a/assets/tools.py b/assets/tools.py
index 9b6c84a..1d8961d 100644
--- a/assets/tools.py
+++ b/assets/tools.py
@@ -1,6 +1,6 @@
 import os,sys,subprocess,os.path
 
-bash_loc = 'c:/mozilla-build/msys/bin/bash.exe'
+bash_loc = 'c:/mozilla-build/msys2/usr/bin/bash.exe'
 do_zip = False
 
 # native()/bash()/exec() utility functions
diff --git a/mk.py b/mk.py
index 572de75..8049aa4 100644
--- a/mk.py
+++ b/mk.py
@@ -97,9 +97,10 @@ def build(debug=False):
 
             # patches for windows only
             patch('../assets/package-manifest.patch')
-            #patch('../assets/disable-verify-mar.patch')
             patch('../assets/tryfix-reslink-fail.patch')
-            patch('../assets/fix-l10n-package-cmd.patch')
+            
+            # patch('../assets/disable-verify-mar.patch')
+            # patch('../assets/fix-l10n-package-cmd.patch')
             
             # perform the build and package.
             exec('./mach build')
@@ -164,13 +165,14 @@ def artifacts():
             # With that out of the way, we need to create the main nsis setup.
             os.chdir('work')
             exec("mkdir x86-ansi")
-            exec("wget -q -O ./x86-ansi/nsProcess.dll https://shorsh.de/upload/we7v/nsProcess.dll")
+            #exec("wget -q -O ./x86-ansi/nsProcess.dll https://shorsh.de/upload/we7v/nsProcess.dll") # suspect?
+            exec("( cd x86-ansi ; unzip ../../assets/nsProcess.zip )")
             exec("wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe")
             setupname = 'librewolf-{}.en-US.win64-setup.exe'.format(full_version)
             exec('sed \"s/pkg_version/{}/g\" < ../assets/setup.nsi > tmp.nsi'.format(full_version))
             exec('cp -v ../assets/librewolf.ico .')
             exec('cp -v ../assets/banner.bmp .')
-            exec('makensis-3.01.exe -V1 tmp.nsi')
+            exec('~/.mozbuild/nsis/makensis.exe -V1 tmp.nsi')
             exec('rm -rf tmp.nsi librewolf.ico banner.bmp x86-ansi')
             exec("mv {} ..".format(setupname))
             os.chdir('..')
@@ -183,7 +185,7 @@ def artifacts():
             os.makedirs('librewolf-{}/LibreWolf'.format(version), exist_ok=True)
             exec('cp -r librewolf/* librewolf-{}/LibreWolf'.format(version))
             # on gitlab: https://gitlab.com/ltGuillaume
-            exec('git clone https://github.com/ltGuillaume/LibreWolf-Portable')
+            exec('"/c/Program Files/Git/bin/git.exe" clone https://github.com/ltGuillaume/LibreWolf-Portable')
             exec('cp -v LibreWolf-Portable/LibreWolf-Portable.* LibreWolf-Portable/*.exe librewolf-{}/'.format(version))
             os.chdir('librewolf-{}'.format(version))
             # installed from: https://www.autohotkey.com/
diff --git a/source_release b/source_release
index 0cfbf08..00750ed 100644
--- a/source_release
+++ b/source_release
@@ -1 +1 @@
-2
+3