60.1.0

2 files changed, 7 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c53fca1f209..df5405d3f451 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-esr
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
-	pkgver = 60.0.2
+	pkgver = 60.1.0
 	pkgrel = 1
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = i686
@@ -47,19 +47,13 @@ pkgbase = firefox-esr
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://ftp.mozilla.org/pub/firefox/releases/60.0.2esr/source/firefox-60.0.2esr.source.tar.xz
+	source = https://ftp.mozilla.org/pub/firefox/releases/60.1.0esr/source/firefox-60.1.0esr.source.tar.xz
 	source = firefox.desktop
 	source = firefox-symbolic.svg
-	source = 0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
-	source = complete-csd-window-offset-mozilla-1457691.patch.xz
-	source = no-crmf.diff
 	validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A
-	sha256sums = 4c629edac14e15c41b04320b0f66a46f25537661324cdc0ed30dc0799d7708a0
+	sha256sums = a4e7bb80e7ebab19769b2b8940966349136a99aabd497034662cffa54ea30e40
 	sha256sums = c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
-	sha256sums = 8422030440032535d918844263fbd92d39bff207acb5fff55ed0afee38bcf582
-	sha256sums = a3fb3c3b6fb775c99afdbad507848b77c5e4bbaac2e8ceeb1bfb47699c4b6268
-	sha256sums = 02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873
 
 pkgname = firefox-esr
 
diff --git a/PKGBUILD b/PKGBUILD
index 693dc0807530..fdc0bc783ce0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox-esr
-pkgver=60.0.2
+pkgver=60.1.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
 arch=(i686 x86_64)
@@ -22,16 +22,10 @@ provides=(firefox)
 conflicts=(firefox)
 options=(!emptydirs !makeflags !strip)
 source=(https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz
-        firefox.desktop firefox-symbolic.svg
-        0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
-        complete-csd-window-offset-mozilla-1457691.patch.xz
-        no-crmf.diff)
-sha256sums=('4c629edac14e15c41b04320b0f66a46f25537661324cdc0ed30dc0799d7708a0'
+        firefox.desktop firefox-symbolic.svg)
+sha256sums=('a4e7bb80e7ebab19769b2b8940966349136a99aabd497034662cffa54ea30e40'
             'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826'
-            'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
-            '8422030440032535d918844263fbd92d39bff207acb5fff55ed0afee38bcf582'
-            'a3fb3c3b6fb775c99afdbad507848b77c5e4bbaac2e8ceeb1bfb47699c4b6268'
-            '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873')
+            'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -52,15 +46,6 @@ prepare() {
 
   cd firefox-${pkgver}
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1435212
-  patch -Np1 -i ../0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch
-
-  # 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=1371991
-  patch -Np1 -i ../no-crmf.diff
-
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key