v88.0-1

2 files changed, 40 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35ab9274d701..442e12247205 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = librewolf
 	pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
-	pkgver = 87.0
+	pkgver = 88.0
 	pkgrel = 1
 	url = https://librewolf-community.gitlab.io/
 	arch = x86_64
@@ -47,44 +47,28 @@ pkgbase = librewolf
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source_x86_64 = https://archive.mozilla.org/pub/firefox/releases/87.0/source/firefox-87.0.source.tar.xz
-	source_x86_64 = librewolf.desktop
-	source_x86_64 = git+https://gitlab.com/librewolf-community/browser/common.git
-	source_x86_64 = git+https://gitlab.com/librewolf-community/settings.git#commit=241e6f4d73e6f2de37537cf4473612ae9f8ad81e
-	source_x86_64 = megabar.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/megabar.patch
-	source_x86_64 = remove_addons.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/remove_addons.patch
-	source_x86_64 = context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/context-menu.patch
-	source_x86_64 = unity-menubar.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/unity-menubar.patch
-	source_x86_64 = mozilla-vpn-ad.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/mozilla-vpn-ad.patch
-	sha256sums_x86_64 = ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab
-	sha256sums_x86_64 = 0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2
-	sha256sums_x86_64 = SKIP
-	sha256sums_x86_64 = SKIP
-	sha256sums_x86_64 = 2addc8abeea860e123da43b5c6be687f520f5770d52e3b19de62bedc3581d007
-	sha256sums_x86_64 = f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6
-	sha256sums_x86_64 = 3bc57d97ef58c5e80f6099b0e82dab23a4404de04710529d8a8dd0eaa079afcd
-	sha256sums_x86_64 = 85f037f794afee0c70840123960375a00f9cef08dd903ea038b6bb62e683b96f
-	sha256sums_x86_64 = f3fd29e24207d5cc83f9df6c9ffa960aabdab598ea59a61fec57e9947b1d8bc9
-	source_aarch64 = https://archive.mozilla.org/pub/firefox/releases/87.0/source/firefox-87.0.source.tar.xz
-	source_aarch64 = librewolf.desktop
-	source_aarch64 = git+https://gitlab.com/librewolf-community/browser/common.git
-	source_aarch64 = git+https://gitlab.com/librewolf-community/settings.git#commit=241e6f4d73e6f2de37537cf4473612ae9f8ad81e
-	source_aarch64 = megabar.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/megabar.patch
-	source_aarch64 = remove_addons.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/remove_addons.patch
-	source_aarch64 = unity-menubar.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/unity-menubar.patch
-	source_aarch64 = context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/context-menu.patch
-	source_aarch64 = mozilla-vpn-ad.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/mozilla-vpn-ad.patch
-	source_aarch64 = arm.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/7a39d563510701275472b1656b92eed590a040d5/arm.patch
+	backup = usr/lib/librewolf/librewolf.cfg
+	backup = usr/lib/librewolf/distribution/policies.json
+	source = https://archive.mozilla.org/pub/firefox/releases/88.0/source/firefox-88.0.source.tar.xz
+	source = librewolf.desktop
+	source = git+https://gitlab.com/librewolf-community/browser/common.git
+	source = git+https://gitlab.com/librewolf-community/settings.git#commit=1b9cc88ccf64993951fe28cf426cf883e37e1b4d
+	source = megabar.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/9e90fb3a9bc38aad9921530ee69ecabf6ac8c7bf/megabar.patch
+	source = remove_addons.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/9e90fb3a9bc38aad9921530ee69ecabf6ac8c7bf/remove_addons.patch
+	source = context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/9e90fb3a9bc38aad9921530ee69ecabf6ac8c7bf/context-menu.patch
+	source = unity-menubar.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/9e90fb3a9bc38aad9921530ee69ecabf6ac8c7bf/unity-menubar.patch
+	source = mozilla-vpn-ad.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/9e90fb3a9bc38aad9921530ee69ecabf6ac8c7bf/mozilla-vpn-ad.patch
+	sha256sums = 6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297
+	sha256sums = 0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 4487f78173793b9fab2b5b26879d468d2ace2837fb938f74809d961e14da0a65
+	sha256sums = af9d9341917cf3c5844fc46597ad2d842642c937c9be574bfacfe5c242b1114c
+	sha256sums = 3bc57d97ef58c5e80f6099b0e82dab23a4404de04710529d8a8dd0eaa079afcd
+	sha256sums = 860e49ab14ce2c9416a479d313a2da799e023db58e93b81ca4cb869c5afb39a7
+	sha256sums = f3fd29e24207d5cc83f9df6c9ffa960aabdab598ea59a61fec57e9947b1d8bc9
+	source_aarch64 = arm.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/9e90fb3a9bc38aad9921530ee69ecabf6ac8c7bf/arm.patch
 	source_aarch64 = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch
