firefox-esr 68.0

5 files changed, 9 insertions, 119 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce9730714ac3..10061df6061f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-esr
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
-	pkgver = 60.7.2
+	pkgver = 68.0
 	pkgrel = 1
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = i686
@@ -23,6 +23,7 @@ pkgbase = firefox-esr
 	makedepends = llvm
 	makedepends = jack
 	makedepends = gtk2
+	makedepends = cbindgen
 	depends = gtk3
 	depends = mozilla-common
 	depends = libxt
@@ -43,21 +44,13 @@ pkgbase = firefox-esr
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://ftp.mozilla.org/pub/firefox/releases/60.7.2esr/source/firefox-60.7.2esr.source.tar.xz
+	source = https://ftp.mozilla.org/pub/firefox/releases/68.0esr/source/firefox-68.0esr.source.tar.xz
 	source = firefox.desktop
 	source = firefox-symbolic.svg
-	source = rust_133-part0.patch
-	source = rust_133-part1.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046663
-	source = rust_133-part2.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046664
-	source = deny_missing_docs.patch
 	validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A
-	sha256sums = 8a918ea70c806524f293336f6f4574bb6e69ca1e98e6e5e0e5c2d6ad2ac26ac2
+	sha256sums = dbb494521b3e246b367e453cc8d438b82b9fd2e05da273f5901391f0c52008b5
 	sha256sums = 78a920ffdd44e1d51445e7255da4863604be96a4b3cd7a7cb13ecc2efae6cb39
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
-	sha256sums = c10521badc262b476e844d3f3045ddf27e28d83d49b5db0d0e19431f06386e4d
-	sha256sums = 8b37332dd205946ea95c606103b5b0e1e8498819051ea1c1bce79f04fd88ebca
-	sha256sums = 08ab4293d6008524a38e20b428c750c4c55a2f7189e9a0067871ad723c1efab5
-	sha256sums = cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4
 
 pkgname = firefox-esr
 
diff --git a/0000-rust-1.29.patch b/0000-rust-1.29.patch
deleted file mode 100644
index 023dbfd1d857..000000000000
--- a/0000-rust-1.29.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
---- a/build/moz.configure/init.configure
-+++ b/build/moz.configure/init.configure
-@@ -587,17 +587,26 @@ option('--target', nargs=1,
- @imports(_from='__builtin__', _import='KeyError')
- @imports(_from='__builtin__', _import='ValueError')
- def split_triplet(triplet, allow_unknown=False):
-     # The standard triplet is defined as
-     #   CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-     # There is also a quartet form:
-     #   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-     # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
--    cpu, manufacturer, os = triplet.split('-', 2)
-+    # Additionally, some may omit "unknown" when the manufacturer
-+    # is not specified and emit
-+    #   CPU_TYPE-OPERATING_SYSTEM
-+    parts = triplet.split('-', 2)
-+    if len(parts) == 3:
-+        cpu, _, os = parts
-+    elif len(parts) == 2:
-+        cpu, os = parts
-+    else:
-+        die("Unexpected triplet string: %s" % triplet)
- 
-     # Autoconf uses config.sub to validate and canonicalize those triplets,
-     # but the granularity of its results has never been satisfying to our
-     # use, so we've had our own, different, canonicalization. We've also
-     # historically not been very consistent with how we use the canonicalized
-     # values. Hopefully, this will help us make things better.
-     # The tests are inherited from our decades-old autoconf-based configure,
-     # which can probably be improved/cleaned up because they are based on a
-
-
-
-
diff --git a/PKGBUILD b/PKGBUILD
index b66991365d7d..6bb3e8254bdf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox-esr
-pkgver=60.7.2
+pkgver=68.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ url="https://www.mozilla.org/en-US/firefox/organizations/"
 depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
          nss hunspell ttf-font libpulse)
 makedepends=(unzip zip diffutils python2 yasm mesa imake inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm jack gtk2)
