From fc4f1e1424696879915c6dfa3e6b0a29d1e97ce2 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 9 Mar 2022 17:00:38 +0100 Subject: [PATCH 1/9] Release v98.0 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 9d1377b..c6f2a5d 100644 --- a/version +++ b/version @@ -1 +1 @@ -97.0.2 \ No newline at end of file +98.0 \ No newline at end of file From 084116c930a99b5dd3dabab30ab168ae513bfad5 Mon Sep 17 00:00:00 2001 From: Brian <5100126-brian6932@users.noreply.gitlab.com> Date: Fri, 11 Mar 2022 11:48:50 +0000 Subject: [PATCH 2/9] Fixed shell command launcher --- assets/setup.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/setup.nsi b/assets/setup.nsi index 6592eba..ab701fa 100644 --- a/assets/setup.nsi +++ b/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 From c92bc88455513fc6db784c1e285768a37a863824 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Mon, 7 Mar 2022 17:23:56 +0000 Subject: [PATCH 3/9] Add Scoop to the installation methods (was also added on librewolf.net) Simplified description for portable --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f873c81..30e8ea2 100644 --- a/README.md +++ b/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 From 7386b46dc45c15d1d620a3ed74cc6c0dc0569e24 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 19 Mar 2022 22:34:39 +0100 Subject: [PATCH 4/9] todo --- assets/todo.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 assets/todo.md diff --git a/assets/todo.md b/assets/todo.md new file mode 100644 index 0000000..7457a4e --- /dev/null +++ b/assets/todo.md @@ -0,0 +1,7 @@ +Things to do +============ + +* preferences pane: toggle for OSCP hard-fail vs. soft-fail +* auto-update +* theming and theming bug +* new icon From 0a68621cd07689c9d859fd8bfae1301afd7bc4e6 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 19 Mar 2022 23:34:07 +0100 Subject: [PATCH 5/9] rm todo.md --- assets/todo.md | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 assets/todo.md diff --git a/assets/todo.md b/assets/todo.md deleted file mode 100644 index 7457a4e..0000000 --- a/assets/todo.md +++ /dev/null @@ -1,7 +0,0 @@ -Things to do -============ - -* preferences pane: toggle for OSCP hard-fail vs. soft-fail -* auto-update -* theming and theming bug -* new icon From 7f3990f182e624351acccb687f0d01455d063190 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 23 Mar 2022 10:17:29 +0100 Subject: [PATCH 6/9] moved old portable exe out of the way --- .../librewolf-portable}/.gitignore | 0 .../librewolf-portable}/README.md | 0 .../librewolf-portable}/Resource.h | 0 .../librewolf-portable}/build.bat | 0 .../librewolf-portable}/librewolf-portable.aps | Bin .../librewolf-portable}/librewolf-portable.cpp | 0 .../librewolf-portable}/librewolf-portable.ico | Bin .../librewolf-portable}/librewolf-portable.rc | Bin .../librewolf-portable}/librewolf-portable.sln | 0 .../librewolf-portable}/librewolf-portable.vcxproj | 0 .../librewolf-portable.vcxproj.filters | 0 .../librewolf-portable.vcxproj.user | 0 .../librewolf-portable}/targetver.h | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename {librewolf-portable => assets/librewolf-portable}/.gitignore (100%) rename {librewolf-portable => assets/librewolf-portable}/README.md (100%) rename {librewolf-portable => assets/librewolf-portable}/Resource.h (100%) rename {librewolf-portable => assets/librewolf-portable}/build.bat (100%) rename {librewolf-portable => assets/librewolf-portable}/librewolf-portable.aps (100%) rename {librewolf-portable => assets/librewolf-portable}/librewolf-portable.cpp (100%) rename {librewolf-portable => assets/librewolf-portable}/librewolf-portable.ico (100%) rename {librewolf-portable => assets/librewolf-portable}/librewolf-portable.rc (100%) rename {librewolf-portable => assets/librewolf-portable}/librewolf-portable.sln (100%) rename {librewolf-portable => assets/librewolf-portable}/librewolf-portable.vcxproj (100%) rename {librewolf-portable => assets/librewolf-portable}/librewolf-portable.vcxproj.filters (100%) rename {librewolf-portable => assets/librewolf-portable}/librewolf-portable.vcxproj.user (100%) rename {librewolf-portable => assets/librewolf-portable}/targetver.h (100%) diff --git a/librewolf-portable/.gitignore b/assets/librewolf-portable/.gitignore similarity index 100% rename from librewolf-portable/.gitignore rename to assets/librewolf-portable/.gitignore diff --git a/librewolf-portable/README.md b/assets/librewolf-portable/README.md similarity index 100% rename from librewolf-portable/README.md rename to assets/librewolf-portable/README.md diff --git a/librewolf-portable/Resource.h b/assets/librewolf-portable/Resource.h similarity index 100% rename from librewolf-portable/Resource.h rename to assets/librewolf-portable/Resource.h diff --git a/librewolf-portable/build.bat b/assets/librewolf-portable/build.bat similarity index 100% rename from librewolf-portable/build.bat rename to assets/librewolf-portable/build.bat diff --git a/librewolf-portable/librewolf-portable.aps b/assets/librewolf-portable/librewolf-portable.aps similarity index 100% rename from librewolf-portable/librewolf-portable.aps rename to assets/librewolf-portable/librewolf-portable.aps diff --git a/librewolf-portable/librewolf-portable.cpp b/assets/librewolf-portable/librewolf-portable.cpp similarity index 100% rename from librewolf-portable/librewolf-portable.cpp rename to assets/librewolf-portable/librewolf-portable.cpp diff --git a/librewolf-portable/librewolf-portable.ico b/assets/librewolf-portable/librewolf-portable.ico similarity index 100% rename from librewolf-portable/librewolf-portable.ico rename to assets/librewolf-portable/librewolf-portable.ico diff --git a/librewolf-portable/librewolf-portable.rc b/assets/librewolf-portable/librewolf-portable.rc similarity index 100% rename from librewolf-portable/librewolf-portable.rc rename to assets/librewolf-portable/librewolf-portable.rc diff --git a/librewolf-portable/librewolf-portable.sln b/assets/librewolf-portable/librewolf-portable.sln similarity index 100% rename from librewolf-portable/librewolf-portable.sln rename to assets/librewolf-portable/librewolf-portable.sln diff --git a/librewolf-portable/librewolf-portable.vcxproj b/assets/librewolf-portable/librewolf-portable.vcxproj similarity index 100% rename from librewolf-portable/librewolf-portable.vcxproj rename to assets/librewolf-portable/librewolf-portable.vcxproj diff --git a/librewolf-portable/librewolf-portable.vcxproj.filters b/assets/librewolf-portable/librewolf-portable.vcxproj.filters similarity index 100% rename from librewolf-portable/librewolf-portable.vcxproj.filters rename to assets/librewolf-portable/librewolf-portable.vcxproj.filters diff --git a/librewolf-portable/librewolf-portable.vcxproj.user b/assets/librewolf-portable/librewolf-portable.vcxproj.user similarity index 100% rename from librewolf-portable/librewolf-portable.vcxproj.user rename to assets/librewolf-portable/librewolf-portable.vcxproj.user diff --git a/librewolf-portable/targetver.h b/assets/librewolf-portable/targetver.h similarity index 100% rename from librewolf-portable/targetver.h rename to assets/librewolf-portable/targetver.h From 07973526bd7976a0bfe4ae7ae00ed5356ce15cc2 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 24 Mar 2022 14:21:34 +0100 Subject: [PATCH 7/9] bugfixes --- Makefile | 4 ++-- assets/mozconfig.windows32 | 11 +++++++++++ mk.py | 9 ++++++--- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 assets/mozconfig.windows32 diff --git a/Makefile b/Makefile index 82e8f4b..2ad5c5f 100644 --- a/Makefile +++ b/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 diff --git a/assets/mozconfig.windows32 b/assets/mozconfig.windows32 new file mode 100644 index 0000000..c65a3c8 --- /dev/null +++ b/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 when building.. +#def deps_win32(): +# exec('rustup target add i686-pc-windows-msvc') +# \ No newline at end of file diff --git a/mk.py b/mk.py index 2360fbe..3f889f7 100644 --- a/mk.py +++ b/mk.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 + #!/usr/bin/env python3 import os,sys,subprocess,os.path @@ -56,8 +56,11 @@ def patch(patchfile): # +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 -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') @@ -66,7 +69,7 @@ def fetch(): 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: From e23bc0cf207a2081bf2ec35ea863f47171544904 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 24 Mar 2022 21:46:46 +0100 Subject: [PATCH 8/9] v98.0.2 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index c6f2a5d..5b3cfb1 100644 --- a/version +++ b/version @@ -1 +1 @@ -98.0 \ No newline at end of file +98.0.2 \ No newline at end of file From 216fb36503e1c21479c52e98940e4a4cacc1752e Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 26 Mar 2022 12:59:58 +0100 Subject: [PATCH 9/9] now checking checksum --- mk.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mk.py b/mk.py index 3f889f7..cb3b371 100644 --- a/mk.py +++ b/mk.py @@ -63,7 +63,10 @@ def deps_win32(): 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')