librewolf-bot/windows
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renamed -experimental to -permissive, a much better name.

Browse source
This commit is contained in:
Bert van der Weerd 2021-03-31 16:50:48 +02:00
parent ac27acc4b5
commit fa64d80122
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
8 changed files with 60 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -8,4 +8,4 @@ mozilla-vpn-ad.patch
mozconfig mozconfig
librewolf librewolf
tmp.nsi tmp.nsi
tmp-experimental.nsi tmp-permissive.nsi

14
artifacts_deb.sh
View file

@ -32,19 +32,19 @@ if [ $? -ne 0 ]; then exit 1; fi
# now to try to make the installer # now to try to make the installer
# (create a .deb here) # (create a .deb here)
# patch to experimental config # patch to permissive config
if [ ! -z $experimental ]; then if [ ! -z $permissive ]; then
pushd librewolf pushd librewolf
echo "Applying experimental patches..." echo "Applying permissive patches..."
patch -p1 -i ../patches/experimental/librewolf-config.patch patch -p1 -i ../patches/permissive/librewolf-config.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
patch -p1 -i ../patches/experimental/librewolf-policies.patch patch -p1 -i ../patches/permissive/librewolf-policies.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
popd popd
# create the final zip artifact # create the final zip artifact
rm -f librewolf-$pkgver.en-US.$ospkg-experimental.zip rm -f librewolf-$pkgver.en-US.$ospkg-permissive.zip
zip -qr9 librewolf-$pkgver.en-US.$ospkg-experimental.zip librewolf zip -qr9 librewolf-$pkgver.en-US.$ospkg-permissive.zip librewolf
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
# now to try to make the installer # now to try to make the installer

14
artifacts_rpm.sh
View file

@ -33,19 +33,19 @@ if [ $? -ne 0 ]; then exit 1; fi
# now to try to make the installer # now to try to make the installer
# (create a .deb here) # (create a .deb here)
# patch to experimental config # patch to permissive config
if [ ! -z $experimental ]; then if [ ! -z $permissive ]; then
pushd librewolf pushd librewolf
echo "Applying experimental patches..." echo "Applying permissive patches..."
patch -p1 -i ../patches/experimental/librewolf-config.patch patch -p1 -i ../patches/permissive/librewolf-config.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
patch -p1 -i ../patches/experimental/librewolf-policies.patch patch -p1 -i ../patches/permissive/librewolf-policies.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
popd popd
# create the final zip artifact # create the final zip artifact
rm -f librewolf-$pkgver.en-US.$ospkg-experimental.zip rm -f librewolf-$pkgver.en-US.$ospkg-permissive.zip
zip -qr9 librewolf-$pkgver.en-US.$ospkg-experimental.zip librewolf zip -qr9 librewolf-$pkgver.en-US.$ospkg-permissive.zip librewolf
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
# now to try to make the installer # now to try to make the installer

20
artifacts_win.sh
View file

@ -35,25 +35,25 @@ sed "s/pkg_version/$pkgver/g" < artifacts_win.nsi > tmp.nsi
makensis-3.01.exe -V1 tmp.nsi makensis-3.01.exe -V1 tmp.nsi
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
# patch to experimental config # patch to permissive config
if [ ! -z $experimental ]; then if [ ! -z $permissive ]; then
pushd librewolf pushd librewolf
echo "Applying experimental patches..." echo "Applying permissive patches..."
patch -p1 -i ../patches/experimental/librewolf-config.patch patch -p1 -i ../patches/permissive/librewolf-config.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
patch -p1 -i ../patches/experimental/librewolf-policies.patch patch -p1 -i ../patches/permissive/librewolf-policies.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
popd popd
# create the final zip artifact # create the final zip artifact
rm -f librewolf-$pkgver.en-US.$ospkg-experimental.zip rm -f librewolf-$pkgver.en-US.$ospkg-permissive.zip
zip -qr9 librewolf-$pkgver.en-US.$ospkg-experimental.zip librewolf zip -qr9 librewolf-$pkgver.en-US.$ospkg-permissive.zip librewolf
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
# now to try to make the installer # now to try to make the installer
rm -f librewolf-$pkgver.en-US.win64-experimental-setup.exe tmp-experimental.nsi rm -f librewolf-$pkgver.en-US.win64-permissive-setup.exe tmp-permissive.nsi
sed "s/win64-setup/win64-experimental-setup/g" < tmp.nsi > tmp-experimental.nsi sed "s/win64-setup/win64-permissive-setup/g" < tmp.nsi > tmp-permissive.nsi
makensis-3.01.exe -V1 tmp-experimental.nsi makensis-3.01.exe -V1 tmp-permissive.nsi
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
fi fi