+             autoconf2.13 rust clang llvm jack gtk2 cbindgen)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -22,15 +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
-        rust_133-part0.patch 'rust_133-part1.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046663' 'rust_133-part2.patch::https://bugzilla.mozilla.org/attachment.cgi?id=9046664' deny_missing_docs.patch)
-sha256sums=('8a918ea70c806524f293336f6f4574bb6e69ca1e98e6e5e0e5c2d6ad2ac26ac2'
+        firefox.desktop firefox-symbolic.svg)
+sha256sums=('dbb494521b3e246b367e453cc8d438b82b9fd2e05da273f5901391f0c52008b5'
             '78a920ffdd44e1d51445e7255da4863604be96a4b3cd7a7cb13ecc2efae6cb39'
-            'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
-            'c10521badc262b476e844d3f3045ddf27e28d83d49b5db0d0e19431f06386e4d'
-            '8b37332dd205946ea95c606103b5b0e1e8498819051ea1c1bce79f04fd88ebca'
-            '08ab4293d6008524a38e20b428c750c4c55a2f7189e9a0067871ad723c1efab5'
-            'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4')
+            'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -48,14 +43,6 @@ _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
 prepare() {
   cd firefox-${pkgver}
 
-  # Bug 1521249 --enable-rust-simd fails to build using Rust 1.33
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
-  patch -Np1 -i ../rust_133-part0.patch
-  patch -Np1 -i ../rust_133-part1.patch || true
-  patch -Np1 -i ../rust_133-part2.patch
-  patch -Np1 -i ../deny_missing_docs.patch
-  rm -vf third_party/rust/boxfnonce/.travis/id_rsa.enc
-
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
 
@@ -163,7 +150,6 @@ END
     "$pkgdir/usr/share/applications/firefox.desktop"
 
   # Use system-provided dictionaries
-  rm -r "$pkgdir"/usr/lib/firefox/dictionaries
   ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
   ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
 
diff --git a/deny_missing_docs.patch b/deny_missing_docs.patch
deleted file mode 100644
index f7e2b1786d80..000000000000
--- a/deny_missing_docs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru a/servo/components/style/lib.rs b/servo/components/style/lib.rs
---- a/servo/components/style/lib.rs	2019-03-13 22:33:48.000000000 +0100
-+++ b/servo/components/style/lib.rs	2019-03-20 20:33:35.000795785 +0100
-@@ -23,7 +23,6 @@
- //! [cssparser]: ../cssparser/index.html
- //! [selectors]: ../selectors/index.html
- 
--#![deny(missing_docs)]
- 
- extern crate app_units;
- extern crate arrayvec;
-@@ -148,7 +147,6 @@
- /// Generated from the properties.mako.rs template by build.rs
- #[macro_use]
- #[allow(unsafe_code)]
--#[deny(missing_docs)]
- pub mod properties {
-     include!(concat!(env!("OUT_DIR"), "/properties.rs"));
- }
-Sólo en servo/components/style: lib.rs_new
-Sólo en servo/components: style_derive
-diff -ru a/servo/components/style_traits/lib.rs b/servo/components/style_traits/lib.rs
---- a/servo/components/style_traits/lib.rs	2019-03-13 22:33:48.000000000 +0100
-+++ b/servo/components/style_traits/lib.rs	2019-03-20 20:33:40.458773473 +0100
-@@ -9,8 +9,6 @@
- #![crate_name = "style_traits"]
- #![crate_type = "rlib"]
- 
--#![deny(unsafe_code, missing_docs)]
--
- extern crate app_units;
- #[macro_use] extern crate bitflags;
- #[macro_use] extern crate cssparser;
-Sólo en servo/components/style_traits: lib.rs_new
-Sólo en servo/components: url
-Sólo en servo/components: webdriver_server
-Sólo en servo/components: webvr
-Sólo en servo/components: webvr_traits
diff --git a/rust_133-part0.patch b/rust_133-part0.patch
deleted file mode 100644
index 139e11c91b4e..000000000000
--- a/rust_133-part0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/toolkit/moz.configure	2019-03-13 22:33:54.000000000 +0100
-+++ b/toolkit/moz.configure	2019-03-19 10:18:15.769460797 +0100
-@@ -856,9 +856,9 @@
-     # x86 and x86_64. It's meant to work on 32-bit ARM, too,
-     # but currently does not.
-     if target.cpu in ('aarch64', 'x86', 'x86_64') and value:
--        if rustc_info and rustc_info.version >= Version('1.33.0'):
--            die('--enable-rust-simd does not work with Rust 1.33 or later. '
--                'See https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 .')
-+        #if rustc_info and rustc_info.version >= Version('1.33.0'):
-+        #    die('--enable-rust-simd does not work with Rust 1.33 or later. '
-+        #        'See https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 .')
-         return True
- 
- set_config('MOZ_RUST_SIMD', rust_simd)