From 0bb1c40bdfeb426ec6e8f816f91467a395c5ad53 Mon Sep 17 00:00:00 2001 From: stanzabird Date: Sat, 1 Oct 2022 12:51:11 +0000 Subject: [PATCH 01/13] fix unclear plugin distinction --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c735f08..10eb75c 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,13 @@ # Update plugins There are plugins that help update librewolf, which helps improve securitiy. -* Guillaume created a windows updater script for the Task Scheduler. it can be found [here](https://github.com/ltGuillaume/LibreWolf-WinUpdater). -* Defkev created a LibreWolf updater plugin, which can be found [here](https://addons.mozilla.org/en-US/firefox/addon/librewolf-updater/). + + +* Guillaume created a windows *updater script* for the Task Scheduler. it can be found [here](https://github.com/ltGuillaume/LibreWolf-WinUpdater). +* Defkev created a LibreWolf *updater plugin*, which can be found [here](https://addons.mozilla.org/en-US/firefox/addon/librewolf-updater/). + +Please note the distinction between the *task scheduler updater script* ([LibreWolf-WinUpdater](https://github.com/ltGuillaume/LibreWolf-WinUpdater)) and the *librewolf extension* ([LibreWolf Updater](https://addons.mozilla.org/en-US/firefox/addon/librewolf-updater/)), in that the latter only checks for updates, but will not install them automatically, while the former does. There's quite a bit of confusion about that on Reddit, GitHub and Gitlab. + # LibreWolf for windows From 1b6356174886e3f8545dddff4882d2c5603feec5 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 1 Oct 2022 15:17:38 +0200 Subject: [PATCH 02/13] clean up linux*/assets/mozconifg --- linux-mar/assets/mozconfig | 3 ++- linux/assets/mozconfig | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/linux-mar/assets/mozconfig b/linux-mar/assets/mozconfig index 9dfcac1..b9e5a4e 100644 --- a/linux-mar/assets/mozconfig +++ b/linux-mar/assets/mozconfig @@ -33,7 +33,8 @@ ac_add_options --disable-crashreporter ac_add_options --disable-debug ac_add_options --disable-default-browser-agent ac_add_options --disable-tests -#ac_add_options --disable-updater +# updater disabled in Settings repo (app.update.auto). +# ac_add_options --disable-updater ac_add_options --enable-hardening ac_add_options --enable-optimize ac_add_options --enable-release diff --git a/linux/assets/mozconfig b/linux/assets/mozconfig index dd6e07b..4853288 100644 --- a/linux/assets/mozconfig +++ b/linux/assets/mozconfig @@ -33,7 +33,8 @@ ac_add_options --disable-crashreporter ac_add_options --disable-debug ac_add_options --disable-default-browser-agent ac_add_options --disable-tests -ac_add_options --disable-updater +# updater disabled in Settings repo (app.update.auto). +# ac_add_options --disable-updater ac_add_options --enable-hardening ac_add_options --enable-optimize ac_add_options --enable-release @@ -65,7 +66,7 @@ ac_add_options --enable-strip # needed for windows/mac auto update ONLY. it's a security risk so other OSses don't need it # https://firefox-source-docs.mozilla.org/taskcluster/setting-up-an-update-server.html -#ac_add_options --disable-verify-mar +ac_add_options --disable-verify-mar # Internationalization ac_add_options --with-l10n-base=$(pwd)/browser/locales/l10n From af4986966736cbbe83f4e77d77a5f3cc3709ac68 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 1 Oct 2022 15:30:53 +0200 Subject: [PATCH 03/13] ditch this option --- linux/assets/mozconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/assets/mozconfig b/linux/assets/mozconfig index 4853288..1106168 100644 --- a/linux/assets/mozconfig +++ b/linux/assets/mozconfig @@ -66,7 +66,7 @@ ac_add_options --enable-strip # needed for windows/mac auto update ONLY. it's a security risk so other OSses don't need it # https://firefox-source-docs.mozilla.org/taskcluster/setting-up-an-update-server.html -ac_add_options --disable-verify-mar +#ac_add_options --disable-verify-mar # Internationalization ac_add_options --with-l10n-base=$(pwd)/browser/locales/l10n From 8ca4ad7f31554f2390691027d473a13c7a1aedde Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 5 Oct 2022 12:07:15 +0200 Subject: [PATCH 04/13] bump version v105.0.2 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 9f1a9a8..ef2f5d2 100644 --- a/version +++ b/version @@ -1 +1 @@ -105.0.1 +105.0.2 From b6222868937378fe8786a915636bedabf1efc1d0 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 7 Oct 2022 14:13:32 +0200 Subject: [PATCH 05/13] re-enable ac_add_options --disable_updater due to url-star-icon disappearing --- linux/assets/mozconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/assets/mozconfig b/linux/assets/mozconfig index 1106168..e8c4b0f 100644 --- a/linux/assets/mozconfig +++ b/linux/assets/mozconfig @@ -34,7 +34,7 @@ ac_add_options --disable-debug ac_add_options --disable-default-browser-agent ac_add_options --disable-tests # updater disabled in Settings repo (app.update.auto). -# ac_add_options --disable-updater +ac_add_options --disable-updater ac_add_options --enable-hardening ac_add_options --enable-optimize ac_add_options --enable-release From 266894f2f340b23c53040fff403dc49dc3ed4a60 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 7 Oct 2022 20:45:05 +0200 Subject: [PATCH 06/13] added docker related commands --- linux/Makefile | 17 ++++++++++++++++- linux/assets/Dockerfile | 12 ++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 linux/assets/Dockerfile diff --git a/linux/Makefile b/linux/Makefile index e5e44b6..8fbd8e8 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,4 +1,4 @@ -.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean +.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean docker-build docker-run docker-clean docker-prune version:=$(shell cat version) release:=$(shell cat release) @@ -6,6 +6,8 @@ source_release:=$(shell cat source_release) full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)") mozbuild=~/.mozbuild +docker_image_name=lw-win-x64 + help : @echo "use: make [help] [all] [clean] [build] [package] [artifacts]" @@ -23,6 +25,11 @@ help : @echo " bootstrap - try to set up the build environment." @echo " setup-debian, setup-fedora - needed packages." @echo "" + @echo " docker-build - Run 'docker build' for" $(docker_image_name) "image." + @echo " docker-run - Run LW build using 'docker run' on" $(docker_image_name) "image." + @echo " docker-clean - Remove" $(docker_image_name) "docker image." + @echo " docker-prune - Delete ALL docker data: images, containers, networks, etc." + @echo "" all : build package artifacts @@ -98,3 +105,11 @@ artifacts : firefox-$(full_version).en-US.win64.zip ${MAKE} -f assets/artifacts.mk artifacts +docker-build : + docker build -t $(docker_image_name) - < assets/Dockerfile +docker-run : + docker run --rm $(docker_image_name) sh -c "make fetch && make build" +docker-clean : + docker rmi $(docker_image_name) +docker-prune : + docker system prune --all --force diff --git a/linux/assets/Dockerfile b/linux/assets/Dockerfile new file mode 100644 index 0000000..53284b2 --- /dev/null +++ b/linux/assets/Dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:jammy +#FROM fedora:36 + +RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch +#RUN dnf -y update && dnf -y install make wget git patch + +WORKDIR / +RUN git clone https://gitlab.com/librewolf-community/browser/windows.git +WORKDIR /windows/linux + +RUN make setup-debian && make fetch && make bootstrap && make veryclean +#RUN make setup-fedora && make fetch && make bootstrap && make veryclean From 245ddc0d62f421fd6221b97d66eb352c5d2d1977 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 7 Oct 2022 20:48:22 +0200 Subject: [PATCH 07/13] moved windows stuff to winbuild folder --- Makefile => winbuild/Makefile | 0 {assets => winbuild/assets}/PrivateBrowsing_150.png | Bin {assets => winbuild/assets}/PrivateBrowsing_70.png | Bin .../assets}/aboutDialog/aboutDialog.css | 0 .../assets}/aboutDialog/aboutDialog.js | 0 .../assets}/aboutDialog/aboutDialog.xhtml | 0 {assets => winbuild/assets}/banner.bmp | Bin .../assets}/disable-verify-mar.patch | 0 .../assets}/fix-l10n-package-cmd.patch | 0 .../assets}/librewolf-portable/.gitignore | 0 .../assets}/librewolf-portable/README.md | 0 .../assets}/librewolf-portable/Resource.h | 0 .../assets}/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 .../assets}/librewolf-portable/targetver.h | 0 {assets => winbuild/assets}/librewolf.ico | Bin {assets => winbuild/assets}/mozconfig.windows | 0 {assets => winbuild/assets}/mozconfig.windows.debug | 0 {assets => winbuild/assets}/mozconfig.windows32 | 0 {assets => winbuild/assets}/package-manifest.patch | 0 .../private_browsing.VisualElementsManifest.xml | 0 {assets => winbuild/assets}/setup.nsi | 0 {assets => winbuild/assets}/tools.py | 0 .../assets}/tryfix-reslink-fail.patch | 0 {assets => winbuild/assets}/update-version.py | 0 mk.py => winbuild/mk.py | 0 release => winbuild/release | 0 source_release => winbuild/source_release | 0 version => winbuild/version | 0 36 files changed, 0 insertions(+), 0 deletions(-) rename Makefile => winbuild/Makefile (100%) rename {assets => winbuild/assets}/PrivateBrowsing_150.png (100%) rename {assets => winbuild/assets}/PrivateBrowsing_70.png (100%) rename {assets => winbuild/assets}/aboutDialog/aboutDialog.css (100%) rename {assets => winbuild/assets}/aboutDialog/aboutDialog.js (100%) rename {assets => winbuild/assets}/aboutDialog/aboutDialog.xhtml (100%) rename {assets => winbuild/assets}/banner.bmp (100%) rename {assets => winbuild/assets}/disable-verify-mar.patch (100%) rename {assets => winbuild/assets}/fix-l10n-package-cmd.patch (100%) rename {assets => winbuild/assets}/librewolf-portable/.gitignore (100%) rename {assets => winbuild/assets}/librewolf-portable/README.md (100%) rename {assets => winbuild/assets}/librewolf-portable/Resource.h (100%) rename {assets => winbuild/assets}/librewolf-portable/build.bat (100%) rename {assets => winbuild/assets}/librewolf-portable/librewolf-portable.aps (100%) rename {assets => winbuild/assets}/librewolf-portable/librewolf-portable.cpp (100%) rename {assets => winbuild/assets}/librewolf-portable/librewolf-portable.ico (100%) rename {assets => winbuild/assets}/librewolf-portable/librewolf-portable.rc (100%) rename {assets => winbuild/assets}/librewolf-portable/librewolf-portable.sln (100%) rename {assets => winbuild/assets}/librewolf-portable/librewolf-portable.vcxproj (100%) rename {assets => winbuild/assets}/librewolf-portable/librewolf-portable.vcxproj.filters (100%) rename {assets => winbuild/assets}/librewolf-portable/librewolf-portable.vcxproj.user (100%) rename {assets => winbuild/assets}/librewolf-portable/targetver.h (100%) rename {assets => winbuild/assets}/librewolf.ico (100%) rename {assets => winbuild/assets}/mozconfig.windows (100%) rename {assets => winbuild/assets}/mozconfig.windows.debug (100%) rename {assets => winbuild/assets}/mozconfig.windows32 (100%) rename {assets => winbuild/assets}/package-manifest.patch (100%) rename {assets => winbuild/assets}/private_browsing.VisualElementsManifest.xml (100%) rename {assets => winbuild/assets}/setup.nsi (100%) rename {assets => winbuild/assets}/tools.py (100%) rename {assets => winbuild/assets}/tryfix-reslink-fail.patch (100%) rename {assets => winbuild/assets}/update-version.py (100%) rename mk.py => winbuild/mk.py (100%) rename release => winbuild/release (100%) rename source_release => winbuild/source_release (100%) rename version => winbuild/version (100%) diff --git a/Makefile b/winbuild/Makefile similarity index 100% rename from Makefile rename to winbuild/Makefile diff --git a/assets/PrivateBrowsing_150.png b/winbuild/assets/PrivateBrowsing_150.png similarity index 100% rename from assets/PrivateBrowsing_150.png rename to winbuild/assets/PrivateBrowsing_150.png diff --git a/assets/PrivateBrowsing_70.png b/winbuild/assets/PrivateBrowsing_70.png similarity index 100% rename from assets/PrivateBrowsing_70.png rename to winbuild/assets/PrivateBrowsing_70.png diff --git a/assets/aboutDialog/aboutDialog.css b/winbuild/assets/aboutDialog/aboutDialog.css similarity index 100% rename from assets/aboutDialog/aboutDialog.css rename to winbuild/assets/aboutDialog/aboutDialog.css diff --git a/assets/aboutDialog/aboutDialog.js b/winbuild/assets/aboutDialog/aboutDialog.js similarity index 100% rename from assets/aboutDialog/aboutDialog.js rename to winbuild/assets/aboutDialog/aboutDialog.js diff --git a/assets/aboutDialog/aboutDialog.xhtml b/winbuild/assets/aboutDialog/aboutDialog.xhtml similarity index 100% rename from assets/aboutDialog/aboutDialog.xhtml rename to winbuild/assets/aboutDialog/aboutDialog.xhtml diff --git a/assets/banner.bmp b/winbuild/assets/banner.bmp similarity index 100% rename from assets/banner.bmp rename to winbuild/assets/banner.bmp diff --git a/assets/disable-verify-mar.patch b/winbuild/assets/disable-verify-mar.patch similarity index 100% rename from assets/disable-verify-mar.patch rename to winbuild/assets/disable-verify-mar.patch diff --git a/assets/fix-l10n-package-cmd.patch b/winbuild/assets/fix-l10n-package-cmd.patch similarity index 100% rename from assets/fix-l10n-package-cmd.patch rename to winbuild/assets/fix-l10n-package-cmd.patch diff --git a/assets/librewolf-portable/.gitignore b/winbuild/assets/librewolf-portable/.gitignore similarity index 100% rename from assets/librewolf-portable/.gitignore rename to winbuild/assets/librewolf-portable/.gitignore diff --git a/assets/librewolf-portable/README.md b/winbuild/assets/librewolf-portable/README.md similarity index 100% rename from assets/librewolf-portable/README.md rename to winbuild/assets/librewolf-portable/README.md diff --git a/assets/librewolf-portable/Resource.h b/winbuild/assets/librewolf-portable/Resource.h similarity index 100% rename from assets/librewolf-portable/Resource.h rename to winbuild/assets/librewolf-portable/Resource.h diff --git a/assets/librewolf-portable/build.bat b/winbuild/assets/librewolf-portable/build.bat similarity index 100% rename from assets/librewolf-portable/build.bat rename to winbuild/assets/librewolf-portable/build.bat diff --git a/assets/librewolf-portable/librewolf-portable.aps b/winbuild/assets/librewolf-portable/librewolf-portable.aps similarity index 100% rename from assets/librewolf-portable/librewolf-portable.aps rename to winbuild/assets/librewolf-portable/librewolf-portable.aps diff --git a/assets/librewolf-portable/librewolf-portable.cpp b/winbuild/assets/librewolf-portable/librewolf-portable.cpp similarity index 100% rename from assets/librewolf-portable/librewolf-portable.cpp rename to winbuild/assets/librewolf-portable/librewolf-portable.cpp diff --git a/assets/librewolf-portable/librewolf-portable.ico b/winbuild/assets/librewolf-portable/librewolf-portable.ico similarity index 100% rename from assets/librewolf-portable/librewolf-portable.ico rename to winbuild/assets/librewolf-portable/librewolf-portable.ico diff --git a/assets/librewolf-portable/librewolf-portable.rc b/winbuild/assets/librewolf-portable/librewolf-portable.rc similarity index 100% rename from assets/librewolf-portable/librewolf-portable.rc rename to winbuild/assets/librewolf-portable/librewolf-portable.rc diff --git a/assets/librewolf-portable/librewolf-portable.sln b/winbuild/assets/librewolf-portable/librewolf-portable.sln similarity index 100% rename from assets/librewolf-portable/librewolf-portable.sln rename to winbuild/assets/librewolf-portable/librewolf-portable.sln diff --git a/assets/librewolf-portable/librewolf-portable.vcxproj b/winbuild/assets/librewolf-portable/librewolf-portable.vcxproj similarity index 100% rename from assets/librewolf-portable/librewolf-portable.vcxproj rename to winbuild/assets/librewolf-portable/librewolf-portable.vcxproj diff --git a/assets/librewolf-portable/librewolf-portable.vcxproj.filters b/winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.filters similarity index 100% rename from assets/librewolf-portable/librewolf-portable.vcxproj.filters rename to winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.filters diff --git a/assets/librewolf-portable/librewolf-portable.vcxproj.user b/winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.user similarity index 100% rename from assets/librewolf-portable/librewolf-portable.vcxproj.user rename to winbuild/assets/librewolf-portable/librewolf-portable.vcxproj.user diff --git a/assets/librewolf-portable/targetver.h b/winbuild/assets/librewolf-portable/targetver.h similarity index 100% rename from assets/librewolf-portable/targetver.h rename to winbuild/assets/librewolf-portable/targetver.h diff --git a/assets/librewolf.ico b/winbuild/assets/librewolf.ico similarity index 100% rename from assets/librewolf.ico rename to winbuild/assets/librewolf.ico diff --git a/assets/mozconfig.windows b/winbuild/assets/mozconfig.windows similarity index 100% rename from assets/mozconfig.windows rename to winbuild/assets/mozconfig.windows diff --git a/assets/mozconfig.windows.debug b/winbuild/assets/mozconfig.windows.debug similarity index 100% rename from assets/mozconfig.windows.debug rename to winbuild/assets/mozconfig.windows.debug diff --git a/assets/mozconfig.windows32 b/winbuild/assets/mozconfig.windows32 similarity index 100% rename from assets/mozconfig.windows32 rename to winbuild/assets/mozconfig.windows32 diff --git a/assets/package-manifest.patch b/winbuild/assets/package-manifest.patch similarity index 100% rename from assets/package-manifest.patch rename to winbuild/assets/package-manifest.patch diff --git a/assets/private_browsing.VisualElementsManifest.xml b/winbuild/assets/private_browsing.VisualElementsManifest.xml similarity index 100% rename from assets/private_browsing.VisualElementsManifest.xml rename to winbuild/assets/private_browsing.VisualElementsManifest.xml diff --git a/assets/setup.nsi b/winbuild/assets/setup.nsi similarity index 100% rename from assets/setup.nsi rename to winbuild/assets/setup.nsi diff --git a/assets/tools.py b/winbuild/assets/tools.py similarity index 100% rename from assets/tools.py rename to winbuild/assets/tools.py diff --git a/assets/tryfix-reslink-fail.patch b/winbuild/assets/tryfix-reslink-fail.patch similarity index 100% rename from assets/tryfix-reslink-fail.patch rename to winbuild/assets/tryfix-reslink-fail.patch diff --git a/assets/update-version.py b/winbuild/assets/update-version.py similarity index 100% rename from assets/update-version.py rename to winbuild/assets/update-version.py diff --git a/mk.py b/winbuild/mk.py similarity index 100% rename from mk.py rename to winbuild/mk.py diff --git a/release b/winbuild/release similarity index 100% rename from release rename to winbuild/release diff --git a/source_release b/winbuild/source_release similarity index 100% rename from source_release rename to winbuild/source_release diff --git a/version b/winbuild/version similarity index 100% rename from version rename to winbuild/version From 0842264966f4830a786496fb505f62562ec2f2b6 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 7 Oct 2022 20:49:51 +0200 Subject: [PATCH 08/13] now the builds are in windows/winbuild --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 10eb75c..1faf6f2 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,8 @@ Once that works, you can check out and compile LibreWolf like this: ``` git clone https://gitlab.com/librewolf-community/browser/windows.git -cd windows -make fetch build artifacts +cd windows/winbuild +make all ``` This will produce the -setup.exe and portable .zip. Have fun! From c66ce4d63ff0374425069ec7d913fd91b63595d4 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 8 Oct 2022 12:38:41 +0200 Subject: [PATCH 09/13] bump version to v105.0.3-1 --- linux/Makefile | 5 ++++- linux/assets/Dockerfile | 4 ++-- winbuild/version | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 8fbd8e8..eb98aab 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,4 +1,4 @@ -.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean docker-build docker-run docker-clean docker-prune +.PHONY : help fetch all clean build artifacts dir bootstrap winsdk setup-debian setup-fedora veryclean docker-build docker-run docker-clean docker-prune docker-shell version:=$(shell cat version) release:=$(shell cat release) @@ -27,6 +27,7 @@ help : @echo "" @echo " docker-build - Run 'docker build' for" $(docker_image_name) "image." @echo " docker-run - Run LW build using 'docker run' on" $(docker_image_name) "image." + @echo " docker-shell - Run shell in" $(docker_image_name) "image, to debug why docker-run fails." @echo " docker-clean - Remove" $(docker_image_name) "docker image." @echo " docker-prune - Delete ALL docker data: images, containers, networks, etc." @echo "" @@ -109,6 +110,8 @@ docker-build : docker build -t $(docker_image_name) - < assets/Dockerfile docker-run : docker run --rm $(docker_image_name) sh -c "make fetch && make build" +docker-shell : + docker run -it --rm $(docker_image_name) /bin/bash -i docker-clean : docker rmi $(docker_image_name) docker-prune : diff --git a/linux/assets/Dockerfile b/linux/assets/Dockerfile index 53284b2..4914a24 100644 --- a/linux/assets/Dockerfile +++ b/linux/assets/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:jammy #FROM fedora:36 -RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch -#RUN dnf -y update && dnf -y install make wget git patch +RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch bash vim mc screen +#RUN dnf -y update && dnf -y install make wget git patch bash vim mc screen WORKDIR / RUN git clone https://gitlab.com/librewolf-community/browser/windows.git diff --git a/winbuild/version b/winbuild/version index ef2f5d2..6071472 100644 --- a/winbuild/version +++ b/winbuild/version @@ -1 +1 @@ -105.0.2 +105.0.3 From 67e8a14fd9a899e902ec54ed6440ef4f5c539962 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 8 Oct 2022 15:59:23 +0200 Subject: [PATCH 10/13] testing --- linux-mar/assets/mozconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-mar/assets/mozconfig b/linux-mar/assets/mozconfig index b9e5a4e..aafe3a4 100644 --- a/linux-mar/assets/mozconfig +++ b/linux-mar/assets/mozconfig @@ -41,7 +41,7 @@ ac_add_options --enable-release ac_add_options --enable-rust-simd ac_add_options --with-app-name=librewolf -ac_add_options --with-branding=browser/branding/librewolf +ac_add_options --with-branding=browser/branding/nightly ac_add_options --with-unsigned-addon-scopes=app,system From 95045ac69a6e3125a17250e7ad6723b5515cf04a Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 8 Oct 2022 16:22:01 +0200 Subject: [PATCH 11/13] removed --disable-verify-mar --- linux-mar/assets/mozconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-mar/assets/mozconfig b/linux-mar/assets/mozconfig index aafe3a4..2a4c9c1 100644 --- a/linux-mar/assets/mozconfig +++ b/linux-mar/assets/mozconfig @@ -65,8 +65,8 @@ ac_add_options --enable-strip # needed for windows/mac auto update ONLY. it's a security risk so other OSses don't need it # https://firefox-source-docs.mozilla.org/taskcluster/setting-up-an-update-server.html - -ac_add_options --disable-verify-mar +# this one below now fails since a few versions. what's up? +#ac_add_options --disable-verify-mar # Internationalization ac_add_options --with-l10n-base=$(pwd)/browser/locales/l10n From 785e3a241dc5662e9397865f36d509113ff1e8dd Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 9 Oct 2022 11:23:53 +0200 Subject: [PATCH 12/13] debug CI --- linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Makefile b/linux/Makefile index eb98aab..e46add7 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -51,7 +51,7 @@ veryclean : clean rm -f version source_release build : dir - (cd librewolf-$(full_version) && ./mach build) + (cd librewolf-$(full_version) && ./mach build -v -j 1) package : dir # (cd librewolf-$(full_version) && ./mach package) From ea4a8b324370e721f0c69a20776321f067f2cdfa Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 9 Oct 2022 12:42:19 +0200 Subject: [PATCH 13/13] revert debug build parameters --- linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Makefile b/linux/Makefile index e46add7..eb98aab 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -51,7 +51,7 @@ veryclean : clean rm -f version source_release build : dir - (cd librewolf-$(full_version) && ./mach build -v -j 1) + (cd librewolf-$(full_version) && ./mach build) package : dir # (cd librewolf-$(full_version) && ./mach package)