Moved getting patches to a linux git module at clone time. (no worries about diskspace #here)
This commit is contained in:
parent
82e73ac843
commit
8480a183a8
4 changed files with 11 additions and 29 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -4,3 +4,6 @@
|
||||||
[submodule "common"]
|
[submodule "common"]
|
||||||
path = common
|
path = common
|
||||||
url = https://gitlab.com/librewolf-community/browser/common.git
|
url = https://gitlab.com/librewolf-community/browser/common.git
|
||||||
|
[submodule "linux"]
|
||||||
|
path = linux
|
||||||
|
url = git@gitlab.com:librewolf-community/browser/linux.git
|
||||||
|
|
|
||||||
30
build.sh
30
build.sh
|
|
@ -49,7 +49,6 @@ clean() {
|
||||||
rm -rf librewolf
|
rm -rf librewolf
|
||||||
rm -f firefox-$pkgver.source.tar.xz
|
rm -f firefox-$pkgver.source.tar.xz
|
||||||
rm -f mozconfig
|
rm -f mozconfig
|
||||||
rm -f *.patch
|
|
||||||
|
|
||||||
# windows
|
# windows
|
||||||
rm -f librewolf-$pkgver.en-US.win64.zip
|
rm -f librewolf-$pkgver.en-US.win64.zip
|
||||||
|
|
@ -145,37 +144,18 @@ END
|
||||||
do_patches() {
|
do_patches() {
|
||||||
echo "do_patches: begin."
|
echo "do_patches: begin."
|
||||||
|
|
||||||
# get the patches
|
|
||||||
echo 'Getting patches...'
|
|
||||||
rm -f context-menu.patch megabar.patch mozilla-vpn-ad.patch remove_addons.patch unity-menubar.patch
|
|
||||||
|
|
||||||
wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/context-menu.patch
|
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
|
||||||
if [ ! -f context-menu.patch ]; then exit 1; fi
|
|
||||||
wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch
|
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
|
||||||
if [ ! -f megabar.patch ]; then exit 1; fi
|
|
||||||
wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/mozilla-vpn-ad.patch
|
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
|
||||||
if [ ! -f mozilla-vpn-ad.patch ]; then exit 1; fi
|
|
||||||
wget -q https://gitlab.com/librewolf-community/browser/linux/-/raw/master/remove_addons.patch
|
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
|
||||||
if [ ! -f remove_addons.patch ]; then exit 1; fi
|
|
||||||
|
|
||||||
|
|
||||||
if [ ! -d firefox-$pkgver ]; then exit 1; fi
|
if [ ! -d firefox-$pkgver ]; then exit 1; fi
|
||||||
cd firefox-$pkgver
|
cd firefox-$pkgver
|
||||||
|
|
||||||
echo 'Applying patches...'
|
echo 'Applying patches...'
|
||||||
|
|
||||||
# context-menu.patch megabar.patch mozilla-vpn-ad.patch remove_addons.patch unity-menubar.patch
|
patch -p1 -i ../linux/context-menu.patch
|
||||||
patch -p1 -i ../context-menu.patch
|
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
if [ $? -ne 0 ]; then exit 1; fi
|
||||||
patch -p1 -i ../megabar.patch
|
patch -p1 -i ../linux/megabar.patch
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
if [ $? -ne 0 ]; then exit 1; fi
|
||||||
patch -p1 -i ../mozilla-vpn-ad.patch
|
patch -p1 -i ../linux/mozilla-vpn-ad.patch
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
if [ $? -ne 0 ]; then exit 1; fi
|
||||||
patch -p1 -i ../remove_addons.patch
|
patch -p1 -i ../linux/remove_addons.patch
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
if [ $? -ne 0 ]; then exit 1; fi
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -205,7 +185,7 @@ do_patches() {
|
||||||
|
|
||||||
echo 'Local patches...'
|
echo 'Local patches...'
|
||||||
|
|
||||||
# local patches
|
# local win10 patches
|
||||||
patch -p1 -i ../patches/browser-confvars.patch # not sure about this one yet!
|
patch -p1 -i ../patches/browser-confvars.patch # not sure about this one yet!
|
||||||
if [ $? -ne 0 ]; then exit 1; fi
|
if [ $? -ne 0 ]; then exit 1; fi
|
||||||
|
|
||||||
|
|
|
||||||
1
linux
Submodule
1
linux
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 48ff5108bd2f3c391bfc54b73871524e8816ec1a
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
diff --git a/distribution/policies.json b/distribution/policies.json
|
diff --git a/distribution/policies.json b/distribution/policies.json
|
||||||
index 7f7e822..f13317e 100644
|
index 7f7e822..e517284 100644
|
||||||
--- a/distribution/policies.json
|
--- a/distribution/policies.json
|
||||||
+++ b/distribution/policies.json
|
+++ b/distribution/policies.json
|
||||||
@@ -62,7 +62,9 @@
|
@@ -62,7 +62,7 @@
|
||||||
|
|
||||||
"Extensions": {
|
"Extensions": {
|
||||||
"Install": [
|
"Install": [
|
||||||
- "https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.33.2-an+fx.xpi"
|
- "https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.33.2-an+fx.xpi"
|
||||||
+ "https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.33.2-an+fx.xpi",
|
+ "https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.33.2-an+fx.xpi",
|
||||||
+ "https://addons.mozilla.org/firefox/downloads/file/3750918/localcdn-2.6.4-an+fx.xpi",
|
|
||||||
+ "https://addons.mozilla.org/firefox/downloads/file/3708813/first_party_isolation-1.4.0-an+fx.xpi"
|
|
||||||
],
|
],
|
||||||
"Uninstall": [
|
"Uninstall": [
|
||||||
"google@search.mozilla.org",
|
"google@search.mozilla.org",
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue