Upgpkg: 52.0rc4

2 files changed, 32 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b204ea732a9b..fb9758340fa8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = thunderbird-beta-bin
 	pkgdesc = Standalone Mail/News reader - Bleeding edge binary version
-	pkgver = 52.0rc3
+	pkgver = 52.0rc4
 	pkgrel = 1
 	url = https://www.mozilla.org/thunderbird
 	install = thunderbird-beta-bin.install
@@ -14,16 +14,16 @@ pkgbase = thunderbird-beta-bin
 	depends = libxt
 	depends = nss
 	optdepends = libcanberra: for sound support
-	provides = thunderbird=52.0rc3
+	provides = thunderbird=52.0rc4
 	conflicts = thunderbird-beta
 	source = thunderbird-beta-bin.desktop
 	source = vendor.js
 	sha512sums = e5649ddee3ca9cfdcf56652e9c8e6160d52c69d1439f9135b0c0d436ce61a25f17758afc0dd6cac3434c26234c584828eb07fdf9604797f7dd3f617ec194b79a
 	sha512sums = aeb444784732267f1b1e87e6084a776f82a1912c4c2637d2cf1de1c135dd9d41d2ef66d2bd3f9cbd3a79fad32d17ea6e2968ba644d5f887cb66ba6c09a2098f5
-	source_i686 = https://ftp.mozilla.org/pub/thunderbird/candidates/52.0-candidates/build3/linux-i686/en-US/thunderbird-52.0.tar.bz2
-	sha512sums_i686 = 8acd58a70a0c1a506a630ace1f939fd196bb037353f60ff40d669cb4135a71af0dc77e876f43094743c494c192de82e3a719e28650681b478cd8c3f066f6999c
-	source_x86_64 = https://ftp.mozilla.org/pub/thunderbird/candidates/52.0-candidates/build3/linux-x86_64/en-US/thunderbird-52.0.tar.bz2
-	sha512sums_x86_64 = 5314e5e129f4c68fdff04f8c9bfccf549da8d5b7fe556c31551c4b5cf7be3a949d567f4790b6018b4bae3013698baeb56cd6bade49c5acb634f9ea065ac3bdfb
+	source_i686 = https://ftp.mozilla.org/pub/thunderbird/candidates/52.0-candidates/build4/linux-i686/en-US/thunderbird-52.0.tar.bz2
+	sha512sums_i686 = a71b372f1404b1de310494bef37b3d511318d050ce24109fc56749718cdc19a3812323529e9a4a9cb6e9d81794c600c62d5f4487595e4db3a1df444a40d97066
+	source_x86_64 = https://ftp.mozilla.org/pub/thunderbird/candidates/52.0-candidates/build4/linux-x86_64/en-US/thunderbird-52.0.tar.bz2
+	sha512sums_x86_64 = a7e76f80e701b8c1cb1ef190d083d463b9e806ee77a467848caf0425b65bd19c51ea4a137bb59b36334fda129816eb26c9de753b4261cbd8f7040ff63bfe9464
 
 pkgname = thunderbird-beta-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index daea203076dd..e55f7bdb649b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,7 @@
 # Based on [extra]'s thunderbird
 
 pkgname=thunderbird-beta-bin
-_pkgname=thunderbird-beta
-pkgver=52.0rc3
+pkgver=52.0rc4
 _major=${pkgver/rc*}
 _build=${pkgver/*rc}
 pkgrel=1
@@ -22,8 +21,8 @@ source_i686=("https://ftp.mozilla.org/pub/thunderbird/releases/$pkgver/linux-i68
 source_x86_64=("https://ftp.mozilla.org/pub/thunderbird/releases/$pkgver/linux-x86_64/en-US/thunderbird-$pkgver.tar.bz2")
 sha512sums=('e5649ddee3ca9cfdcf56652e9c8e6160d52c69d1439f9135b0c0d436ce61a25f17758afc0dd6cac3434c26234c584828eb07fdf9604797f7dd3f617ec194b79a'
             'aeb444784732267f1b1e87e6084a776f82a1912c4c2637d2cf1de1c135dd9d41d2ef66d2bd3f9cbd3a79fad32d17ea6e2968ba644d5f887cb66ba6c09a2098f5')
-sha512sums_i686=('8acd58a70a0c1a506a630ace1f939fd196bb037353f60ff40d669cb4135a71af0dc77e876f43094743c494c192de82e3a719e28650681b478cd8c3f066f6999c')
-sha512sums_x86_64=('5314e5e129f4c68fdff04f8c9bfccf549da8d5b7fe556c31551c4b5cf7be3a949d567f4790b6018b4bae3013698baeb56cd6bade49c5acb634f9ea065ac3bdfb')
+sha512sums_i686=('a71b372f1404b1de310494bef37b3d511318d050ce24109fc56749718cdc19a3812323529e9a4a9cb6e9d81794c600c62d5f4487595e4db3a1df444a40d97066')
+sha512sums_x86_64=('a7e76f80e701b8c1cb1ef190d083d463b9e806ee77a467848caf0425b65bd19c51ea4a137bb59b36334fda129816eb26c9de753b4261cbd8f7040ff63bfe9464')
 # RC
 if [[ $_build = ? ]]; then
   source_i686=("https://ftp.mozilla.org/pub/thunderbird/candidates/$_major-candidates/build$_build/linux-i686/en-US/thunderbird-$_major.tar.bz2")
@@ -39,19 +38,32 @@ package() {
 
   msg2 "Moving stuff in place..."
   # Install
-  cp -r thunderbird/ "$pkgdir"/opt/$_pkgname
-  install -m644 vendor.js "$pkgdir"/opt/$_pkgname/defaults/pref/
+  cp -r thunderbird/ "$pkgdir"/opt/thunderbird-beta
 
-  # /usr/bin symlink
-  ln -s /opt/$_pkgname/thunderbird "$pkgdir"/usr/bin/$_pkgname
+  # vendor.js
+  _vendorjs="$pkgdir/opt/thunderbird-beta/defaults/preferences/vendor.js"
+  install -Dm644 /dev/stdin "$_vendorjs" <<END
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
 
-  # Desktops
-  install -m644 *.desktop "$pkgdir"/usr/share/applications/
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
+END
 
   # Icons
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-    install -d "$pkgdir"/usr/share/icons/hicolor/$i/apps/
-    ln -s /opt/$_pkgname/chrome/icons/default/default${i/x*}.png \
-          "$pkgdir"/usr/share/icons/hicolor/$i/apps/$_pkgname.png
+  for i in 16 22 24 32 48 256; do
+    install -d "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/
+    ln -s /opt/thunderbird-beta/chrome/icons/default/default$i.png \
+          "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/thunderbird-beta.png
   done
+  
+  # Desktop
+  install -m644 $pkgname.desktop "$pkgdir"/usr/share/applications/
+
+  # /usr/bin symlink
+  ln -s /opt/thunderbird-beta/thunderbird "$pkgdir"/usr/bin/thunderbird-beta
 }