revert source array and fix pentium4

2 files changed, 21 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65df6f931ced..a79ca0897961 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,15 +26,13 @@ pkgbase = firefox-nightly-en-gb
 	conflicts = firefox-nightly
 	source = firefox-nightly.desktop
 	source = policies.json
+	source = 20191124-094313-firefox-72.0a1.en-GB.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/2019/11/2019-11-24-09-43-13-mozilla-central-l10n/firefox-72.0a1.en-GB.linux-x86_64.linux-x86_64.tar.bz2
+	source = 20191124-094313-firefox-72.0a1.en-GB.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/2019/11/2019-11-24-09-43-13-mozilla-central-l10n/firefox-72.0a1.en-GB.linux-x86_64.linux-x86_64.tar.bz2.asc
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha512sums = b514abafc559ec03a4222442fa4306db257c3de9e18ed91a0b37cc9d7058a8e08a241442e54a67659a3ab4512a5dae6a0b94ea7a33d08ef0b8a76a9eac902095
 	sha512sums = 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
-	source_i686 = 20191124-094313-firefox-72.0a1.en-GB-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/2019/11/2019-11-24-09-43-13-mozilla-central-l10n/firefox-72.0a1.en-GB.linux-i686.tar.bz2
-	source_i686 = 20191124-094313-firefox-72.0a1.en-GB-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/2019/11/2019-11-24-09-43-13-mozilla-central-l10n/firefox-72.0a1.en-GB.tar.bz2.asc
-	source_pentium4 = 20191124-094313-firefox-72.0a1.en-GB-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/2019/11/2019-11-24-09-43-13-mozilla-central-l10n/firefox-72.0a1.en-GB.linux-i686.tar.bz2
-	source_pentium4 = 20191124-094313-firefox-72.0a1.en-GB-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/2019/11/2019-11-24-09-43-13-mozilla-central-l10n/firefox-72.0a1.en-GB.tar.bz2.asc
-	source_x86_64 = 20191124-094313-firefox-72.0a1.en-GB-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/2019/11/2019-11-24-09-43-13-mozilla-central-l10n/firefox-72.0a1.en-GB.linux-x86_64.tar.bz2
-	source_x86_64 = 20191124-094313-firefox-72.0a1.en-GB-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/2019/11/2019-11-24-09-43-13-mozilla-central-l10n/firefox-72.0a1.en-GB.tar.bz2.asc
+	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = firefox-nightly-en-gb
 
diff --git a/PKGBUILD b/PKGBUILD
index cd74eb4b9792..dd54ff238345 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,10 +10,18 @@ pkgname=${_name}-${_channel}-${_lang,,}
 pkgdesc="Standalone Web Browser from Mozilla — Nightly build (${_lang})"
 url="https://www.mozilla.org/${_lang}/${_name}/${_channel}"
 
+# For Arch Linux 32: fallback to i686 on pentium4 arch.
+if [[ "x${CARCH}" == xpentium4 ]]
+then
+  _carch=i686
+else
+  _carch="${CARCH}"
+fi
+
 _version=72.0a1
 declare -A _build_id
 _build_id=(
-	[id]="$(curl https://ftp.mozilla.org/pub/${_name}/${_channel}/latest-mozilla-central-l10n/${_name}-${_version}.${_lang}.linux-${CARCH}.checksums | grep '.partial.mar' | cut -d' ' -f4 | grep -E -o '[[:digit:]]{14}' | sort | tail -n1)"
+	[id]="$(curl https://ftp.mozilla.org/pub/${_name}/${_channel}/latest-mozilla-central-l10n/${_name}-${_version}.${_lang}.linux-${_carch}.checksums | grep '.partial.mar' | cut -d' ' -f4 | grep -E -o '[[:digit:]]{14}' | sort | tail -n1)"
 	[year]="${_build_id[id]:0:4}"
 	[month]="${_build_id[id]:4:2}"
 	[day]="${_build_id[id]:6:2}"
@@ -41,21 +49,16 @@ optdepends=('pulseaudio: audio support'
             'startup-notification: support for FreeDesktop Startup Notification')
 
 _url="https://ftp.mozilla.org/pub/${_name}/${_channel}/${_build_id[year]}/${_build_id[month]}/${_build_id[year]}-${_build_id[month]}-${_build_id[day]}-${_build_id[hour]}-${_build_id[min]}-${_build_id[sec]}-mozilla-central-l10n"
-_src="${_name}-${_version}.${_lang}"
-_filename="${_build_id[date]}-${_build_id[time]}-${_src}-${CARCH}"
+_src="${_name}-${_version}.${_lang}.linux-${_carch}"
+_filename="${_build_id[date]}-${_build_id[time]}-${_src}"
 source=('firefox-nightly.desktop'
-        'policies.json')
-source_i686=("${_filename}.tar.bz2"::"${_url}/${_src}.linux-i686.tar.bz2"
-             "${_filename}.tar.bz2.asc"::"${_url}/${_src}.linux-i686.tar.bz2.asc")
-source_pentium4=("${_filename}.tar.bz2"::"${_url}/${_src}.linux-i686.tar.bz2"
-                 "${_filename}.tar.bz2.asc"::"${_url}/${_src}.linux-i686.tar.bz2.asc")
-source_x86_64=("${_filename}.tar.bz2"::"${_url}/${_src}.linux-x86_64.tar.bz2"
-               "${_filename}.tar.bz2.asc"::"${_url}/${_src}.linux-x86_64.tar.bz2.asc")
+        'policies.json'
+        "${_filename}.tar.bz2"::"${_url}/${_src}.linux-x86_64.tar.bz2"
+        "${_filename}.tar.bz2.asc"::"${_url}/${_src}.linux-x86_64.tar.bz2.asc")
 sha512sums=('b514abafc559ec03a4222442fa4306db257c3de9e18ed91a0b37cc9d7058a8e08a241442e54a67659a3ab4512a5dae6a0b94ea7a33d08ef0b8a76a9eac902095'
-            '5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308')
-sha512sums_i686=(SKIP SKIP)
-sha512sums_pentium4=(SKIP SKIP)
-sha512sums_x86_64=(SKIP SKIP)
+            '5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308'
+            'SKIP'
+            'SKIP')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla’s GnuPG release key
 
 package() {