From 4f92e73ec45c295ecabf3f64dea3f99475258bd9 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 3 Feb 2021 23:53:06 +0100 Subject: [PATCH 01/52] changes --- README2.md | 53 +++++ build.sh | 190 ++++++++++++++++++ .../stubinstaller/bgstub.jpg | Bin 0 -> 1228 bytes .../stubinstaller/installing_page.css | 61 ++++++ .../stubinstaller/profile_cleanup_page.css | 42 ++++ 5 files changed, 346 insertions(+) create mode 100644 README2.md create mode 100644 build.sh create mode 100644 missing_branding_files/stubinstaller/bgstub.jpg create mode 100644 missing_branding_files/stubinstaller/installing_page.css create mode 100644 missing_branding_files/stubinstaller/profile_cleanup_page.css diff --git a/README2.md b/README2.md new file mode 100644 index 0000000..2f1e02b --- /dev/null +++ b/README2.md @@ -0,0 +1,53 @@ +Just some notes +--------------- + +To build, one should use the following: + +$ time bash build.sh fetch prepare build package + + +the final .zip is in: + C:\mozilla-source\firefox-85.0\obj-x86_64-pc-mingw32\dist + + +* problem with old sed. does not recognize -z. using the one from Git might be a work around. + + +BRANDING: resource files +======================== + +* build fail on missing stubinstaller (might be a FF bug as it should just take missing +stuff from the nightly branding folder?) + +$ mkdir stubinstaller +$ cp bgstub.jpg stubinstaller +$ pwd +/c/mozilla-source/firefox-85.0/browser/branding/librewolf +$ + +* checking all the different files in nightly and librewolf + +$ cd nightly +$ find . | sort > /c/mozilla-source/branding-nightly.txt +$ cd ../librewolf/ +$ find . | sort > /c/mozilla-source/branding-librewolf.txt + + +$ diff branding-nightly.txt branding-librewolf.txt +4a5,6 +> ./bgstub.jpg +> ./bgstub_2x.jpg +7a10 +> ./content/about-background.png +9,10d11 +< ./content/about-logo.svg +< ./content/about-logo@2x.png +14,15d14 +< ./content/aboutlogins.svg +< ./content/firefox-wordmark.svg +22,24d20 +< ./default22.png +< ./default24.png +< ./default256.png +$ + diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..7171839 --- /dev/null +++ b/build.sh @@ -0,0 +1,190 @@ +# build.sh - build librewolf on windows +# derived from https://gitlab.com/librewolf-community/browser/linux/-/blob/master/PKGBUILD + +pkgname=librewolf +_pkgname=LibreWolf + +pkgver=85.0 +#srcdir=/c/mozilla-source + + + +fetch() { + rm -f firefox-$pkgver.source.tar.xz + wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz + + rm -rf settings commmon + git clone https://gitlab.com/$pkgname-community/browser/common.git + git clone https://gitlab.com/$pkgname-community/settings.git + + rm -f megabar.patch remove_addons.patch unity-menubar.patch + wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch + wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/remove_addons.patch + wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/unity-menubar.patch +} + + + + + +prepare() { + rm -rf firefox-$pkgver + tar xf firefox-$pkgver.source.tar.xz + + cd firefox-$pkgver + + cat >../mozconfig < Date: Thu, 4 Feb 2021 00:03:46 +0100 Subject: [PATCH 02/52] changes --- README2.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README2.md b/README2.md index 2f1e02b..f756ee8 100644 --- a/README2.md +++ b/README2.md @@ -1,13 +1,19 @@ Just some notes --------------- -To build, one should use the following: +Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will +install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire +C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option, +and to get sha256sum.exe. + + +To build, one should use the following command in the checked out windows repo: $ time bash build.sh fetch prepare build package the final .zip is in: - C:\mozilla-source\firefox-85.0\obj-x86_64-pc-mingw32\dist + C:\mozilla-source\windows\firefox-85.0\obj-x86_64-pc-mingw32\dist * problem with old sed. does not recognize -z. using the one from Git might be a work around. From 79e7e2b21b3830909e439d202cd0b889b04f2e8e Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 00:10:16 +0100 Subject: [PATCH 03/52] changes --- .gitignore | 4 ++++ .gitmodules | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 .gitignore create mode 100644 .gitmodules diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b870e9f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +firefox-*.tar.xz +megabar.patch +remove_addons.patch +unity-menubar.patch diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2869fea --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "settings"] + path = settings + url = https://gitlab.com/librewolf-community/settings.git From c542e80b8af8ae026448f12f6169bc46a76a8775 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 00:12:21 +0100 Subject: [PATCH 04/52] changes --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 2869fea..68523b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "settings"] path = settings url = https://gitlab.com/librewolf-community/settings.git + From 22914f232c9dae9986b56e206f270b04562b63ff Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 00:28:21 +0100 Subject: [PATCH 05/52] changes --- .gitmodules | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 68523b2..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "settings"] - path = settings - url = https://gitlab.com/librewolf-community/settings.git - From 0586f8ecd63140d511f0a962dd1999cfe1cf5730 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 00:33:12 +0100 Subject: [PATCH 06/52] addes settings submodule --- .gitmodules | 3 +++ settings | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 settings diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1d63467 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "settings"] + path = settings + url = https://gitlab.com/librewolf-community/settings.git diff --git a/settings b/settings new file mode 160000 index 0000000..640b375 --- /dev/null +++ b/settings @@ -0,0 +1 @@ +Subproject commit 640b375dc02c5b089f678ed16b0232d1c0cc0721 From fd668d8a74450dd2d05b5c9dcaf62e3de2f0b6f3 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 00:44:17 +0100 Subject: [PATCH 07/52] changes --- .gitignore | 3 ++- .gitmodules | 3 +++ build.sh | 4 +--- common | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) create mode 160000 common diff --git a/.gitignore b/.gitignore index b870e9f..322c7c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -firefox-*.tar.xz +firefox-* megabar.patch remove_addons.patch unity-menubar.patch +mozconfig diff --git a/.gitmodules b/.gitmodules index 1d63467..9e19064 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +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 diff --git a/build.sh b/build.sh index 7171839..81fd5ab 100644 --- a/build.sh +++ b/build.sh @@ -13,9 +13,7 @@ fetch() { rm -f firefox-$pkgver.source.tar.xz wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz - rm -rf settings commmon - git clone https://gitlab.com/$pkgname-community/browser/common.git - git clone https://gitlab.com/$pkgname-community/settings.git + # the settings and common submodules should be checked out to allow the build rm -f megabar.patch remove_addons.patch unity-menubar.patch wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch diff --git a/common b/common new file mode 160000 index 0000000..9995c8b --- /dev/null +++ b/common @@ -0,0 +1 @@ +Subproject commit 9995c8b275e2a06db3e0b24974b302a63791fc24 From 85f138650feed3c8ccad64a02b5957bff39bd051 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 00:55:03 +0100 Subject: [PATCH 08/52] updates --- build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 81fd5ab..9d8e2ef 100644 --- a/build.sh +++ b/build.sh @@ -108,8 +108,11 @@ END - rm -f ../common/source_files/mozconfig cp -r ../common/source_files/* ./ + # FIXME: this 'mozconfig' file in the 'common' submodule should be removed + # this submodule is purely for the branding. I imagine that we want the + # missing_branding_files into the 'common' submodule. + rm -f mozconfig # FIX: on windows: the stubinstaller folder is missing from the librewolf branding folder. cp -r ../missing_branding_files/stubinstaller browser/branding/librewolf From 2375039d41bb16276f501a03175742b081943bfa Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 02:21:09 +0100 Subject: [PATCH 09/52] updates --- .gitignore | 1 + build.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 322c7c4..1929584 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ firefox-* +librewolf-* megabar.patch remove_addons.patch unity-menubar.patch diff --git a/build.sh b/build.sh index 9d8e2ef..8129294 100644 --- a/build.sh +++ b/build.sh @@ -147,8 +147,10 @@ package() { cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf # recreate the zip file.. cd obj-x86_64-pc-mingw32/dist - rm -f librewolf-85.0.en-US.win64.txt librewolf-85.0.en-US.win64.zip - zip -r9 librewolf-85.0.en-US.win64.zip librewolf + rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip + zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf + /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum + cp librewolf-$pkgver.en-US.win64.zip* ../../.. cd ../.. cd .. From b665c22c594f753e82b12e26fd5b1951274561fa Mon Sep 17 00:00:00 2001 From: Stanzabird Date: Thu, 4 Feb 2021 01:26:07 +0000 Subject: [PATCH 10/52] Update README2.md --- README2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README2.md b/README2.md index f756ee8..5dde730 100644 --- a/README2.md +++ b/README2.md @@ -13,7 +13,7 @@ $ time bash build.sh fetch prepare build package the final .zip is in: - C:\mozilla-source\windows\firefox-85.0\obj-x86_64-pc-mingw32\dist + C:\mozilla-source\windows * problem with old sed. does not recognize -z. using the one from Git might be a work around. From 07cd4fabf39d3619463d9a8df07518ab95be79c3 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 02:51:19 +0100 Subject: [PATCH 11/52] new version of the readme.md --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index a47e71e..612923d 100644 --- a/README.md +++ b/README.md @@ -1 +1,12 @@ This repository is still a work in progress + + +This build does require you to: + +* First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff +* You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun) +* Then clone the windows repo +* cd into it, and build with: time bash build.sh fetch prepare build package +* you can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux +* This will produce a librewolf-85.0.en-US.win64.zip in this windows folder. + From 8d88df02fe52e67d353f67d457d4401d1a516935 Mon Sep 17 00:00:00 2001 From: Stanzabird Date: Thu, 4 Feb 2021 01:53:34 +0000 Subject: [PATCH 12/52] Update the text formatting --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 612923d..46ba00a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This build does require you to: * First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff * You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun) * Then clone the windows repo -* cd into it, and build with: time bash build.sh fetch prepare build package +* cd into it, and build with: **time bash build.sh fetch prepare build package** * you can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux -* This will produce a librewolf-85.0.en-US.win64.zip in this windows folder. +* This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder. From 200dc9863316236f1fa39d80856fac0e097c462e Mon Sep 17 00:00:00 2001 From: Stanzabird Date: Thu, 4 Feb 2021 02:36:03 +0000 Subject: [PATCH 13/52] Update README2.md --- README2.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README2.md b/README2.md index 5dde730..6edb326 100644 --- a/README2.md +++ b/README2.md @@ -24,7 +24,7 @@ BRANDING: resource files * build fail on missing stubinstaller (might be a FF bug as it should just take missing stuff from the nightly branding folder?) - +`` $ mkdir stubinstaller $ cp bgstub.jpg stubinstaller $ pwd @@ -56,4 +56,4 @@ $ diff branding-nightly.txt branding-librewolf.txt < ./default24.png < ./default256.png $ - +`` From 24b84c0cbdb090e75671b733edbbdaef8d609b3b Mon Sep 17 00:00:00 2001 From: Stanzabird Date: Thu, 4 Feb 2021 02:37:28 +0000 Subject: [PATCH 14/52] Update README2.md --- README2.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README2.md b/README2.md index 6edb326..792bf47 100644 --- a/README2.md +++ b/README2.md @@ -24,7 +24,8 @@ BRANDING: resource files * build fail on missing stubinstaller (might be a FF bug as it should just take missing stuff from the nightly branding folder?) -`` + +``` $ mkdir stubinstaller $ cp bgstub.jpg stubinstaller $ pwd @@ -56,4 +57,5 @@ $ diff branding-nightly.txt branding-librewolf.txt < ./default24.png < ./default256.png $ -`` +``` + From c998b1538751bba53cb562047f70ae5b1cc219b6 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 09:12:46 +0100 Subject: [PATCH 15/52] changes --- build.sh | 81 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 28 deletions(-) diff --git a/build.sh b/build.sh index 8129294..6d926fe 100644 --- a/build.sh +++ b/build.sh @@ -5,7 +5,6 @@ pkgname=librewolf _pkgname=LibreWolf pkgver=85.0 -#srcdir=/c/mozilla-source @@ -23,8 +22,6 @@ fetch() { - - prepare() { rm -rf firefox-$pkgver tar xf firefox-$pkgver.source.tar.xz @@ -69,31 +66,39 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0 END + patch -p1 -i ../remove_addons.patch patch -p1 -i ../megabar.patch patch -p1 -i ../unity-menubar.patch - + # Disabling Pocket sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build # this one only to remove an annoying error message: sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/BrowserGlue.jsm - + # Remove Internal Plugin Certificates _cert_sed='s#if (aCert.organizationalUnit == "Mozilla [[:alpha:]]\+") {\n' _cert_sed+='[[:blank:]]\+return AddonManager\.SIGNEDSTATE_[[:upper:]]\+;\n' _cert_sed+='[[:blank:]]\+}#' _cert_sed+='// NOTE: removed#g' - - # FIXME: on windows: the sed.exe in MozBuild is too old, no -z, using the one from Git instead. - mysed='/c/mozilla-source/Git/usr/bin/sed.exe' + # on windows: the sed.exe in MozBuild is too old, no -z, using the one from Git instead. + if [ -f '/c/mozilla-build/start-shell.bat' ]; then + mysed='/c/mozilla-source/Git/usr/bin/sed.exe' + if [ ! -f $mysed ]; then + echo 'build.sh: For the build to work, copy "c:\program files\Git" folder into "c:\mozilla-source".' + exit + fi + else + $mysed='sed' + fi $mysed -z "$_cert_sed" -i toolkit/mozapps/extensions/internal/XPIInstall.jsm - + # allow SearchEngines option in non-ESR builds sed -i 's#"enterprise_only": true,#"enterprise_only": false,#g' browser/components/enterprisepolicies/schemas/policies-schema.json @@ -107,28 +112,25 @@ END - cp -r ../common/source_files/* ./ + # FIXME: this 'mozconfig' file in the 'common' submodule should be removed - # this submodule is purely for the branding. I imagine that we want the - # missing_branding_files into the 'common' submodule. + # this submodule is purely for the branding. rm -f mozconfig - # FIX: on windows: the stubinstaller folder is missing from the librewolf branding folder. + # FIXME: on windows: the stubinstaller folder is missing from the librewolf branding folder. + # this might be a bug in FF however as it seems to take missing branding resources from + # the nightly branding. We probably want this stuff merged into the 'common' submodule. cp -r ../missing_branding_files/stubinstaller browser/branding/librewolf # just a straight copy for now.. cp ../mozconfig .mozconfig - + cd .. } - - - - build() { cd firefox-$pkgver @@ -138,13 +140,21 @@ build() { } + package() { cd firefox-$pkgver ./mach package + cd .. +} + +installer_win() { + cd firefox-$pkgver + # apply the LibreWolf settings cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf + # recreate the zip file.. cd obj-x86_64-pc-mingw32/dist rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip @@ -152,19 +162,26 @@ package() { /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum cp librewolf-$pkgver.en-US.win64.zip* ../../.. cd ../.. - + + cd .. +} + +installer_macos() { + cd firefox-$pkgver + + # TODO: we want to apply the librewolf settings and make the .dmg file here. + echo 'build.sh: installer_macos() Not implemented yet.' cd .. } - - - # windows: change $PATH to find all the build tools in .mozbuild -# this might do the trick on macos aswell -export TPATH=$HOME/.mozbuild/clang/bin:$HOME/.mozbuild/cbindgen:$HOME/.mozbuild/node:$HOME/.mozbuild/nasm -export PATH=$TPATH:$PATH +# this might do the trick on macos aswell? +if [ -f '/c/mozilla-build/start-shell.bat' ]; then + export TPATH=$HOME/.mozbuild/clang/bin:$HOME/.mozbuild/cbindgen:$HOME/.mozbuild/node:$HOME/.mozbuild/nasm + export PATH=$TPATH:$PATH +fi @@ -186,8 +203,16 @@ if [[ "$*" == *package* ]]; then package done_something=1 fi - -if (( done_something == 0 )); then - echo "Usage: $0 fetch | prepare | build | package" +if [[ "$*" == *installer_win* ]]; then + installer_win + done_something=1 +fi +if [[ "$*" == *installer_macos* ]]; then + installer_macos + done_something=1 fi +if (( done_something == 0 )); then + echo "Usage: $0 fetch | prepare | build | package | installer_win | installer_mac" + exit +fi From 312be4b89b4908e6a829742d278b1ed489d5d0e3 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 09:15:01 +0100 Subject: [PATCH 16/52] changes --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 6d926fe..50f3511 100644 --- a/build.sh +++ b/build.sh @@ -160,6 +160,7 @@ installer_win() { rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum + rm -f ../../../librewolf-$pkgver.en-US.win64.zip* cp librewolf-$pkgver.en-US.win64.zip* ../../.. cd ../.. From e8bc848ec8431ca2b38ee462dfb3152a2a610fa3 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 10:50:56 +0100 Subject: [PATCH 17/52] Removed install_script.txt because the profile folder requested here is checked to be Ok. --- install_script.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 install_script.txt diff --git a/install_script.txt b/install_script.txt deleted file mode 100644 index 081cb68..0000000 --- a/install_script.txt +++ /dev/null @@ -1 +0,0 @@ -#C:\Users\\AppData\Roaming\LibreWolf\Profiles\xxxxxxxx.default \ No newline at end of file From 605e073162e4deebdce4438044264aca01d39ea3 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 4 Feb 2021 18:00:10 +0100 Subject: [PATCH 18/52] Updated the readme a bit --- README.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 46ba00a..0ee0f37 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,22 @@ -This repository is still a work in progress +This repository is still a work in progress. +But we have a zip file available for testing right now.. -This build does require you to: +Download link to the prerelease alpha zip file is [here](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). + +To do: + +* Creating an installer. +* Branding issues, include a good icon for librewolf.exe +* Other Branding Issues +* Improve this README.md to contain detailed instructions on how to build. + +For now, if you want to attempt to build, this build does require you to: * First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff * You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun) * Then clone the windows repo -* cd into it, and build with: **time bash build.sh fetch prepare build package** +* cd into it, and build with: **time bash build.sh fetch prepare build package installer_win** * you can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux * This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder. From 3cf15ede146c2e235345345a2f414915998bf657 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Fri, 5 Feb 2021 23:15:23 +0100 Subject: [PATCH 19/52] split the installer stuff into a seperate shell script --- build.sh | 68 +++++++++++++++++++++--------------------------- installer-win.sh | 11 ++++++++ 2 files changed, 40 insertions(+), 39 deletions(-) create mode 100644 installer-win.sh diff --git a/build.sh b/build.sh index 50f3511..d10600e 100644 --- a/build.sh +++ b/build.sh @@ -151,31 +151,14 @@ package() { installer_win() { cd firefox-$pkgver - - # apply the LibreWolf settings - cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf - - # recreate the zip file.. - cd obj-x86_64-pc-mingw32/dist - rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip - zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf - /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum - rm -f ../../../librewolf-$pkgver.en-US.win64.zip* - cp librewolf-$pkgver.en-US.win64.zip* ../../.. - cd ../.. + + # there is just too much garbage in this installer function to + # have it all here.. + . installer-win.sh cd .. } -installer_macos() { - cd firefox-$pkgver - - # TODO: we want to apply the librewolf settings and make the .dmg file here. - echo 'build.sh: installer_macos() Not implemented yet.' - cd .. -} - - # windows: change $PATH to find all the build tools in .mozbuild # this might do the trick on macos aswell? @@ -188,32 +171,39 @@ fi # process commandline arguments and do something done_something=0 -if [[ "$*" == *fetch* ]]; then +if [[ "$*" == *all* ]]; then fetch - done_something=1 -fi -if [[ "$*" == *prepare* ]]; then prepare - done_something=1 -fi -if [[ "$*" == *build* ]]; then build - done_something=1 -fi -if [[ "$*" == *package* ]]; then package - done_something=1 -fi -if [[ "$*" == *installer_win* ]]; then installer_win done_something=1 -fi -if [[ "$*" == *installer_macos* ]]; then - installer_macos - done_something=1 +else + if [[ "$*" == *fetch* ]]; then + fetch + done_something=1 + fi + if [[ "$*" == *prepare* ]]; then + prepare + done_something=1 + fi + if [[ "$*" == *build* ]]; then + build + done_something=1 + fi + if [[ "$*" == *package* ]]; then + package + done_something=1 + fi + if [[ "$*" == *installer_win* ]]; then + installer_win + done_something=1 + fi fi + if (( done_something == 0 )); then - echo "Usage: $0 fetch | prepare | build | package | installer_win | installer_mac" + echo "Usage: $0 fetch | prepare | build | package | installer_win" + echo " use the parameter 'all' to just do everything." exit fi diff --git a/installer-win.sh b/installer-win.sh new file mode 100644 index 0000000..9a917ff --- /dev/null +++ b/installer-win.sh @@ -0,0 +1,11 @@ +# apply the LibreWolf settings +cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf + +# recreate the zip file.. +cd obj-x86_64-pc-mingw32/dist +rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip +zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf +/c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum +rm -f ../../../librewolf-$pkgver.en-US.win64.zip* +cp librewolf-$pkgver.en-US.win64.zip* ../../.. +cd ../.. From a783187ed4d8a8aab1946eafd5600ee73fea5dd3 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 00:25:48 +0100 Subject: [PATCH 20/52] made installer_win easy to use (tab completion) --- build.sh | 38 ++++++++++++------------------- installer-win.sh => installer_win | 0 2 files changed, 14 insertions(+), 24 deletions(-) rename installer-win.sh => installer_win (100%) diff --git a/build.sh b/build.sh index d10600e..70a8914 100644 --- a/build.sh +++ b/build.sh @@ -154,7 +154,7 @@ installer_win() { # there is just too much garbage in this installer function to # have it all here.. - . installer-win.sh + . ../installer_win cd .. } @@ -171,39 +171,29 @@ fi # process commandline arguments and do something done_something=0 -if [[ "$*" == *all* ]]; then +if [[ "$*" == *fetch* ]]; then fetch + done_something=1 +fi +if [[ "$*" == *prepare* ]]; then prepare + done_something=1 +fi +if [[ "$*" == *build* ]]; then build + done_something=1 +fi +if [[ "$*" == *package* ]]; then package + done_something=1 +fi +if [[ "$*" == *installer_win* ]]; then installer_win done_something=1 -else - if [[ "$*" == *fetch* ]]; then - fetch - done_something=1 - fi - if [[ "$*" == *prepare* ]]; then - prepare - done_something=1 - fi - if [[ "$*" == *build* ]]; then - build - done_something=1 - fi - if [[ "$*" == *package* ]]; then - package - done_something=1 - fi - if [[ "$*" == *installer_win* ]]; then - installer_win - done_something=1 - fi fi if (( done_something == 0 )); then echo "Usage: $0 fetch | prepare | build | package | installer_win" - echo " use the parameter 'all' to just do everything." exit fi diff --git a/installer-win.sh b/installer_win similarity index 100% rename from installer-win.sh rename to installer_win From 54bd5916c8c7d7c458651b06647026979ca92e3c Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 13:45:32 +0100 Subject: [PATCH 21/52] first version of the installer --- .gitignore | 2 + build.sh | 8 ++- installer_win | 11 ---- installer_win.sh | 24 +++++++++ librewolf.nsi | 81 +++++++++++++++++++++++++++++ missing_branding_files/firefox.ico | Bin 0 -> 32038 bytes 6 files changed, 113 insertions(+), 13 deletions(-) delete mode 100644 installer_win create mode 100644 installer_win.sh create mode 100644 librewolf.nsi create mode 100644 missing_branding_files/firefox.ico diff --git a/.gitignore b/.gitignore index 1929584..6580505 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ megabar.patch remove_addons.patch unity-menubar.patch mozconfig +Makefile +librewolf \ No newline at end of file diff --git a/build.sh b/build.sh index 70a8914..f071bc3 100644 --- a/build.sh +++ b/build.sh @@ -154,7 +154,7 @@ installer_win() { # there is just too much garbage in this installer function to # have it all here.. - . ../installer_win + . ../installer_win.sh cd .. } @@ -194,6 +194,10 @@ fi if (( done_something == 0 )); then - echo "Usage: $0 fetch | prepare | build | package | installer_win" + fetch + prepare + build + package + installer_win exit fi diff --git a/installer_win b/installer_win deleted file mode 100644 index 9a917ff..0000000 --- a/installer_win +++ /dev/null @@ -1,11 +0,0 @@ -# apply the LibreWolf settings -cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf - -# recreate the zip file.. -cd obj-x86_64-pc-mingw32/dist -rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip -zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf -/c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum -rm -f ../../../librewolf-$pkgver.en-US.win64.zip* -cp librewolf-$pkgver.en-US.win64.zip* ../../.. -cd ../.. diff --git a/installer_win.sh b/installer_win.sh new file mode 100644 index 0000000..ede8372 --- /dev/null +++ b/installer_win.sh @@ -0,0 +1,24 @@ +# apply the LibreWolf settings +cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf + +# recreate the zip file.. + +cd obj-x86_64-pc-mingw32/dist +# clean garbage files +rm -rf librewolf/uninstall librewolf/maintenanceservice* librewolf/pingsender.exe +# be sure to remove the previous zip file.. +rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip +zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf +/c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum +# copy the resulting zip file +rm -vf ../../../librewolf-$pkgver.en-US.win64.zip* +cp -v librewolf-$pkgver.en-US.win64.zip* ../../.. +cd ../.. + +# now to try to make the installer +pushd .. +rm -vrf librewolf +unzip librewolf-$pkgver.en-US.win64.zip +cp -v missing_branding_files/firefox.ico librewolf/librewolf.ico +makensis-3.01.exe librewolf.nsi +popd diff --git a/librewolf.nsi b/librewolf.nsi new file mode 100644 index 0000000..ff1e667 --- /dev/null +++ b/librewolf.nsi @@ -0,0 +1,81 @@ +# +# 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 "85.0" # the program version, like: 0.3.0 +!define ICON_NAME "librewolf.ico" # filename of icon to use for this app, this file should be in src/ +!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}" + + # 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} + +SectionEnd + +# Before uninstall, ask for confirmation +function un.onInit + SetShellVarContext all + + #Verify the uninstaller - last chance to back out + MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" IDOK next + Abort + next: +functionEnd + +# Uninstaller +section "uninstall" + + # Remove Start Menu launcher + delete "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.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}" + +sectionEnd diff --git a/missing_branding_files/firefox.ico b/missing_branding_files/firefox.ico new file mode 100644 index 0000000000000000000000000000000000000000..30a72f168d8f1cb8689dc7913bc42c7ce70a4f92 GIT binary patch literal 32038 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 literal 0 HcmV?d00001 From 27337bcb5ddd3d90ac90a59853f33f32af9ad825 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 19:01:36 +0100 Subject: [PATCH 22/52] changes --- README.md | 79 ++++++++++++++++++++++++++++++++++++++++++------ README2.md | 47 ---------------------------- build.sh | 4 +-- installer_win.sh | 28 ++++++++--------- 4 files changed, 86 insertions(+), 72 deletions(-) diff --git a/README.md b/README.md index 0ee0f37..c7f9391 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,83 @@ +LibreWolf for Win64 +------------------- + This repository is still a work in progress. -But we have a zip file available for testing right now.. +But we have a zip file and an installer available for testing right now.. -Download link to the prerelease alpha zip file is [here](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). +Download link to this prerelease is: +* Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). +* Installer file is: [librewolf-85.0.en-US.win64-setup.exe](). -To do: -* Creating an installer. -* Branding issues, include a good icon for librewolf.exe -* Other Branding Issues -* Improve this README.md to contain detailed instructions on how to build. +Building the package: +--------------------- For now, if you want to attempt to build, this build does require you to: * First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff * You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun) * Then clone the windows repo -* cd into it, and build with: **time bash build.sh fetch prepare build package installer_win** -* you can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux +* cd into it, and build with: **time bash build.sh** +* You can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux * This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder. +Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will +install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire +C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option, +and to get sha256sum.exe. + +build.sh +-------- + +You can perform all the steps on one go, or perform the build steps individually, to note: +* build.sh fetch prepare build package installer_win + +To do: +------ + +* Branding issues. +* Improve this README.md to contain better, detailed instructions on how to build. +* problem with old sed. does not recognize -z. using the one from Git might be a work around. + + +Branding issue: resource files +------------------------------ + +* This section is just some notes. +* Build fail on missing stubinstaller (might be a FF bug as it should just take missing +stuff from the nightly branding folder?) + +``` +$ mkdir stubinstaller +$ cp bgstub.jpg stubinstaller +$ pwd +/c/mozilla-source/firefox-85.0/browser/branding/librewolf +$ + +* checking all the different files in nightly and librewolf + +$ cd nightly +$ find . | sort > /c/mozilla-source/branding-nightly.txt +$ cd ../librewolf/ +$ find . | sort > /c/mozilla-source/branding-librewolf.txt + + +$ diff branding-nightly.txt branding-librewolf.txt +4a5,6 +> ./bgstub.jpg +> ./bgstub_2x.jpg +7a10 +> ./content/about-background.png +9,10d11 +< ./content/about-logo.svg +< ./content/about-logo@2x.png +14,15d14 +< ./content/aboutlogins.svg +< ./content/firefox-wordmark.svg +22,24d20 +< ./default22.png +< ./default24.png +< ./default256.png +$ +``` diff --git a/README2.md b/README2.md index 792bf47..73c93b4 100644 --- a/README2.md +++ b/README2.md @@ -1,12 +1,6 @@ Just some notes --------------- -Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will -install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire -C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option, -and to get sha256sum.exe. - - To build, one should use the following command in the checked out windows repo: $ time bash build.sh fetch prepare build package @@ -16,46 +10,5 @@ the final .zip is in: C:\mozilla-source\windows -* problem with old sed. does not recognize -z. using the one from Git might be a work around. -BRANDING: resource files -======================== - -* build fail on missing stubinstaller (might be a FF bug as it should just take missing -stuff from the nightly branding folder?) - -``` -$ mkdir stubinstaller -$ cp bgstub.jpg stubinstaller -$ pwd -/c/mozilla-source/firefox-85.0/browser/branding/librewolf -$ - -* checking all the different files in nightly and librewolf - -$ cd nightly -$ find . | sort > /c/mozilla-source/branding-nightly.txt -$ cd ../librewolf/ -$ find . | sort > /c/mozilla-source/branding-librewolf.txt - - -$ diff branding-nightly.txt branding-librewolf.txt -4a5,6 -> ./bgstub.jpg -> ./bgstub_2x.jpg -7a10 -> ./content/about-background.png -9,10d11 -< ./content/about-logo.svg -< ./content/about-logo@2x.png -14,15d14 -< ./content/aboutlogins.svg -< ./content/firefox-wordmark.svg -22,24d20 -< ./default22.png -< ./default24.png -< ./default256.png -$ -``` - diff --git a/build.sh b/build.sh index f071bc3..b09c882 100644 --- a/build.sh +++ b/build.sh @@ -160,6 +160,7 @@ installer_win() { } + # windows: change $PATH to find all the build tools in .mozbuild # this might do the trick on macos aswell? if [ -f '/c/mozilla-build/start-shell.bat' ]; then @@ -192,12 +193,11 @@ if [[ "$*" == *installer_win* ]]; then done_something=1 fi - +# by default, do the whole thing.. if (( done_something == 0 )); then fetch prepare build package installer_win - exit fi diff --git a/installer_win.sh b/installer_win.sh index ede8372..002adbe 100644 --- a/installer_win.sh +++ b/installer_win.sh @@ -2,23 +2,23 @@ cp -rv ../settings/* obj-x86_64-pc-mingw32/dist/librewolf # recreate the zip file.. - cd obj-x86_64-pc-mingw32/dist -# clean garbage files -rm -rf librewolf/uninstall librewolf/maintenanceservice* librewolf/pingsender.exe -# be sure to remove the previous zip file.. -rm -f librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip -zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf -/c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum -# copy the resulting zip file -rm -vf ../../../librewolf-$pkgver.en-US.win64.zip* -cp -v librewolf-$pkgver.en-US.win64.zip* ../../.. + # clean garbage files + rm -vrf librewolf/uninstall librewolf/maintenanceservice* librewolf/pingsender.exe + # be sure to remove the previous zip file.. + rm -vf librewolf-$pkgver.en-US.win64.txt librewolf-$pkgver.en-US.win64.zip + zip -r9 librewolf-$pkgver.en-US.win64.zip librewolf + /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64.zip > librewolf-$pkgver.en-US.win64.zip.sha256sum + # copy the resulting zip file + rm -vf ../../../librewolf-$pkgver.en-US.win64.zip* + cp -v librewolf-$pkgver.en-US.win64.zip* ../../.. cd ../.. # now to try to make the installer pushd .. -rm -vrf librewolf -unzip librewolf-$pkgver.en-US.win64.zip -cp -v missing_branding_files/firefox.ico librewolf/librewolf.ico -makensis-3.01.exe librewolf.nsi + rm -vrf librewolf + unzip librewolf-$pkgver.en-US.win64.zip + cp -v missing_branding_files/firefox.ico librewolf/librewolf.ico + makensis-3.01.exe librewolf.nsi + /c/mozilla-source/Git/usr/bin/sha256sum.exe librewolf-$pkgver.en-US.win64-setup.exe > librewolf-$pkgver.en-US.win64-setup.exe.sha256sum popd From 20c1f67709f88f39b71657bbe655f98768aa9a0b Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 19:01:44 +0100 Subject: [PATCH 23/52] changes --- README2.md | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 README2.md diff --git a/README2.md b/README2.md deleted file mode 100644 index 73c93b4..0000000 --- a/README2.md +++ /dev/null @@ -1,14 +0,0 @@ -Just some notes ---------------- - -To build, one should use the following command in the checked out windows repo: - -$ time bash build.sh fetch prepare build package - - -the final .zip is in: - C:\mozilla-source\windows - - - - From ae8e27122252111d5bba41072f3c07a505e2f0d8 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 22:16:54 +0100 Subject: [PATCH 24/52] changes --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c7f9391..0eed006 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,9 @@ But we have a zip file and an installer available for testing right now.. Download link to this prerelease is: * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). -* Installer file is: [librewolf-85.0.en-US.win64-setup.exe](). +* The installer is: [librewolf-85.0.en-US.win64-setup.exe](). +Note: If your version of LibreWolf does _not_ run, an additional install of the (Microsoft Visual C++ 2010 Redistributable Package (x64))[https://www.microsoft.com/en-us/download/details.aspx?id=14632] might be required. Building the package: --------------------- From 46c94f749c0dafbeff7ff82a84dd542fea3dda14 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 22:17:36 +0100 Subject: [PATCH 25/52] changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0eed006..6f86041 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Download link to this prerelease is: * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). * The installer is: [librewolf-85.0.en-US.win64-setup.exe](). -Note: If your version of LibreWolf does _not_ run, an additional install of the (Microsoft Visual C++ 2010 Redistributable Package (x64))[https://www.microsoft.com/en-us/download/details.aspx?id=14632] might be required. +Note: If your version of LibreWolf does _not_ run, an additional install of the (Microsoft Visual C++ 2010 Redistributable Package for x64)[https://www.microsoft.com/en-us/download/details.aspx?id=14632] might be required. Building the package: --------------------- From a9fddc53234767a2c97d3bf247660648ec234a8e Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 22:18:20 +0100 Subject: [PATCH 26/52] changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f86041..dc4b12f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Download link to this prerelease is: * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). * The installer is: [librewolf-85.0.en-US.win64-setup.exe](). -Note: If your version of LibreWolf does _not_ run, an additional install of the (Microsoft Visual C++ 2010 Redistributable Package for x64)[https://www.microsoft.com/en-us/download/details.aspx?id=14632] might be required. +Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)])(https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. Building the package: --------------------- From 95b0b0b23fa196519e86cc474ef485ff665dbcca Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 22:18:57 +0100 Subject: [PATCH 27/52] changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc4b12f..f63c2d2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Download link to this prerelease is: * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). * The installer is: [librewolf-85.0.en-US.win64-setup.exe](). -Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)])(https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. +Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. Building the package: --------------------- From 277f27a839d9a5094327efdb9a1b8a439c770d88 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 23:06:51 +0100 Subject: [PATCH 28/52] changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f63c2d2..69ca76c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ But we have a zip file and an installer available for testing right now.. Download link to this prerelease is: * Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). -* The installer is: [librewolf-85.0.en-US.win64-setup.exe](). +* The installer is: [librewolf-85.0.en-US.win64-setup.exe](https://gitlab.com/librewolf-community/browser/windows/uploads/ec6f7e7dc1096bf7730f503d856d3a9f/librewolf-85.0.en-US.win64-setup.exe). Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. From 5d316be30a4a64fb8ba3001c373564c21c43437d Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sat, 6 Feb 2021 23:16:18 +0100 Subject: [PATCH 29/52] changes --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 69ca76c..8a8af89 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ You can perform all the steps on one go, or perform the build steps individually To do: ------ +* Listing known issues in this README.md * Branding issues. * Improve this README.md to contain better, detailed instructions on how to build. * problem with old sed. does not recognize -z. using the one from Git might be a work around. From ac9e88ec76bfb656508b48f771c1f11cd78a4a55 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 12:40:43 +0100 Subject: [PATCH 30/52] fix librewolf icon issue --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index b09c882..d5bfe1d 100644 --- a/build.sh +++ b/build.sh @@ -121,7 +121,7 @@ END # FIXME: on windows: the stubinstaller folder is missing from the librewolf branding folder. # this might be a bug in FF however as it seems to take missing branding resources from # the nightly branding. We probably want this stuff merged into the 'common' submodule. - cp -r ../missing_branding_files/stubinstaller browser/branding/librewolf + cp -r ../missing_branding_files/* browser/branding/librewolf # just a straight copy for now.. cp ../mozconfig .mozconfig From 103a69b5cb522cd092699bcceec929b17b3c7bb8 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 19:29:41 +0100 Subject: [PATCH 31/52] changes --- README.md | 18 ++++-- build.sh | 2 +- librewolf.nsi => installer_win.nsi | 12 ++-- installer_win.sh | 97 +++++++++++++++++++++++++++++- 4 files changed, 115 insertions(+), 14 deletions(-) rename librewolf.nsi => installer_win.nsi (87%) diff --git a/README.md b/README.md index 8a8af89..72a61a4 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,14 @@ For now, if you want to attempt to build, this build does require you to: * First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff * You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun) -* Then clone the windows repo -* cd into it, and build with: **time bash build.sh** +* Then clone the windows repo: +``` +git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git +``` +* cd into it, and build with: +``` +bash build.sh +``` * You can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux * This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder. @@ -32,7 +38,9 @@ build.sh -------- You can perform all the steps on one go, or perform the build steps individually, to note: -* build.sh fetch prepare build package installer_win +``` +bash build.sh fetch prepare build package installer_win +``` To do: ------ @@ -43,8 +51,8 @@ To do: * problem with old sed. does not recognize -z. using the one from Git might be a work around. -Branding issue: resource files ------------------------------- +Branding issue(s): resource files +--------------------------------- * This section is just some notes. * Build fail on missing stubinstaller (might be a FF bug as it should just take missing diff --git a/build.sh b/build.sh index d5bfe1d..e715745 100644 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ pkgname=librewolf _pkgname=LibreWolf -pkgver=85.0 +pkgver=85.0.1 diff --git a/librewolf.nsi b/installer_win.nsi similarity index 87% rename from librewolf.nsi rename to installer_win.nsi index ff1e667..db7058a 100644 --- a/librewolf.nsi +++ b/installer_win.nsi @@ -2,12 +2,12 @@ # 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 "85.0" # the program version, like: 0.3.0 -!define ICON_NAME "librewolf.ico" # filename of icon to use for this app, this file should be in src/ -!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 +!define APPNAME "LibreWolf" # Full app name, like: "Gtk+ 2.0 Hello World" +!define PROGNAME "librewolf" # executable name, like: gtk2hello +!define PROG_VERSION "85.0.1" # 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 diff --git a/installer_win.sh b/installer_win.sh index 002adbe..e14a9f9 100644 --- a/installer_win.sh +++ b/installer_win.sh @@ -14,11 +14,104 @@ cd obj-x86_64-pc-mingw32/dist cp -v librewolf-$pkgver.en-US.win64.zip* ../../.. cd ../.. -# now to try to make the installer + + + +# generate the .nsi intaller file. +cat >../installer_win.nsi < librewolf-$pkgver.en-US.win64-setup.exe.sha256sum popd From 9c7c148bd8853f43edc11dcab08a53941ef7ffec Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 19:29:53 +0100 Subject: [PATCH 32/52] changes --- installer_win.nsi | 81 ----------------------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 installer_win.nsi diff --git a/installer_win.nsi b/installer_win.nsi deleted file mode 100644 index db7058a..0000000 --- a/installer_win.nsi +++ /dev/null @@ -1,81 +0,0 @@ -# -# 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 "85.0.1" # 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}" - - # 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} - -SectionEnd - -# Before uninstall, ask for confirmation -function un.onInit - SetShellVarContext all - - #Verify the uninstaller - last chance to back out - MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" IDOK next - Abort - next: -functionEnd - -# Uninstaller -section "uninstall" - - # Remove Start Menu launcher - delete "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.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}" - -sectionEnd From 7e43158d3234c5ceea20f5d29e261951b5290695 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 19:33:25 +0100 Subject: [PATCH 33/52] building 85.0.1 --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6580505..d98c261 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ remove_addons.patch unity-menubar.patch mozconfig Makefile -librewolf \ No newline at end of file +librewolf +installer_win.nsi From 340678f5f65d25e12c03969608bcf5f4cc6d344e Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 22:06:04 +0100 Subject: [PATCH 34/52] changes --- KNOWN_ISSUES.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 KNOWN_ISSUES.md diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md new file mode 100644 index 0000000..fc58508 --- /dev/null +++ b/KNOWN_ISSUES.md @@ -0,0 +1,8 @@ +Known Issues (2021-02-07) +------------------------- + +These issues are sorted by priority. + +* GPO (Group Policy Objects) support. [issue #3](https://gitlab.com/librewolf-community/browser/windows/-/issues/3) + + From c25cda0b12d739e0a80d4262fcc5fbb49e5776d7 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 22:35:13 +0100 Subject: [PATCH 35/52] updated known issues --- KNOWN_ISSUES.md | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md index fc58508..05d7aca 100644 --- a/KNOWN_ISSUES.md +++ b/KNOWN_ISSUES.md @@ -1,8 +1,28 @@ Known Issues (2021-02-07) ------------------------- -These issues are sorted by priority. +These issues are already reported, and sorted by priority: -* GPO (Group Policy Objects) support. [issue #3](https://gitlab.com/librewolf-community/browser/windows/-/issues/3) +* Help > About LibreWolf: It is broken and is unreadable. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* Is there any way to update? ([issue #12](https://gitlab.com/librewolf-community/browser/windows/-/issues/12)) +* Choosing a bookmark inside an empty tab loads the page in the same tab, else, if the tab is not empty, it loads in a new tab. Right-clicking on the bookmark, and selecting "Open" (which is bold) from the context menu correctly opens the link in the same tab. Essentially, unless the tab is empty, left-clicking on a link behaves as if middle-mouse-clicking on a link. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* Middle-mouse-button scrolling does not work? Is this intentional, and if yes, is there a setting to re-enable it again? ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* Previous session tabs, doesn't restoring after restart, although option is enabled in settings. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* There some issue with rendering. All looks a bit blurred, or if there no smoothing enabled. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* When I tweaked some settings according to privacytools.io and I tried coveryourtracks it gave 17 bits of data, while a vanilla hardened Firefox gave 14 bits in same Configuration. This is very concerning as librewolf is supposed to perform better than FF. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* _Theme Aspenglow_ and the minimize/maximize/close buttons don't work correctly. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* Automation builds. This seems to be a possibility mentioned [here](https://firefox-source-docs.mozilla.org/setup/windows_build.html#building-firefox-on-windows). ([issue #6](https://gitlab.com/librewolf-community/browser/windows/-/issues/6)) +* GPO (Group Policy Objects) support. ([issue #3](https://gitlab.com/librewolf-community/browser/windows/-/issues/3)) +Other issues +------------ +The following issues are not considered windows-specific: + +* [issue #8](https://gitlab.com/librewolf-community/browser/windows/-/issues/8): belongs in [LibreWolf / Settings](https://gitlab.com/librewolf-community/settings). +* [issue #9](https://gitlab.com/librewolf-community/browser/windows/-/issues/9): belongs in [LibreWolf / Settings](https://gitlab.com/librewolf-community/settings). + +The following issues are considered closed: + +* [issue #2](https://gitlab.com/librewolf-community/browser/windows/-/issues/2) +* [issue #4](https://gitlab.com/librewolf-community/browser/windows/-/issues/4) \ No newline at end of file From 768cf5aeec287ada428e1c31f8b3f93fd84c73b7 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 22:36:31 +0100 Subject: [PATCH 36/52] updated known issues --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 72a61a4..a3b96e6 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ Download link to this prerelease is: Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. +Please consult the file **KNOWN_ISSUES.md** above, to see if your issue is already reported. + Building the package: --------------------- From 7adf59acf784c73b2880957766181dbff6891966 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 22:50:42 +0100 Subject: [PATCH 37/52] updated known issues --- KNOWN_ISSUES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md index 05d7aca..7fbbed7 100644 --- a/KNOWN_ISSUES.md +++ b/KNOWN_ISSUES.md @@ -4,11 +4,11 @@ Known Issues (2021-02-07) These issues are already reported, and sorted by priority: * Help > About LibreWolf: It is broken and is unreadable. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* Previous session tabs, doesn't restoring after restart, although option is enabled in settings. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* There some issue with rendering. All looks a bit blurred, or if there no smoothing enabled. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) * Is there any way to update? ([issue #12](https://gitlab.com/librewolf-community/browser/windows/-/issues/12)) * Choosing a bookmark inside an empty tab loads the page in the same tab, else, if the tab is not empty, it loads in a new tab. Right-clicking on the bookmark, and selecting "Open" (which is bold) from the context menu correctly opens the link in the same tab. Essentially, unless the tab is empty, left-clicking on a link behaves as if middle-mouse-clicking on a link. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) * Middle-mouse-button scrolling does not work? Is this intentional, and if yes, is there a setting to re-enable it again? ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) -* Previous session tabs, doesn't restoring after restart, although option is enabled in settings. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) -* There some issue with rendering. All looks a bit blurred, or if there no smoothing enabled. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) * When I tweaked some settings according to privacytools.io and I tried coveryourtracks it gave 17 bits of data, while a vanilla hardened Firefox gave 14 bits in same Configuration. This is very concerning as librewolf is supposed to perform better than FF. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) * _Theme Aspenglow_ and the minimize/maximize/close buttons don't work correctly. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) * Automation builds. This seems to be a possibility mentioned [here](https://firefox-source-docs.mozilla.org/setup/windows_build.html#building-firefox-on-windows). ([issue #6](https://gitlab.com/librewolf-community/browser/windows/-/issues/6)) From a24b0a595dd727cac5602c57438b46089152acb9 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 23:05:43 +0100 Subject: [PATCH 38/52] added documentation: HOW_TO_BUILD.md and TODO.md --- HOW_TO_BUILD.md | 31 +++++++++++++++++++ README.md | 81 ------------------------------------------------- TODO.md | 50 ++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 81 deletions(-) create mode 100644 HOW_TO_BUILD.md create mode 100644 TODO.md diff --git a/HOW_TO_BUILD.md b/HOW_TO_BUILD.md new file mode 100644 index 0000000..78d92b5 --- /dev/null +++ b/HOW_TO_BUILD.md @@ -0,0 +1,31 @@ + +Building the package: +--------------------- + +For now, if you want to attempt to build, this build does require you to: + +* First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff +* You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun) +* Then clone the windows repo: +``` +git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git +``` +* cd into it, and build with: +``` +bash build.sh +``` +* You can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux +* This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder. + +Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will +install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire +C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option, +and to get sha256sum.exe. + +build.sh +-------- + +You can perform all the steps on one go, or perform the build steps individually, to note: +``` +bash build.sh fetch prepare build package installer_win +``` diff --git a/README.md b/README.md index a3b96e6..efdcb16 100644 --- a/README.md +++ b/README.md @@ -12,84 +12,3 @@ Download link to this prerelease is: Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. Please consult the file **KNOWN_ISSUES.md** above, to see if your issue is already reported. - -Building the package: ---------------------- - -For now, if you want to attempt to build, this build does require you to: - -* First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff -* You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun) -* Then clone the windows repo: -``` -git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git -``` -* cd into it, and build with: -``` -bash build.sh -``` -* You can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux -* This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder. - -Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will -install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire -C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option, -and to get sha256sum.exe. - -build.sh --------- - -You can perform all the steps on one go, or perform the build steps individually, to note: -``` -bash build.sh fetch prepare build package installer_win -``` - -To do: ------- - -* Listing known issues in this README.md -* Branding issues. -* Improve this README.md to contain better, detailed instructions on how to build. -* problem with old sed. does not recognize -z. using the one from Git might be a work around. - - -Branding issue(s): resource files ---------------------------------- - -* This section is just some notes. -* Build fail on missing stubinstaller (might be a FF bug as it should just take missing -stuff from the nightly branding folder?) - -``` -$ mkdir stubinstaller -$ cp bgstub.jpg stubinstaller -$ pwd -/c/mozilla-source/firefox-85.0/browser/branding/librewolf -$ - -* checking all the different files in nightly and librewolf - -$ cd nightly -$ find . | sort > /c/mozilla-source/branding-nightly.txt -$ cd ../librewolf/ -$ find . | sort > /c/mozilla-source/branding-librewolf.txt - - -$ diff branding-nightly.txt branding-librewolf.txt -4a5,6 -> ./bgstub.jpg -> ./bgstub_2x.jpg -7a10 -> ./content/about-background.png -9,10d11 -< ./content/about-logo.svg -< ./content/about-logo@2x.png -14,15d14 -< ./content/aboutlogins.svg -< ./content/firefox-wordmark.svg -22,24d20 -< ./default22.png -< ./default24.png -< ./default256.png -$ -``` diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..215d26e --- /dev/null +++ b/TODO.md @@ -0,0 +1,50 @@ +Things to do: +------------- + +These are ordered by priority: + +* Create an HOW_TO_BUILD.md to contain better, detailed instructions on how to build. +* Branding issues. We're going to need an MR with [LibreWolf / Browser / Common](https://gitlab.com/librewolf-community/browser/common) at some point. +* problem with old sed. does not recognize -z. using the one from Git might be a work around. + +Notes on the branding issue(s): +------------------------------- + +* This section is just some notes. +* Build fail on missing stubinstaller (might be a FF bug as it should just take missing +stuff from the nightly branding folder?) + +``` +$ mkdir stubinstaller +$ cp bgstub.jpg stubinstaller +$ pwd +/c/mozilla-source/firefox-85.0/browser/branding/librewolf +$ + +* checking all the different files in nightly and librewolf + +$ cd nightly +$ find . | sort > /c/mozilla-source/branding-nightly.txt +$ cd ../librewolf/ +$ find . | sort > /c/mozilla-source/branding-librewolf.txt + + +$ diff branding-nightly.txt branding-librewolf.txt +4a5,6 +> ./bgstub.jpg +> ./bgstub_2x.jpg +7a10 +> ./content/about-background.png +9,10d11 +< ./content/about-logo.svg +< ./content/about-logo@2x.png +14,15d14 +< ./content/aboutlogins.svg +< ./content/firefox-wordmark.svg +22,24d20 +< ./default22.png +< ./default24.png +< ./default256.png +$ +``` + From d92f75640223d362f43ff16544f779a3975c94f0 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 23:16:02 +0100 Subject: [PATCH 39/52] updated todo.md --- TODO.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/TODO.md b/TODO.md index 215d26e..3db90a0 100644 --- a/TODO.md +++ b/TODO.md @@ -3,9 +3,14 @@ Things to do: These are ordered by priority: +* IPV6 issues, it's not working properly? * Create an HOW_TO_BUILD.md to contain better, detailed instructions on how to build. * Branding issues. We're going to need an MR with [LibreWolf / Browser / Common](https://gitlab.com/librewolf-community/browser/common) at some point. * problem with old sed. does not recognize -z. using the one from Git might be a work around. +* What IP address does LW show on my sb site, and why does it show anything at all when Bing does show +the ip address of my nginx? what header stuff is going on? +* why does this anoying thing happen to my 'copy username' menu in lastpass (the local menu shows up) +* Theme AspenGlow: why does the three buttons disapear when i use the underwater screen ctrl-shift-i Notes on the branding issue(s): ------------------------------- From 8cb935a62b03c63d6c851e036e6f927a1d161b2e Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 23:21:59 +0100 Subject: [PATCH 40/52] minor changes --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d98c261..014d69f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ mozconfig Makefile librewolf installer_win.nsi +firefox-85.0.find From 4a9f5527991afa2e50a5b78ed5639d03060fe936 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 23:30:21 +0100 Subject: [PATCH 41/52] changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index efdcb16..a437b6c 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ This repository is still a work in progress. But we have a zip file and an installer available for testing right now.. Download link to this prerelease is: -* Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). * The installer is: [librewolf-85.0.en-US.win64-setup.exe](https://gitlab.com/librewolf-community/browser/windows/uploads/ec6f7e7dc1096bf7730f503d856d3a9f/librewolf-85.0.en-US.win64-setup.exe). +* Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. From ef74ecd5c7e4109a5b37212659cdc216bb779a97 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Sun, 7 Feb 2021 23:44:23 +0100 Subject: [PATCH 42/52] changes --- KNOWN_ISSUES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md index 7fbbed7..84aee37 100644 --- a/KNOWN_ISSUES.md +++ b/KNOWN_ISSUES.md @@ -4,14 +4,14 @@ Known Issues (2021-02-07) These issues are already reported, and sorted by priority: * Help > About LibreWolf: It is broken and is unreadable. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) +* Automation builds. This seems to be a possibility mentioned [here](https://firefox-source-docs.mozilla.org/setup/windows_build.html#building-firefox-on-windows). ([issue #6](https://gitlab.com/librewolf-community/browser/windows/-/issues/6)) +* Is there any way to update? ([issue #12](https://gitlab.com/librewolf-community/browser/windows/-/issues/12)) * Previous session tabs, doesn't restoring after restart, although option is enabled in settings. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) * There some issue with rendering. All looks a bit blurred, or if there no smoothing enabled. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) -* Is there any way to update? ([issue #12](https://gitlab.com/librewolf-community/browser/windows/-/issues/12)) * Choosing a bookmark inside an empty tab loads the page in the same tab, else, if the tab is not empty, it loads in a new tab. Right-clicking on the bookmark, and selecting "Open" (which is bold) from the context menu correctly opens the link in the same tab. Essentially, unless the tab is empty, left-clicking on a link behaves as if middle-mouse-clicking on a link. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) * Middle-mouse-button scrolling does not work? Is this intentional, and if yes, is there a setting to re-enable it again? ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) * When I tweaked some settings according to privacytools.io and I tried coveryourtracks it gave 17 bits of data, while a vanilla hardened Firefox gave 14 bits in same Configuration. This is very concerning as librewolf is supposed to perform better than FF. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) * _Theme Aspenglow_ and the minimize/maximize/close buttons don't work correctly. ([issue #11](https://gitlab.com/librewolf-community/browser/windows/-/issues/11)) -* Automation builds. This seems to be a possibility mentioned [here](https://firefox-source-docs.mozilla.org/setup/windows_build.html#building-firefox-on-windows). ([issue #6](https://gitlab.com/librewolf-community/browser/windows/-/issues/6)) * GPO (Group Policy Objects) support. ([issue #3](https://gitlab.com/librewolf-community/browser/windows/-/issues/3)) Other issues From cf605f8a1bfd91339c34b9cc16da6eb1dfcf2190 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Mon, 8 Feb 2021 10:59:26 +0100 Subject: [PATCH 43/52] updated HOW_TO_BUILD.md --- HOW_TO_BUILD.md | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/HOW_TO_BUILD.md b/HOW_TO_BUILD.md index 78d92b5..2fd8022 100644 --- a/HOW_TO_BUILD.md +++ b/HOW_TO_BUILD.md @@ -1,11 +1,13 @@ +Building the package means first getting FF itself to build: +------------------------------------------------------------ -Building the package: ---------------------- +These instructions are for an _interactive_ build. -For now, if you want to attempt to build, this build does require you to: - -* First build the mozilla-unified as explained in the mozilla docs, using all the ./mach bootstrap stuff -* You can delete this mozilla-unified thing to save some space (try ./mach run on it just for fun) +* Follow the guidelines in the [Building Firefox On Windows](https://firefox-source-docs.mozilla.org/setup/windows_build.html) documentation from mozilla.org. And I actually recommend to follow this documentation until you have a working |mach run|. I also recommend using Git, not Mercurial, as we're going to need it later in our build.sh. +* Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire +C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option, +and to get sha256sum.exe. +* You can now delete the mozilla-unified folder, or keep it, if you want to play with FF itself. * Then clone the windows repo: ``` git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git @@ -14,13 +16,7 @@ git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git ``` bash build.sh ``` -* You can perform each of the build steps individually and the overall script structure follows PKGBULD as used on Archlinux -* This will produce a **librewolf-85.0.en-US.win64.zip** in this windows folder. - -Once you have built the entire mozilla-unified with all the mach bootstrap stuff (which will -install the needed binaries in $HOME/.mozbuild), don't forget to copy the entire -C:\Program Files\Git folder to /c/mozilla-source to get a sed.exe that understands the -z option, -and to get sha256sum.exe. +* This should produce a zip and installer exe in your top folder. build.sh -------- From 0507a585dd632625ba0833b1809629bc71aee100 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Mon, 8 Feb 2021 11:54:39 +0100 Subject: [PATCH 44/52] changes --- README.md | 4 +--- build.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a437b6c..431390a 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,7 @@ This repository is still a work in progress. But we have a zip file and an installer available for testing right now.. -Download link to this prerelease is: -* The installer is: [librewolf-85.0.en-US.win64-setup.exe](https://gitlab.com/librewolf-community/browser/windows/uploads/ec6f7e7dc1096bf7730f503d856d3a9f/librewolf-85.0.en-US.win64-setup.exe). -* Zip file is: [librewolf-85.0.en-US.win64.zip](https://gitlab.com/librewolf-community/browser/windows/uploads/5e9d436515d315d4e8953f88bf02bd99/librewolf-85.0.en-US.win64.zip). +**Downloads**: To get the installer, the zipped version, and the sha256sum checksums, head over to the [releases](https://gitlab.com/librewolf-community/browser/windows/-/releases) page. Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. diff --git a/build.sh b/build.sh index e715745..0e421d2 100644 --- a/build.sh +++ b/build.sh @@ -9,12 +9,12 @@ pkgver=85.0.1 fetch() { - rm -f firefox-$pkgver.source.tar.xz + rm -vf firefox-$pkgver.source.tar.xz wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz # the settings and common submodules should be checked out to allow the build - rm -f megabar.patch remove_addons.patch unity-menubar.patch + rm -vf megabar.patch remove_addons.patch unity-menubar.patch wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/remove_addons.patch wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/unity-menubar.patch @@ -23,7 +23,9 @@ fetch() { prepare() { + echo "Deleting previous firefox-${pkgver} ..." rm -rf firefox-$pkgver + echo "Extracting firefox-$pkgver.source.tar.xz ..." tar xf firefox-$pkgver.source.tar.xz cd firefox-$pkgver @@ -63,6 +65,9 @@ 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 From aa4abeceb8b97529427566465c778597b3890eff Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Mon, 8 Feb 2021 11:55:28 +0100 Subject: [PATCH 45/52] changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 431390a..1d30a94 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This repository is still a work in progress. But we have a zip file and an installer available for testing right now.. -**Downloads**: To get the installer, the zipped version, and the sha256sum checksums, head over to the [releases](https://gitlab.com/librewolf-community/browser/windows/-/releases) page. +**Downloads**: To get the installer, the zipped version, and the sha256sum checksums, head over to the **[releases](https://gitlab.com/librewolf-community/browser/windows/-/releases)** page. Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. From 61c8cb03365df891f4348e300545756eb11b67b7 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Mon, 8 Feb 2021 12:00:55 +0100 Subject: [PATCH 46/52] changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d30a94..b30e8fc 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,6 @@ But we have a zip file and an installer available for testing right now.. **Downloads**: To get the installer, the zipped version, and the sha256sum checksums, head over to the **[releases](https://gitlab.com/librewolf-community/browser/windows/-/releases)** page. -Note: If your version of LibreWolf does _not_ run, an additional install of the [Microsoft Visual C++ 2010 Redistributable Package (x64)](https://www.microsoft.com/en-us/download/details.aspx?id=14632) might be required. +Note: If your version of LibreWolf does _not_ run, an additional install of the [vc_redist.x64.exe](https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0) component for 'Visual Studio 2015, 2017 and 2019' might be required. Please consult the file **KNOWN_ISSUES.md** above, to see if your issue is already reported. From b433cc4859f38229085c275d09f19ecf9af2e941 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Mon, 8 Feb 2021 12:03:28 +0100 Subject: [PATCH 47/52] changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b30e8fc..e9a057b 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,6 @@ But we have a zip file and an installer available for testing right now.. **Downloads**: To get the installer, the zipped version, and the sha256sum checksums, head over to the **[releases](https://gitlab.com/librewolf-community/browser/windows/-/releases)** page. -Note: If your version of LibreWolf does _not_ run, an additional install of the [vc_redist.x64.exe](https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0) component for 'Visual Studio 2015, 2017 and 2019' might be required. +Note: If your version of LibreWolf does _not_ run, an additional install of the [vc_redist.x64.exe](https://aka.ms/vs/16/release/VC_redist.x64.exe) component might be required. Please consult the file **KNOWN_ISSUES.md** above, to see if your issue is already reported. From e2fdc3a124a9da299036dae328311053768d2d3b Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Mon, 8 Feb 2021 17:58:53 +0100 Subject: [PATCH 48/52] first cleanup of the about dialog box --- .gitignore | 1 - HOW_TO_BUILD.md | 1 + .../content/about-background.png | Bin 0 -> 39974 bytes .../content/aboutDialog.css | 54 ++++++++++++++++++ .../pref/firefox-branding.js | 7 +++ 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 missing_branding_files/content/about-background.png create mode 100644 missing_branding_files/content/aboutDialog.css create mode 100644 missing_branding_files/pref/firefox-branding.js diff --git a/.gitignore b/.gitignore index 014d69f..d98c261 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ mozconfig Makefile librewolf installer_win.nsi -firefox-85.0.find diff --git a/HOW_TO_BUILD.md b/HOW_TO_BUILD.md index 2fd8022..4ba5c07 100644 --- a/HOW_TO_BUILD.md +++ b/HOW_TO_BUILD.md @@ -25,3 +25,4 @@ You can perform all the steps on one go, or perform the build steps individually ``` bash build.sh fetch prepare build package installer_win ``` + diff --git a/missing_branding_files/content/about-background.png b/missing_branding_files/content/about-background.png new file mode 100644 index 0000000000000000000000000000000000000000..21326777ce2354c931a5f57b174c6ff685064cdf GIT binary patch literal 39974 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 vFw4KaWDO! Date: Mon, 8 Feb 2021 18:14:25 +0100 Subject: [PATCH 49/52] changes --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index 0e421d2..e945e65 100644 --- a/build.sh +++ b/build.sh @@ -9,11 +9,13 @@ pkgver=85.0.1 fetch() { + # fetch the firefox source. rm -vf firefox-$pkgver.source.tar.xz wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz # the settings and common submodules should be checked out to allow the build + # get the patches rm -vf megabar.patch remove_addons.patch unity-menubar.patch wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/remove_addons.patch From 228479b2f147ef54761eb03fde4e45f591b10f8c Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Tue, 9 Feb 2021 09:36:05 +0100 Subject: [PATCH 50/52] changes --- build.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/build.sh b/build.sh index e945e65..076c9e8 100644 --- a/build.sh +++ b/build.sh @@ -13,13 +13,14 @@ fetch() { rm -vf firefox-$pkgver.source.tar.xz wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz - # the settings and common submodules should be checked out to allow the build - + # the settings and common submodules should be checked out with --recursive to allow the build + # get the patches - rm -vf megabar.patch remove_addons.patch unity-menubar.patch - wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch - wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/remove_addons.patch - wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/unity-menubar.patch + echo 'Getting patches..' + rm -f megabar.patch remove_addons.patch unity-menubar.patch + wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch + wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/remove_addons.patch + wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/unity-menubar.patch } @@ -44,7 +45,7 @@ ac_add_options --enable-hardening ac_add_options --enable-rust-simd -# as suggested by Mental Outlaw in https://www.youtube.com/watch?v=L2otiFy4ADI +# Does anybody even use webrtc? waiting for an issue on it.. ac_add_options --disable-webrtc @@ -72,8 +73,9 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0 #WIN32_REDIST_DIR=$VCINSTALLDIR\redist\x86\Microsoft.VC141.CRT END + echo 'Applying patches...' - + # Apply patches.. patch -p1 -i ../remove_addons.patch patch -p1 -i ../megabar.patch patch -p1 -i ../unity-menubar.patch @@ -82,6 +84,7 @@ END # Disabling Pocket sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build + # this one only to remove an annoying error message: sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/BrowserGlue.jsm @@ -122,7 +125,7 @@ END cp -r ../common/source_files/* ./ # FIXME: this 'mozconfig' file in the 'common' submodule should be removed - # this submodule is purely for the branding. + # this submodule is purely for the branding. (not removing this breaks the build) rm -f mozconfig # FIXME: on windows: the stubinstaller folder is missing from the librewolf branding folder. @@ -140,9 +143,7 @@ END build() { cd firefox-$pkgver - ./mach build - cd .. } @@ -150,12 +151,12 @@ build() { package() { cd firefox-$pkgver - ./mach package - cd .. } + + installer_win() { cd firefox-$pkgver From 365d5be64d775db688896cdbf27945033bf81eb7 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Tue, 9 Feb 2021 15:28:22 +0100 Subject: [PATCH 51/52] testing gnupg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9a057b..dc9a603 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ But we have a zip file and an installer available for testing right now.. Note: If your version of LibreWolf does _not_ run, an additional install of the [vc_redist.x64.exe](https://aka.ms/vs/16/release/VC_redist.x64.exe) component might be required. -Please consult the file **KNOWN_ISSUES.md** above, to see if your issue is already reported. +Please consult the file KNOWN_ISSUES.md above, to see if your issue is already reported. From 9ee9666e1c74328d5c899fb595aae09e3611974b Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 10 Feb 2021 21:59:42 +0100 Subject: [PATCH 52/52] Restored README.md formatting --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc9a603..49c31bc 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ But we have a zip file and an installer available for testing right now.. Note: If your version of LibreWolf does _not_ run, an additional install of the [vc_redist.x64.exe](https://aka.ms/vs/16/release/VC_redist.x64.exe) component might be required. -Please consult the file KNOWN_ISSUES.md above, to see if your issue is already reported. +Please consult the file _KNOWN_ISSUES.md_ above, to see if your issue is already reported.