Changed source download to tarball

1 files changed, 34 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 729604d..225a959 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,16 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox
-pkgver=61.0.1
-pkgrel=1
+majver=61
+minver=0
+revver=1
+bz2ver=${majver}_${minver}_${revver}
+pkgver=$majver.$minver.$revver
+pkgrel=2
+#pkgname=firefox
+#pkgver=61.0.1
+#bz2ver=$(echo $pkgver | sed 's/\./_/g')
+#pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -18,12 +26,12 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'speech-dispatcher: Text-to-Speech')
 options=(!emptydirs !makeflags !strip)
-_repo=https://hg.mozilla.org/mozilla-unified
-source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
+#_repo=https://hg.mozilla.org/mozilla-unified
+source=(firefox-$pkgver.tar.bz2::https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${bz2ver}_RELEASE.tar.bz2
         $pkgname.desktop firefox-symbolic.svg
         vendor.js
         package-manifest.diff)
-sha256sums=('SKIP'
+sha256sums=('a35e753b439aba1aca28e64e1ce5c9b3716d162adcd0318e135e512bdb949430'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
             '5c481e4fd2d51264d92e04d777d69975f4d1cc2b456d477537bba6c0c7ed88c0'
@@ -31,7 +39,9 @@ sha256sums=('SKIP'
 
 prepare() {
 
-  cat >$srcdir/mozilla-unified/.mozconfig <<END
+  cd mozilla-release-FIREFOX_${bz2ver}_RELEASE
+
+  cat >$srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/.mozconfig <<END
 ac_add_options --enable-application=browser
 
 ac_add_options --prefix=/usr
@@ -76,27 +86,27 @@ mk_add_options MOZ_MAKE_FLAGS="-j2"
 END
 
   # Disable various components at the source level
-  sed -i 's|[;]1|;0|' $srcdir/mozilla-unified/toolkit/components/telemetry/TelemetryStartup.manifest
-#  sed -i 's|[;]1|;0|' $srcdir/mozilla-unified/browser/experiments/Experiments.manifest
-  sed -i '/pocket/d' $srcdir/mozilla-unified/browser/extensions/moz.build
-  sed -i '/activity-stream/d' $srcdir/mozilla-unified/browser/extensions/moz.build
-  sed -i '/aushelper/d' $srcdir/mozilla-unified/browser/extensions/moz.build
-  sed -i '/followonsearch/d' $srcdir/mozilla-unified/browser/extensions/moz.build
-  sed -i '/formautofill/d' $srcdir/mozilla-unified/browser/extensions/moz.build
-  sed -i '/onboarding/d' $srcdir/mozilla-unified/browser/extensions/moz.build
-  sed -i '/screenshots/d' $srcdir/mozilla-unified/browser/extensions/moz.build
-  sed -i '/webcompat/d' $srcdir/mozilla-unified/browser/extensions/moz.build
+  sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/toolkit/components/telemetry/TelemetryStartup.manifest
+#  sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/experiments/Experiments.manifest
+  sed -i '/pocket/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+  sed -i '/activity-stream/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+  sed -i '/aushelper/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+  sed -i '/followonsearch/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+  sed -i '/formautofill/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+  sed -i '/onboarding/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+  sed -i '/screenshots/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
+  sed -i '/webcompat/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build
 
 
 }
 
 build() {
-  cd mozilla-unified
-  mkdir $srcdir/mozilla-unified/obj-x86_64-pc-linux-gnu
-  mkdir $srcdir/mozilla-unified/obj-x86_64-pc-linux-gnu/dist
-  mkdir $srcdir/mozilla-unified/obj-x86_64-pc-linux-gnu/dist/bin
-  mkdir $srcdir/mozilla-unified/obj-x86_64-pc-linux-gnu/dist/bin/browser
-  mkdir $srcdir/mozilla-unified/obj-x86_64-pc-linux-gnu/dist/bin/browser/features
+  cd mozilla-release-FIREFOX_${bz2ver}_RELEASE
+  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu
+  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist
+  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin
+  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin/browser
+  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin/browser/features
 
   export MOZ_SOURCE_REPO="$_repo"
 
@@ -105,8 +115,8 @@ build() {
 }
 
 package() {
-  cd mozilla-unified
-  patch -p0 $srcdir/mozilla-unified/browser/installer/package-manifest.in $srcdir/package-manifest.diff
+  cd mozilla-release-FIREFOX_${bz2ver}_RELEASE
+  patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/installer/package-manifest.in $srcdir/package-manifest.diff
   DESTDIR="$pkgdir" ./mach install
   # find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +