diff --git a/.gitmodules b/.gitmodules index 9e19064..499b08c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "common"] path = common url = https://gitlab.com/librewolf-community/browser/common.git +[submodule "linux"] + path = linux + url = git@gitlab.com:librewolf-community/browser/linux.git diff --git a/build.sh b/build.sh index 68bfd74..055d28a 100755 --- a/build.sh +++ b/build.sh @@ -49,7 +49,6 @@ clean() { rm -rf librewolf rm -f firefox-$pkgver.source.tar.xz rm -f mozconfig - rm -f *.patch # windows rm -f librewolf-$pkgver.en-US.win64.zip @@ -144,38 +143,19 @@ END do_patches() { 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 cd firefox-$pkgver echo 'Applying patches...' - # context-menu.patch megabar.patch mozilla-vpn-ad.patch remove_addons.patch unity-menubar.patch - patch -p1 -i ../context-menu.patch + patch -p1 -i ../linux/context-menu.patch 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 - patch -p1 -i ../mozilla-vpn-ad.patch + patch -p1 -i ../linux/mozilla-vpn-ad.patch 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 @@ -205,7 +185,7 @@ do_patches() { echo 'Local patches...' - # local patches + # local win10 patches patch -p1 -i ../patches/browser-confvars.patch # not sure about this one yet! if [ $? -ne 0 ]; then exit 1; fi diff --git a/linux b/linux new file mode 160000 index 0000000..48ff510 --- /dev/null +++ b/linux @@ -0,0 +1 @@ +Subproject commit 48ff5108bd2f3c391bfc54b73871524e8816ec1a diff --git a/patches/permissive/librewolf-policies.patch b/patches/permissive/librewolf-policies.patch index 5db7fa7..f572558 100644 --- a/patches/permissive/librewolf-policies.patch +++ b/patches/permissive/librewolf-policies.patch @@ -1,15 +1,13 @@ diff --git a/distribution/policies.json b/distribution/policies.json -index 7f7e822..f13317e 100644 +index 7f7e822..e517284 100644 --- a/distribution/policies.json +++ b/distribution/policies.json -@@ -62,7 +62,9 @@ +@@ -62,7 +62,7 @@ "Extensions": { "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.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": [ "google@search.mozilla.org",