-	sha256sums_aarch64 = ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab
-	sha256sums_aarch64 = 0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2
-	sha256sums_aarch64 = SKIP
-	sha256sums_aarch64 = SKIP
-	sha256sums_aarch64 = 2addc8abeea860e123da43b5c6be687f520f5770d52e3b19de62bedc3581d007
-	sha256sums_aarch64 = f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6
-	sha256sums_aarch64 = 85f037f794afee0c70840123960375a00f9cef08dd903ea038b6bb62e683b96f
-	sha256sums_aarch64 = 3bc57d97ef58c5e80f6099b0e82dab23a4404de04710529d8a8dd0eaa079afcd
-	sha256sums_aarch64 = f3fd29e24207d5cc83f9df6c9ffa960aabdab598ea59a61fec57e9947b1d8bc9
 	sha256sums_aarch64 = 6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7
 	sha256sums_aarch64 = 2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9
 
diff --git a/PKGBUILD b/PKGBUILD
index bfa76b653c28..8af7eb7ef5b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=librewolf
 _pkgname=LibreWolf
-pkgver=87.0
+pkgver=88.0
 pkgrel=1
 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
 arch=(x86_64 aarch64)
@@ -21,11 +21,13 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech'
             'hunspell-en_US: Spell checking, American English')
+backup=('usr/lib/librewolf/librewolf.cfg'
+        'usr/lib/librewolf/distribution/policies.json')
 options=(!emptydirs !makeflags !strip)
 _arch_svn=https://git.archlinux.org/svntogit/packages.git/plain/trunk
-_linux_commit=7a39d563510701275472b1656b92eed590a040d5
-_settings_commit=241e6f4d73e6f2de37537cf4473612ae9f8ad81e
-source_x86_64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
+_linux_commit=9e90fb3a9bc38aad9921530ee69ecabf6ac8c7bf
+_settings_commit=1b9cc88ccf64993951fe28cf426cf883e37e1b4d
+source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
                $pkgname.desktop
                "git+https://gitlab.com/${pkgname}-community/browser/common.git"
                "git+https://gitlab.com/${pkgname}-community/settings.git#commit=${_settings_commit}"
@@ -34,37 +36,18 @@ source_x86_64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/f
                "context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/context-menu.patch"
                "unity-menubar.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/unity-menubar.patch"
                "mozilla-vpn-ad.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/mozilla-vpn-ad.patch")
-source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
-                $pkgname.desktop
-                "git+https://gitlab.com/${pkgname}-community/browser/common.git"
-                "git+https://gitlab.com/${pkgname}-community/settings.git#commit=${_settings_commit}"
-                "megabar.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/megabar.patch"
-                "remove_addons.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/remove_addons.patch"
-                "unity-menubar.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/unity-menubar.patch"
-                "context-menu.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/context-menu.patch"
-                "mozilla-vpn-ad.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/mozilla-vpn-ad.patch"
-                "arm.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/arm.patch"
+source_aarch64=("arm.patch::https://gitlab.com/librewolf-community/browser/linux/-/raw/${_linux_commit}/arm.patch"
                 https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch)
-
-sha256sums_x86_64=('ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab'
-                   '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
-                   'SKIP'
-                   'SKIP'
-                   '2addc8abeea860e123da43b5c6be687f520f5770d52e3b19de62bedc3581d007'
-                   'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6'
-                   '3bc57d97ef58c5e80f6099b0e82dab23a4404de04710529d8a8dd0eaa079afcd'
-                   '85f037f794afee0c70840123960375a00f9cef08dd903ea038b6bb62e683b96f'
-                   'f3fd29e24207d5cc83f9df6c9ffa960aabdab598ea59a61fec57e9947b1d8bc9')
-sha256sums_aarch64=('ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab'
-                    '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
-                    'SKIP'
-                    'SKIP'
-                    '2addc8abeea860e123da43b5c6be687f520f5770d52e3b19de62bedc3581d007'
-                    'f2f7403c9abd33a7470a5861e247b488693cf8d7d55c506e7e579396b7bf11e6'
-                    '85f037f794afee0c70840123960375a00f9cef08dd903ea038b6bb62e683b96f'
-                    '3bc57d97ef58c5e80f6099b0e82dab23a4404de04710529d8a8dd0eaa079afcd'
-                    'f3fd29e24207d5cc83f9df6c9ffa960aabdab598ea59a61fec57e9947b1d8bc9'
-                    '6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7'
+sha256sums=('6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297'
+            '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
+            'SKIP'
+            'SKIP'
+            '4487f78173793b9fab2b5b26879d468d2ace2837fb938f74809d961e14da0a65'
+            'af9d9341917cf3c5844fc46597ad2d842642c937c9be574bfacfe5c242b1114c'
+            '3bc57d97ef58c5e80f6099b0e82dab23a4404de04710529d8a8dd0eaa079afcd'
+            '860e49ab14ce2c9416a479d313a2da799e023db58e93b81ca4cb869c5afb39a7'
+            'f3fd29e24207d5cc83f9df6c9ffa960aabdab598ea59a61fec57e9947b1d8bc9')
+sha256sums_aarch64=('6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7'
                     '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 
 prepare() {
@@ -154,7 +137,7 @@ fi
   # patch -p1 -i ../unity-menubar.patch
 
   # Disabling Pocket
-  sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build
+  sed -i 's/"pocket"/# "pocket"/g' browser/components/moz.build
 
   patch -p1 -i ../context-menu.patch