95.0b4

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

8 files changed, 216 insertions, 211 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 912ce22e0725..397522a2f74d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = thunderbird-beta
-	pkgdesc = Standalone mail and news reader from mozilla.org — Beta version
-	pkgver = 95.0b3
+	pkgdesc = Beta version of standalone mail and news reader from mozilla.org
+	pkgver = 95.0b4
 	pkgrel = 1
-	url = https://www.mozilla.org/thunderbird/
+	url = https://www.thunderbird.net/channel/#beta
 	arch = x86_64
 	license = MPL
 	license = GPL
@@ -10,93 +10,60 @@ pkgbase = thunderbird-beta
 	makedepends = unzip
 	makedepends = zip
 	makedepends = diffutils
-	makedepends = python
 	makedepends = python-setuptools
 	makedepends = yasm
-	makedepends = nasm
 	makedepends = mesa
 	makedepends = imake
-	makedepends = libpulse
+	makedepends = inetutils
 	makedepends = xorg-server-xvfb
 	makedepends = autoconf2.13
 	makedepends = rust
 	makedepends = clang
 	makedepends = llvm
-	makedepends = cbindgen
+	makedepends = jack
 	makedepends = nodejs
-	makedepends = gawk
-	makedepends = perl
-	makedepends = findutils
+	makedepends = python-psutil
+	makedepends = cbindgen
+	makedepends = nasm
+	makedepends = lld
+	makedepends = python-zstandard
+	makedepends = dump_syms
+	makedepends = wasi-compiler-rt
+	makedepends = wasi-libc
+	makedepends = wasi-libc++
+	makedepends = wasi-libc++abi
 	makedepends = libotr
-	depends = glibc
 	depends = gtk3
-	depends = libgdk-3.so
-	depends = libgtk-3.so
+	depends = libxt
 	depends = mime-types
-	depends = dbus
-	depends = libdbus-1.so
 	depends = dbus-glib
-	depends = alsa-lib
-	depends = nss
-	depends = hunspell
-	depends = sqlite
+	depends = ffmpeg
 	depends = ttf-font
-	depends = libvpx
-	depends = libvpx.so
-	depends = zlib
-	depends = bzip2
-	depends = libbz2.so
-	depends = botan
-	depends = libwebp
-	depends = libwebp.so
-	depends = libwebpdemux.so
-	depends = libevent
-	depends = libjpeg-turbo
-	depends = libffi
-	depends = libffi.so
-	depends = nspr
-	depends = gcc-libs
-	depends = libx11
-	depends = libxrender
-	depends = libxfixes
-	depends = libxext
-	depends = libxcomposite
-	depends = libxdamage
-	depends = pango
-	depends = libpango-1.0.so
-	depends = cairo
-	depends = gdk-pixbuf2
-	depends = icu
-	depends = libicui18n.so
-	depends = libicuuc.so
-	depends = freetype2
-	depends = libfreetype.so
-	depends = fontconfig
-	depends = libfontconfig.so
-	depends = glib2
-	depends = libglib-2.0.so
-	depends = pixman
-	depends = libpixman-1.so
-	depends = gnupg
+	depends = libpulse
+	depends = nss
+	optdepends = networkmanager: Location detection via available WiFi networks
+	optdepends = libnotify: Notification integration
+	optdepends = pulseaudio: Audio support
+	optdepends = speech-dispatcher: Text-to-Speech
+	optdepends = hunspell-en_US: Spell checking, American English
+	optdepends = xdg-desktop-portal: Screensharing with Wayland
 	optdepends = libcanberra: sound support
 	optdepends = libotr: OTR support for active one-to-one chats
-	provides = thunderbird=95.0b3
-	conflicts = thunderbird
-	conflicts = thunderbird-beta-bin
+	provides = thunderbird=95.0b4
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/95.0b3/source/thunderbird-95.0b3.source.tar.xz
-	source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/95.0b3/source/thunderbird-95.0b3.source.tar.xz.asc
+	options = !strip
+	source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/95.0b4/source/thunderbird-95.0b4.source.tar.xz
+	source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/95.0b4/source/thunderbird-95.0b4.source.tar.xz.asc
+	source = install-dir.patch
+	source = metainfo.patch
 	source = thunderbird-beta.desktop
