Merge branch 'master' of gitlab.com:librewolf-community/browser/windows

Makefile

@@ -24,9 +24,9 @@ clean :
 	rm -rf work
 
 veryclean : clean
-	rm -f librewolf-$(shell cat version)*.en-US.win64* sha256sums.txt upload.txt firefox-$(shell cat version)*.en-US.win64.zip
+	rm -f librewolf-$(shell cat version)*.en-US.win64* sha256sums.txt upload.txt firefox-$(shell cat version)*.en-US.win64.zip 
 	rm -rf librewolf-$(shell cat version)-$(shell cat source_release)
-	rm -f librewolf-$(shell cat version)-*.source.tar.gz
+	rm -f librewolf-$(shell cat version)-*.source.tar.gz*
 
 fetch : 
 	python3 mk.py fetch

README.md

@@ -3,9 +3,10 @@
 * **[download latest release](https://gitlab.com/librewolf-community/browser/windows/-/releases)**
 * Visit [the FAQ](https://librewolf.net/docs/faq/).
 * Install via _[chocolatey](https://community.chocolatey.org/packages/librewolf)_: `choco install librewolf`
+* or install via _[scoop](https://scoop.sh)_: `scoop bucket add extras`, then `scoop install librewolf`
 * or install via _winget_: `winget install librewolf`
-* **If your LibreWolf crashes on startup**, you probably miss the right [Visual C++ Runtime](https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0). You want the _Visual Studio 2015, 2017 and 2019_ version for **x64**, which would be **[this file](https://aka.ms/vs/16/release/vc_redist.x64.exe)**.
-* The latest type **.zip files** are _'portable zip files'_ that allows for a user profile in the extracted zip file folders. It is _self-contained_ and runs on an usb stick.
+* **If your LibreWolf crashes on startup**, you're probably missing the right [Visual C++ Runtime](https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0). You'll want the _Visual Studio 2015, 2017 and 2019_ version for **x64**, which would be **[this file](https://aka.ms/vs/16/release/vc_redist.x64.exe)**.
+* The latest type of **.zip files** allows for a user profile inside the extracted folder. It is _self-contained_ and runs on removable storage.
 
 # Where to submit tickets
 

assets/mozconfig.windows32

@@ -0,0 +1,11 @@
+################
+# build 32-bit version..
+#ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --target=i686-pc-mingw32
+#ac_add_options --enable-bootstrap
+ac_add_options --without-wasm-sandboxed-libraries
+
+# currently fails on <stdatomic.h> when building..
+#def deps_win32():
+#    exec('rustup target add i686-pc-windows-msvc')
+#

assets/setup.nsi

@@ -120,7 +120,7 @@ Section
 	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationDescription" "Start the LibreWolf Browser"
 	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\Application" "ApplicationCompany" "LibreWolf Community"
 	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\DefaultIcon" "" "$INSTDIR\librewolf.exe,0"
-	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\shell\open\command" "" "$INSTDIR\librewolf.exe %1"
+	WriteRegStr HKLM "Software\Classes\LibreWolfHTM\shell\open\command" "" "$\"$INSTDIR\librewolf.exe$\" -osint -url $\"%1$\""
 
 SectionEnd
 

mk.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+ #!/usr/bin/env python3
 
 import os,sys,subprocess,os.path
 
@@ -10,17 +10,23 @@ from tools import exec, patch
 #
 
 
+def deps_win32():
+    exec('rustup target add i686-pc-windows-msvc')
+
+
 def fetch():
-    
     exec('wget -q -O version https://gitlab.com/librewolf-community/browser/source/-/raw/main/version')
     exec('wget -q -O source_release https://gitlab.com/librewolf-community/browser/source/-/raw/main/release')
+    exec('wget -q -O librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum?job=Build')
     exec('wget -O librewolf-$(cat version)-$(cat source_release).source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$(cat version)-$(cat source_release).source.tar.gz?job=Build')
+    exec('sha256sum -c librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum')
+    exec('cat librewolf-$(cat version)-$(cat source_release).source.tar.gz.sha256sum')
 
 
     
 def build(debug=False):
     
-    exec('rm -rf librewolf-$(cat version)')
+    exec('rm -rf librewolf-$(cat version)-$(cat source_release)')
     exec('tar xf librewolf-$(cat version)-$(cat source_release).source.tar.gz')
     
     with open('version','r') as file:

version

@@ -1 +1 @@
-97.0.2
+98.0.2