Updated to 60.0.1

1 files changed, 20 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4806d9c..257e787 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox
-pkgver=59.0.2
-pkgrel=3
+pkgver=60.0.1
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -21,22 +21,27 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags !strip)
 _repo=https://hg.mozilla.org/mozilla-unified
 source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
+        complete-csd-window-offset-mozilla-1457691.patch.xz
         0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
         $pkgname.desktop firefox-symbolic.svg
         no-crmf.diff
-         vendor.js)
+        vendor.js)
 sha256sums=('SKIP'
+            'a3fb3c3b6fb775c99afdbad507848b77c5e4bbaac2e8ceeb1bfb47699c4b6268'
             '8422030440032535d918844263fbd92d39bff207acb5fff55ed0afee38bcf582'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
             '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
-            '3aabcc9ac0389e13b0f98c86f0c58b248e69bb3e9d83747619bce8a00602824b')
+            'ea7c74586629bf0a888e0a67c2d3ce155a45a34f5391e49e478d5bdcd09fed8b')
 
 prepare() {
   mkdir path
   ln -s /usr/bin/python2 path/python
 
   cd mozilla-unified
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1283299#c158
+  patch -Np1 -i ../complete-csd-window-offset-mozilla-1457691.patch
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1435212
   patch -Np1 -i ../0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch
 
@@ -83,6 +88,8 @@ ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-webrtc
 
+mk_add_options MOZ_MAKE_FLAGS="-j2"
+
 END
 
   # Disable various components at the source level
@@ -90,6 +97,14 @@ END
   sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
   sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket"
   sed -i '/activity-stream/d' browser/extensions/moz.build || die "failed to wipe activity-stream"
+  sed -i '/aushelper/d' browser/extensions/moz.build || die "failed to wipe aushelper"
+  sed -i '/followonsearch/d' browser/extensions/moz.build || die "failed to wipe followonsearch"
+  sed -i '/formautofill/d' browser/extensions/moz.build || die "failed to wipe formautofill"
+  sed -i '/onboarding/d' browser/extensions/moz.build || die "failed to wipe onboarding"
+  sed -i '/screenshots/d' browser/extensions/moz.build || die "failed to wipe screenshots"
+  #sed -i '/webcompat/d' browser/extensions/moz.build || die "failed to wipe webcompat"
+
+
 }
 
 build() {
@@ -111,7 +126,7 @@ build() {
 package() {
   cd mozilla-unified
   DESTDIR="$pkgdir" ./mach install
-  find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
+  # find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
 
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
   local shortver=$(echo $pkgver | cut -d'.' -f1,2)