-	source = vendor-prefs.js
-	source = distribution.ini
-	source = mozconfig.cfg
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 9b41dadef956109efcf5edf927aa36dea4442979f3422420b041d6cf2a412705
+	validpgpkeys = 4360FE2109C49763186F8E21EBE41E90F6F12F6D
+	sha256sums = d3195a1ff0cca1b73122d9165788aeeda959ebd7d115b930ff7185a2c8b13083
 	sha256sums = SKIP
-	sha256sums = 71251951e99d33c1bc56d8e1729270cb1c0bd026a86cd840b8ac9ac54a68d846
-	sha256sums = fa11b4736bbf53ec015f71cd42b1040b22d1a855c562b76927b3f0eccb925c85
-	sha256sums = bc3aae2cc00dc9806f54606f98d967366a2ba7223f6a3ad1c658a653ebff5569
-	sha256sums = e6fedf8e74382af05b419b1efca1380f503f5a000320f46717386aa401820a5e
+	sha256sums = c959c9f2b60a42dc937f744c018196906727d468d8f1d7402fb4f743484c414b
+	sha256sums = a30df8772e9cec05debdcd02b83de6ea92db6fb7c2a43f24f0bc6ebb2c5484a5
+	sha256sums = 9f7eececd2426a13220a81eb8d34123311979e03aca40d5d4b79d0346beab5b5
 
 pkgname = thunderbird-beta
diff --git a/PKGBUILD b/PKGBUILD
index cf4771cc06ca..59df103f15c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,40 +3,31 @@
 
 pkgname=thunderbird-beta
 _pkgname=thunderbird
-_pkgver=95.0
-_beta=3
-pkgver="${_pkgver}b${_beta}"
+pkgver=95.0b4
 pkgrel=1
-pkgdesc='Standalone mail and news reader from mozilla.org — Beta version'
-url='https://www.mozilla.org/thunderbird/'
-arch=(x86_64)
-license=(MPL GPL LGPL)
-depends=(
-  glibc gtk3 libgdk-3.so libgtk-3.so mime-types dbus libdbus-1.so dbus-glib
-  alsa-lib nss hunspell sqlite ttf-font libvpx libvpx.so zlib bzip2 libbz2.so
-  botan libwebp libwebp.so libwebpdemux.so libevent libjpeg-turbo libffi
-  libffi.so nspr gcc-libs libx11 libxrender libxfixes libxext libxcomposite
-  libxdamage pango libpango-1.0.so cairo gdk-pixbuf2 icu libicui18n.so
-  libicuuc.so freetype2 libfreetype.so fontconfig libfontconfig.so glib2
-  libglib-2.0.so pixman libpixman-1.so gnupg
-)
-makedepends=(
-  unzip zip diffutils python python-setuptools yasm nasm mesa imake libpulse
-  xorg-server-xvfb autoconf2.13 rust clang llvm cbindgen nodejs
-  gawk perl findutils libotr
-)
-optdepends=(
-  'libcanberra: sound support'
-  'libotr: OTR support for active one-to-one chats'
-)
-options=(!emptydirs !makeflags)
+pkgdesc='Beta version of standalone mail and news reader from mozilla.org'
+arch=('x86_64')
+license=('MPL' 'GPL' 'LGPL')
+url="https://www.thunderbird.net/channel/#beta"
+depends=('gtk3' 'libxt' 'mime-types' 'dbus-glib' 'ffmpeg' 'ttf-font' 'libpulse' 'nss')
+makedepends=('unzip' 'zip' 'diffutils' 'python-setuptools' 'yasm' 'mesa' 'imake' 'inetutils'
+             'xorg-server-xvfb' 'autoconf2.13' 'rust' 'clang' 'llvm' 'jack' 'nodejs'
+             'python-psutil' 'cbindgen' 'nasm' 'lld' 'python-zstandard' 'dump_syms'
+             'wasi-compiler-rt' 'wasi-libc' 'wasi-libc++' 'wasi-libc++abi' 'libotr')
+optdepends=('networkmanager: Location detection via available WiFi networks'
+            'libnotify: Notification integration'
+            'pulseaudio: Audio support'
+            'speech-dispatcher: Text-to-Speech'
+            'hunspell-en_US: Spell checking, American English'
+            'xdg-desktop-portal: Screensharing with Wayland'
+            'libcanberra: sound support'
+            'libotr: OTR support for active one-to-one chats')
+options=(!emptydirs !makeflags !strip)
 provides=("thunderbird=$pkgver")
-conflicts=('thunderbird' 'thunderbird-beta-bin')
 source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc}
