81b1 update

2 files changed, 13 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9078b3cd7b73..173fbbf1d0bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-beta
 	pkgdesc = Standalone web browser from mozilla.org - Beta
-	pkgver = 80.0rc2
+	pkgver = 81.0b1
 	pkgrel = 1
 	url = https://www.mozilla.org/en-US/firefox/channel/#beta
 	arch = i686
@@ -41,17 +41,17 @@ pkgbase = firefox-beta
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
-	provides = firefox=80.0rc2
+	provides = firefox=81.0b1
 	conflicts = firefox-beta-bin
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = firefox-80.0rc2.source.tar.xz::https://ftp.mozilla.org/pub/firefox/candidates/80.0-candidates/build2/source/firefox-80.0.source.tar.xz
-	source = firefox-80.0rc2.source.tar.xz.asc::https://ftp.mozilla.org/pub/firefox/candidates/80.0-candidates/build2/source/firefox-80.0.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/81.0b1/source/firefox-81.0b1.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/81.0b1/source/firefox-81.0b1.source.tar.xz.asc
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = firefox-beta.desktop
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a
+	sha256sums = 02866d4c80b64f1b1644cce5d23cff2e0fda9960066f6a7c4449ca5cfc5cdb7e
 	sha256sums = SKIP
 	sha256sums = 3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75
 	sha256sums = 54d93249fedc9c4cdc5eb82da498b08f08bcb089f85a138b457f3251a0913ad1
diff --git a/PKGBUILD b/PKGBUILD
index 2b4109d47aea..2f09d83e36f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,10 +48,10 @@ fi
 
 pkgname=firefox-beta
 _pkgname=firefox
-pkgver=80.0rc2
+pkgver=81.0b1
 _major=${pkgver/rc*}
 _build=${pkgver/*rc}
-_pkgver=80.0
+_pkgver=81.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org - Beta"
 arch=(i686 x86_64)
@@ -72,7 +72,7 @@ options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/$_pkgname-$pkgver.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop)
-sha256sums=('380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a'
+sha256sums=('02866d4c80b64f1b1644cce5d23cff2e0fda9960066f6a7c4449ca5cfc5cdb7e'
             'SKIP'
             '3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'
             '54d93249fedc9c4cdc5eb82da498b08f08bcb089f85a138b457f3251a0913ad1')
@@ -109,6 +109,7 @@ prepare() {
 
   cat >../mozconfig <<END
 ac_add_options --enable-application=browser
+mk_add_options MOZ_OBJDIR=${PWD@Q}/obj
 
 ac_add_options --prefix=/usr
 ac_add_options --enable-release
@@ -161,11 +162,6 @@ build() {
   # LTO needs more open files
   ulimit -n 4096
 
-  # -fno-plt with cross-LTO causes obscure LLVM errors
-  # LLVM ERROR: Function Import: link error
-  CFLAGS="${CFLAGS/-fno-plt/}"
-  CXXFLAGS="${CXXFLAGS/-fno-plt/}"
-
   if [ "$enable_pgo" = "y" ]; then
     # Do 3-tier PGO
     echo "Building instrumented browser..."
@@ -277,11 +273,10 @@ END
     ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"
   fi
 
-  if [[ -f "$startdir/.crash-stats-api.token" ]]; then
-    find . -name '*crashreporter-symbols-full.zip' -exec \
-      "$startdir/upload-symbol-archive" "$startdir/.crash-stats-api.token" {} +
+  export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE="$startdir/.crash-stats-api.token"
+  if [[ -f $SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE ]]; then
+      make -C obj uploadsymbols
   else
-    find . -name '*crashreporter-symbols-full.zip' -exec \
-      cp -fvt "$startdir" {} +
+      cp -fvt "$startdir" obj/dist/*crashreporter-symbols-full.zip
   fi
 }