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

Moved experimental patches into patches/experimental

Browse source
This commit is contained in:
Bert van der Weerd 2021-03-29 07:52:37 +02:00
parent 955fba899c
commit 21abdd645d
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
6 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
artifacts_deb.sh
View file

@ -36,9 +36,9 @@ if [ $? -ne 0 ]; then exit 1; fi
if [ ! -z $experimental ]; then if [ ! -z $experimental ]; then
pushd librewolf pushd librewolf
echo "Applying experimental patches..." echo "Applying experimental patches..."
patch -p1 -i ../patches/librewolf-config.patch patch -p1 -i ../patches/experimental/librewolf-config.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
patch -p1 -i ../patches/librewolf-policies.patch patch -p1 -i ../patches/experimental/librewolf-policies.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
popd popd

4
artifacts_rpm.sh
View file

@ -37,9 +37,9 @@ if [ $? -ne 0 ]; then exit 1; fi
if [ ! -z $experimental ]; then if [ ! -z $experimental ]; then
pushd librewolf pushd librewolf
echo "Applying experimental patches..." echo "Applying experimental patches..."
patch -p1 -i ../patches/librewolf-config.patch patch -p1 -i ../patches/experimental/librewolf-config.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
patch -p1 -i ../patches/librewolf-policies.patch patch -p1 -i ../patches/experimental/librewolf-policies.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
popd popd

4
artifacts_win.sh
View file

@ -39,9 +39,9 @@ if [ $? -ne 0 ]; then exit 1; fi
if [ ! -z $experimental ]; then if [ ! -z $experimental ]; then
pushd librewolf pushd librewolf
echo "Applying experimental patches..." echo "Applying experimental patches..."
patch -p1 -i ../patches/librewolf-config.patch patch -p1 -i ../patches/experimental/librewolf-config.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
patch -p1 -i ../patches/librewolf-policies.patch patch -p1 -i ../patches/experimental/librewolf-policies.patch
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
popd popd

25
build.sh
View file

@ -10,6 +10,9 @@ set -e
pkgver=87.0 pkgver=87.0
#
# Dependencies for linux/freebsd.
#
deps_deb() { deps_deb() {
echo "deps_deb: begin." echo "deps_deb: begin."
@ -32,6 +35,10 @@ deps_pkg() {
echo "deps_pkg: done." echo "deps_pkg: done."
} }
#
# Basic functionality
#
clean() { clean() {
echo "clean: begin." echo "clean: begin."
@ -90,6 +97,11 @@ extract() {
} }
#
# LibreWolf specific mozconfig and patches
#
create_mozconfig() { create_mozconfig() {
cat >../mozconfig <<END cat >../mozconfig <<END
ac_add_options --enable-application=browser ac_add_options --enable-application=browser
@ -129,6 +141,7 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0
END END
} }
do_patches() { do_patches() {
echo "do_patches: begin." echo "do_patches: begin."
@ -177,7 +190,6 @@ do_patches() {
# just a straight copy for now.. # just a straight copy for now..
cp -v ../mozconfig . cp -v ../mozconfig .
# on freebsd we're called gsed.. # on freebsd we're called gsed..
set +e set +e
sed=sed sed=sed
@ -363,7 +375,8 @@ git_subs() {
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
git diff librewolf.cfg > ../patches/librewolf-config.patch if [ $? -ne 0 ]; then exit 1; fi
git diff librewolf.cfg > ../patches/experimental/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
@ -372,7 +385,8 @@ config_diff() {
policies_diff() { 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
git diff policies.json > ../../patches/librewolf-policies.patch if [ $? -ne 0 ]; then exit 1; fi
git diff policies.json > ../../patches/experimental/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
@ -402,6 +416,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
@ -418,7 +434,10 @@ fi
#
# process commandline arguments and do something # process commandline arguments and do something
#
done_something=0 done_something=0

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

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