44
build.sh
View file

@ -54,13 +54,13 @@ clean() {
# windows # windows
rm -f librewolf-$pkgver.en-US.win64.zip rm -f librewolf-$pkgver.en-US.win64.zip
rm -f librewolf-$pkgver.en-US.win64-setup.exe rm -f librewolf-$pkgver.en-US.win64-setup.exe
rm -f librewolf-$pkgver.en-US.win64-experimental.zip rm -f librewolf-$pkgver.en-US.win64-permissive.zip
rm -f librewolf-$pkgver.en-US.win64-experimental-setup.exe rm -f librewolf-$pkgver.en-US.win64-permissive-setup.exe
rm -f tmp.nsi tmp-experimental.nsi rm -f tmp.nsi tmp-permissive.nsi
# linux # linux
rm -f librewolf-$pkgver.en-US.deb.zip rm -f librewolf-$pkgver.en-US.deb.zip
rm -f librewolf-$pkgver.en-US.deb-experimental.zip rm -f librewolf-$pkgver.en-US.deb-permissive.zip
rm -f librewolf-$pkgver.en-US.rpm.zip rm -f librewolf-$pkgver.en-US.rpm.zip
echo "clean: done." echo "clean: done."
@ -318,14 +318,14 @@ git_subs() {
} }
# #
# Experimental configuration options # Permissive configuration options
# #
config_diff() { config_diff() {
pushd settings > /dev/null pushd settings > /dev/null
cp "/c/Program Files/LibreWolf/librewolf.cfg" librewolf.cfg cp "/c/Program Files/LibreWolf/librewolf.cfg" librewolf.cfg
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
git diff librewolf.cfg > ../patches/experimental/librewolf-config.patch git diff librewolf.cfg > ../patches/permissive/librewolf-config.patch
git diff librewolf.cfg git diff librewolf.cfg
git checkout librewolf.cfg > /dev/null 2>&1 git checkout librewolf.cfg > /dev/null 2>&1
popd > /dev/null popd > /dev/null
@ -335,7 +335,7 @@ policies_diff() {
pushd settings/distribution > /dev/null pushd settings/distribution > /dev/null
cp "/c/Program Files/LibreWolf/distribution/policies.json" policies.json cp "/c/Program Files/LibreWolf/distribution/policies.json" policies.json
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
git diff policies.json > ../../patches/experimental/librewolf-policies.patch git diff policies.json > ../../patches/permissive/librewolf-policies.patch
git diff policies.json git diff policies.json
git checkout policies.json > /dev/null 2>&1 git checkout policies.json > /dev/null 2>&1
popd > /dev/null popd > /dev/null
@ -370,8 +370,8 @@ git_init() {
# windows: change $PATH to find all the build tools in .mozbuild # windows: change $PATH to find all the build tools in .mozbuild
# this might do the trick on macos aswell? # this might do the trick on macos aswell?
if [ -f '/c/mozilla-build/start-shell.bat' ]; then 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 TPATH="$HOME/.mozbuild/clang/bin:$HOME/.mozbuild/cbindgen:$HOME/.mozbuild/node:$HOME/.mozbuild/nasm"
export PATH=$TPATH:$PATH export PATH="$TPATH:$PATH"
fi fi
if [ -f "$HOME/.cargo/env" ]; then if [ -f "$HOME/.cargo/env" ]; then
@ -401,7 +401,7 @@ if [[ "$*" == *all* ]]; then
extract extract
do_patches do_patches
build build
experimental=experimental permissive=permissive
artifacts_win artifacts_win
done_something=1 done_something=1
fi fi
@ -458,8 +458,8 @@ fi
# creating the artifacts... # creating the artifacts...
if [[ "$*" == *artifacts_exp* ]]; then if [[ "$*" == *artifacts_perm* ]]; then
experimental=experimental permissive=permissive
artifacts_win artifacts_win
done_something=1 done_something=1
else else
@ -468,8 +468,8 @@ else
done_something=1 done_something=1
fi fi
fi fi
if [[ "$*" == *artifacts_deb_exp* ]]; then if [[ "$*" == *artifacts_deb_perm* ]]; then
experimental=experimental permissive=permissive
artifacts_deb artifacts_deb
done_something=1 done_something=1
else else
@ -478,8 +478,8 @@ else
done_something=1 done_something=1
fi fi
fi fi
if [[ "$*" == *artifacts_rpm_exp* ]]; then if [[ "$*" == *artifacts_rpm_perm* ]]; then
experimental=experimental permissive=permissive
artifacts_rpm artifacts_rpm
done_something=1 done_something=1
else else
@ -515,18 +515,20 @@ Use: ./build.sh fetch extract do_patches build artifacts_win
extract - extract the tarball. extract - extract the tarball.
do_patches - create a mozconfig, and patch the source. do_patches - create a mozconfig, and patch the source.
build - the actual build. build - the actual build.
artifacts_win - apply .cfg, build the zip file and NSIS setup.exe installer. artifacts_win - apply .cfg, build the zip file and NSIS setup.exe installer.
artifacts_exp - package as above, but use the experimental config/policies. artifacts_perm - package as above, but use the permissive config/policies.
Linux related functions: Linux related functions:
deps_deb - install dependencies with apt. deps_deb - install dependencies with apt.
deps_rpm - install dependencies with dnf. deps_rpm - install dependencies with dnf.
deps_pkg - install dependencies with pkg. deps_pkg - install dependencies with pkg. (freebsd)
artifacts_deb - apply .cfg, create a dist zip file (for debian10). artifacts_deb - apply .cfg, create a dist zip file (for debian10).
artifacts_deb_exp - include experimental build. artifacts_deb_perm - include permissive build.
artifacts_rpm - apply .cfg, create a dist zip file (for fedora33). artifacts_rpm - apply .cfg, create a dist zip file (for fedora33).
artifacts_rpm_exp - include experimental build. artifacts_rpm_perm - include permissive build.
Generic utility functionality: Generic utility functionality:
@ -534,7 +536,7 @@ Generic utility functionality:
rustup - perform a rustup for this user. rustup - perform a rustup for this user.
clean - remove generated cruft. clean - remove generated cruft.
all - build all, produce all artifacts including -experimental. all - build all, produce all artifacts including -permissive.
git_subs - update git submodules. git_subs - update git submodules.
config_diff - diff between my .cfg and dist .cfg file. (win10) config_diff - diff between my .cfg and dist .cfg file. (win10)
policies_diff - diff between my policies and the dist policies. (win10) policies_diff - diff between my policies and the dist policies. (win10)

4
patches/experimental/README.md → patches/permissive/README.md
View file

@ -1,9 +1,11 @@
# current differences between -release and -experimental # current differences between -release and -permissive
## librewolf.cfg: ## librewolf.cfg:
* lockPref("dom.w3c_pointer_events.enabled", true); -> This fixes YouTube picture-in-picture. * lockPref("dom.w3c_pointer_events.enabled", true); -> This fixes YouTube picture-in-picture.
* defaultPref("dom.event.contextmenu.enabled", true); -> This fixes lastpass.com context menu. * defaultPref("dom.event.contextmenu.enabled", true); -> This fixes lastpass.com context menu.
* defaultPref("extensions.update.url", ""); -> enable in-app manual check for extension updates. * defaultPref("extensions.update.url", ""); -> enable in-app manual check for extension updates.
* Attempting new cookie behavior (use Settings > Cookies and Site Data > Manage Exceptions), these are the last three preferences in the cfg file: privacy.clearOnShutdown.cookies, privacy.clearOnShutdown.offlineApps, network.cookie.lifetimePolicy. * Attempting new cookie behavior (use Settings > Cookies and Site Data > Manage Exceptions), these are the last three preferences in the cfg file: privacy.clearOnShutdown.cookies, privacy.clearOnShutdown.offlineApps, network.cookie.lifetimePolicy.

0
patches/experimental/librewolf-config.patch → patches/permissive/librewolf-config.patch
View file

0
patches/experimental/librewolf-policies.patch → patches/permissive/librewolf-policies.patch
View file