diff --git a/build.sh b/build.sh index 89be716..1e9a514 100755 --- a/build.sh +++ b/build.sh @@ -83,25 +83,36 @@ do_patches() { patch -p1 -i ../linux/mozilla-vpn-ad.patch if [ "$srcdir" == "mozilla-unified" ]; then + echo "../patches/nightly/context-menu2.patch" patch -p1 -i ../patches/nightly/context-menu2.patch + echo "../patches/nightly/report-site-issue.patch" patch -p1 -i ../patches/nightly/report-site-issue.patch + echo "../patches/nightly/megabar2.patch" patch -p1 -i ../patches/nightly/megabar2.patch else + echo "../linux/context-menu.patch" patch -p1 -i ../linux/context-menu.patch + echo "../linux/remove_addons.patch" patch -p1 -i ../linux/remove_addons.patch + echo "../linux/megabar.patch" patch -p1 -i ../linux/megabar.patch fi echo 'GNU sed patches...' + echo "../patches/sed-patches/allow-searchengines-non-esr.patch" patch -p1 -i ../patches/sed-patches/allow-searchengines-non-esr.patch + echo "../patches/sed-patches/disable-pocket.patch" patch -p1 -i ../patches/sed-patches/disable-pocket.patch + echo "../patches/sed-patches/remove-internal-plugin-certs.patch" patch -p1 -i ../patches/sed-patches/remove-internal-plugin-certs.patch + echo "../patches/sed-patches/stop-undesired-requests.patch" patch -p1 -i ../patches/sed-patches/stop-undesired-requests.patch echo 'Local patches...' # local win10 patches + echo "../patches/browser-confvars.patch" patch -p1 -i ../patches/browser-confvars.patch # not sure about this one yet! if [ "$strict" == "strict" ]; then diff --git a/linux b/linux index 48ff510..062a454 160000 --- a/linux +++ b/linux @@ -1 +1 @@ -Subproject commit 48ff5108bd2f3c391bfc54b73871524e8816ec1a +Subproject commit 062a454cf3a13f04f303c5a1ac88c80f92e689d7 diff --git a/settings b/settings index 9ba36a9..1b9cc88 160000 --- a/settings +++ b/settings @@ -1 +1 @@ -Subproject commit 9ba36a97a914a9ec96860c836d420baacbb3bd66 +Subproject commit 1b9cc88ccf64993951fe28cf426cf883e37e1b4d diff --git a/version.sh b/version.sh index 8ba9183..5975139 100644 --- a/version.sh +++ b/version.sh @@ -1 +1 @@ -pkgver=87.0 +pkgver=88.0