-        thunderbird-beta.desktop
-        vendor-prefs.js
-        distribution.ini
-        mozconfig.cfg)
+        install-dir.patch
+        metainfo.patch
+        "$pkgname".desktop)
 validpgpkeys=(
   14F26682D0916CDD81E37B6D61B7B526D98F0353 # Mozilla Software Releases <release@mozilla.com>
   4360FE2109C49763186F8E21EBE41E90F6F12F6D # Mozilla Software Releases <release@mozilla.com>
@@ -54,65 +45,145 @@ _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
 _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
 
 prepare() {
-  cd $_pkgname-$_pkgver
+  mkdir -p mozbuild
+  cd "${_pkgname}-${pkgver%b*}"
+  
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    echo "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
+
+  echo -n "$_google_api_key" > google-api-key
+  echo -n "$_mozilla_api_key" > mozilla-api-key
+  cat > ../mozconfig << END
+ac_add_options --enable-application=comm/mail
+mk_add_options MOZ_OBJDIR=${PWD@Q}/obj
+
+ac_add_options --prefix=/usr
+ac_add_options --enable-release
+ac_add_options --enable-hardening
+ac_add_options --enable-optimize
+ac_add_options --enable-rust-simd
+ac_add_options --enable-linker=lld
+ac_add_options --disable-elf-hack
+ac_add_options --disable-bootstrap
+ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot
 
-  echo "${noextract[@]}"
+# Branding
+ac_add_options --enable-official-branding
+ac_add_options --enable-update-channel=aurora
+ac_add_options --with-distribution-id=org.archlinux
+ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --allow-addon-sideload
+export MOZILLA_OFFICIAL=1
+export MOZ_APP_REMOTINGNAME=${pkgname//-/}
+export MOZ_REQUIRE_SIGNING=
 
-  printf "%s" "$_google_api_key" >google-api-key
-  printf "%s" "$_mozilla_api_key" >mozilla-api-key
-  cp ../mozconfig.cfg .mozconfig
-  sed "s|@PWD@|${PWD@Q}|g" -i .mozconfig
+# Keys
+ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-key
+ac_add_options --with-google-safebrowsing-api-keyfile=${PWD@Q}/google-api-key
+ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+
+# Features
+ac_add_options --enable-alsa
+ac_add_options --enable-jack
+ac_add_options --enable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+END
 }
 
 build() {
-  cd $_pkgname-$_pkgver
-  if [[ -n "${SOURCE_DATE_EPOCH}" ]]; then
-    export MOZ_BUILD_DATE=$(date --date "@${SOURCE_DATE_EPOCH}" "+%Y%m%d%H%M%S")
-  fi
+  cd "${_pkgname}-${pkgver%b*}"
+
+  export MOZ_NOSPAM=1
+  export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
+  export MOZ_ENABLE_FULL_SYMBOLS=1
   export MACH_USE_SYSTEM_PYTHON=1
-  export MOZBUILD_STATE_PATH="${srcdir}/.mozbuild"
-  ./mach configure
+
+  echo "Building thunderbird..."
+  cat >.mozconfig ../mozconfig
   ./mach build
+
+  echo "Building symbol archive..."
   ./mach buildsymbols
 }
 
 package() {
-  cd $_pkgname-$_pkgver
+  cd "${_pkgname}-${pkgver%b*}"
   DESTDIR="$pkgdir" ./mach install
 
-  install -Dm 644 ../vendor-prefs.js -t "$pkgdir/usr/lib/${_pkgname}/defaults/pref"
-  install -Dm 644 ../distribution.ini -t "$pkgdir/usr/lib/${_pkgname}/distribution"
-  install -Dm 644 ../thunderbird-beta.desktop -t "$pkgdir/usr/share/applications"
+  local vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
+  install -Dvm644 /dev/stdin "$vendorjs" << END
+// Use LANG environment variable to choose locale.
+pref("intl.locale.requested", "");
+
+// Use system-provided dictionaries.
+pref("spellchecker.dictionary_path", "/usr/share/hunspell");
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable our bundled extensions in the application directory.
+pref("extensions.autoDisableScopes", 11);
+END
+
+  local distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
+  install -Dvm644 /dev/stdin "$distini" << END
+[Global]
+id=archlinux
+version=1.0
+about=Mozilla Thunderbird Beta for Arch Linux
 
-  install -Dm 644 comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml \
+[Preferences]
+app.distributor=archlinux
+app.distributor.channel=$pkgname
+app.partner.archlinux=archlinux
+END
+
+  install -Dvm644 comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml \
     "$pkgdir/usr/share/metainfo/net.thunderbird.Thunderbird.appdata.xml"
 
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 comm/mail/branding/thunderbird/default${i}.png \
-      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/${_pkgname}.png"
+    install -Dvm644 comm/mail/branding/thunderbird/default${i}.png \
+      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
-  install -Dm644 comm/mail/branding/thunderbird/TB-symbolic.svg \
+
+  install -Dvm644 comm/mail/branding/thunderbird/content/about-logo.svg \
+    "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
+  install -Dvm644 comm/mail/branding/thunderbird/TB-symbolic.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/thunderbird-symbolic.svg"
 
-  # Use system-provided dictionaries
-  ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/${_pkgname}/dictionaries"
-  ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/${_pkgname}/hyphenation"
+  install -Dvm644 ../$pkgname.desktop \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
 
   # Install a wrapper to avoid confusion about binary path
-  install -Dm755 /dev/stdin "$pkgdir/usr/bin/${_pkgname}" <<END
+  install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" << END
 #!/bin/sh
-exec /usr/lib/${_pkgname}/thunderbird "\$@"
+exec /usr/lib/$pkgname/$_pkgname "\$@"
 END
 
   # Replace duplicate binary with wrapper
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -srf "$pkgdir/usr/bin/${_pkgname}" \
-    "$pkgdir/usr/lib/${_pkgname}/thunderbird-bin"
+  ln -srfv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/lib/$pkgname/$_pkgname-bin"
+
+  # Use system certificates
+  local nssckbi="$pkgdir/usr/lib/$pkgname/libnssckbi.so"
+  if [[ -e $nssckbi ]]; then
+    ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"
+  fi
 }
 
-sha256sums=('9b41dadef956109efcf5edf927aa36dea4442979f3422420b041d6cf2a412705'
+sha256sums=('d3195a1ff0cca1b73122d9165788aeeda959ebd7d115b930ff7185a2c8b13083'
             'SKIP'
-            '71251951e99d33c1bc56d8e1729270cb1c0bd026a86cd840b8ac9ac54a68d846'
-            'fa11b4736bbf53ec015f71cd42b1040b22d1a855c562b76927b3f0eccb925c85'
-            'bc3aae2cc00dc9806f54606f98d967366a2ba7223f6a3ad1c658a653ebff5569'
-            'e6fedf8e74382af05b419b1efca1380f503f5a000320f46717386aa401820a5e')
+            'c959c9f2b60a42dc937f744c018196906727d468d8f1d7402fb4f743484c414b'
+            'a30df8772e9cec05debdcd02b83de6ea92db6fb7c2a43f24f0bc6ebb2c5484a5'
+            '9f7eececd2426a13220a81eb8d34123311979e03aca40d5d4b79d0346beab5b5')
diff --git a/distribution.ini b/distribution.ini
deleted file mode 100644
index cc57d4ff416d..000000000000
--- a/distribution.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[Global]
-id=archlinux
-version=1.0
-about=Mozilla Thunderbird for Arch Linux
-
-[Preferences]
-app.distributor=archlinux
-app.distributor.channel=thunderbird
diff --git a/install-dir.patch b/install-dir.patch
new file mode 100644
index 000000000000..5f7c7b1bca0f
--- /dev/null
+++ b/install-dir.patch
@@ -0,0 +1,32 @@
+ config/baseconfig.mk                  | 2 +-
+ toolkit/mozapps/installer/packager.mk | 4 ++--
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git c/config/baseconfig.mk i/config/baseconfig.mk
+index 3ef3af95d611..81530dface0a 100644
+--- c/config/baseconfig.mk
++++ i/config/baseconfig.mk
+@@ -2,7 +2,7 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
+-installdir = $(libdir)/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)-beta
+ ifeq (.,$(DEPTH))
+ DIST = dist
+ else
+diff --git c/toolkit/mozapps/installer/packager.mk i/toolkit/mozapps/installer/packager.mk
+index 64f902a26942..d3313dacbcb7 100644
+--- c/toolkit/mozapps/installer/packager.mk
++++ i/toolkit/mozapps/installer/packager.mk
+@@ -138,8 +138,8 @@ endif
+ 	(cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(installdir) && tar -xf -)
+ 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
+-	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
+-	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
++	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)-beta
++	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)-beta
+ 
+ upload:
+ 	$(PYTHON) -u $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) $(UPLOAD_FILES)
diff --git a/metainfo.patch b/metainfo.patch
new file mode 100644
index 000000000000..a993baa03ba1
--- /dev/null
+++ b/metainfo.patch
@@ -0,0 +1,11 @@
+diff -Naur c/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml i/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml
+--- c/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml	2021-04-17 02:05:05.808596043 +0000
++++ i/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml	2021-04-17 02:06:12.052455998 +0000
+@@ -1,6 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <component type="desktop-application">
+   <id>net.thunderbird.Thunderbird</id>
++  <launchable type="desktop-id">thunderbird-beta.desktop</launchable>
+   <metadata_license>CC0-1.0</metadata_license>
+   <name>Thunderbird</name>
+   <summary>Thunderbird is a free and open source email, newsfeed, chat, and calendaring client</summary>
diff --git a/mozconfig.cfg b/mozconfig.cfg
deleted file mode 100644
index 57e5888de3bd..000000000000
--- a/mozconfig.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-ac_add_options --enable-application=comm/mail
-
-ac_add_options --prefix=/usr
-ac_add_options --enable-release
-ac_add_options --enable-linker=gold
-ac_add_options --enable-hardening
-ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
-ac_add_options --disable-elf-hack
-
-# Branding
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --with-distribution-id=org.archlinux
-
-# Keys
-ac_add_options --with-google-location-service-api-keyfile=@PWD@/google-api-key
-ac_add_options --with-google-safebrowsing-api-keyfile=@PWD@/google-api-key
-ac_add_options --with-mozilla-api-keyfile=@PWD@/mozilla-api-key
-
-# System libraries
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-icu
-ac_add_options --with-system-jpeg
-# does not have APNG support
-# ac_add_options --with-system-png
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-botan
-ac_add_options --with-system-webp
-ac_add_options --with-system-libevent
-ac_add_options --with-system-ffi
-ac_add_options --with-system-pixman
-
-# Features
-ac_add_options --enable-alsa
-ac_add_options --enable-openpgp
-# ac_add_options --enable-calendar
-ac_add_options --disable-jack
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-
-# System addons
-ac_add_options --with-unsigned-addon-scopes=app,system
-ac_add_options --allow-addon-sideload
-
-# WASM
-ac_add_options --without-wasm-sandboxed-libraries
diff --git a/thunderbird-beta.desktop b/thunderbird-beta.desktop
index e3d747f849fa..7f76c28fd7e4 100644
--- a/thunderbird-beta.desktop
+++ b/thunderbird-beta.desktop
@@ -55,7 +55,7 @@ GenericName[uk]=Поштова програма
 GenericName[vi]=Phần mềm khách quản lý thư điện tử
 GenericName[zh_CN]=邮件新闻客户端
 GenericName[zh_TW]=郵件用戶端
-Exec=/usr/lib/thunderbird/thunderbird %u
+Exec=/usr/lib/thunderbird-beta/thunderbird %u
 Terminal=false
 Type=Application
 Icon=thunderbird
@@ -116,7 +116,7 @@ Name[uk]=Написати нового листа
 Name[vi]=Viết thư mới
 Name[zh_CN]=编写新消息
 Name[zh_TW]=寫一封新訊息
-Exec=/usr/lib/thunderbird/thunderbird -compose
+Exec=/usr/lib/thunderbird-beta/thunderbird -compose
 
 [Desktop Action OpenAddressBook]
 Name=Open address book
@@ -170,4 +170,4 @@ Name[uk]=Відкрити адресну книгу
 Name[vi]=Mở sổ địa chỉ
 Name[zh_CN]=打开通讯录
 Name[zh_TW]=開啟通訊錄
-Exec=/usr/lib/thunderbird/thunderbird -addressbook
+Exec=/usr/lib/thunderbird-beta/thunderbird -addressbook
diff --git a/vendor-prefs.js b/vendor-prefs.js
deleted file mode 100644
index 633bebf3077b..000000000000
--- a/vendor-prefs.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.requested", "");
-
-// Use system-provided dictionaries
-pref("spellchecker.dictionary_path", "/usr/share/hunspell");
-
-// Disable default mailer checking
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
-
-// Disable telemetry
-pref("datareporting.healthreport.uploadEnabled", false);
-pref("datareporting.policy.dataSubmissionEnabled", false);
-pref("toolkit.telemetry.archive.enabled", false);