Rebuild with latest rust 1.33

3 files changed, 58 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2dbc50e365de..ea96aa01a837 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = icecat
 	pkgdesc = GNU version of the Firefox browser.
 	pkgver = 60.3.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.gnu.org/software/gnuzilla/
 	arch = i686
 	arch = x86_64
@@ -45,11 +45,17 @@ pkgbase = icecat
 	source = http://ftpmirror.gnu.org/gnuzilla/60.3.0/icecat-60.3.0-gnu1.tar.bz2.sig
 	source = icecat.desktop
 	source = icecat-safe.desktop
+	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 = A57369A8BABC2542B5A0368C3C76EED7D7E04784
 	sha256sums = 6145327092b4b195a4f63d0e86f4857eeba5607ffeb69b6f3bceb36e89a19645
 	sha256sums = SKIP
 	sha256sums = c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3
 	sha256sums = 190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303
+	sha256sums = 8b37332dd205946ea95c606103b5b0e1e8498819051ea1c1bce79f04fd88ebca
+	sha256sums = 08ab4293d6008524a38e20b428c750c4c55a2f7189e9a0067871ad723c1efab5
+	sha256sums = cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4
 
 pkgname = icecat
 
diff --git a/PKGBUILD b/PKGBUILD
index 406288ca8b9b..c741db55e9bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=icecat
 pkgver=60.3.0
 _pkgver=${pkgver}-gnu1
 _pkgverbase=${pkgver%%.*}
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU version of the Firefox browser."
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnuzilla/"
@@ -31,12 +31,16 @@ source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz
 #source=(https://mirrors.kernel.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2      ## Good mirror
 #source=(http://jenkins.trisquel.info/icecat/${pkgname}-${_pkgver}.tar.bz2      ## Official developer (Ruben Rodriguez) site. Probably only has developer releases.
 #source=(http://alpha.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
-        icecat.desktop icecat-safe.desktop)
+        icecat.desktop icecat-safe.desktop
+        '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=('6145327092b4b195a4f63d0e86f4857eeba5607ffeb69b6f3bceb36e89a19645'
             'SKIP'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
-            '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303')
+            '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
+            '8b37332dd205946ea95c606103b5b0e1e8498819051ea1c1bce79f04fd88ebca'
+            '08ab4293d6008524a38e20b428c750c4c55a2f7189e9a0067871ad723c1efab5'
+            'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4')
 
 validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
 
@@ -48,6 +52,12 @@ prepare() {
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
 
+  # 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-part1.patch || true
+  patch -Np1 -i ../rust_133-part2.patch
+  patch -Np1 -i ../deny_missing_docs.patch
+
   printf '%b' "  \e[1;36m->\e[0m\033[1m Starting build...\n"
   
   cat >.mozconfig <<END
diff --git a/deny_missing_docs.patch b/deny_missing_docs.patch
new file mode 100644
index 000000000000..f7e2b1786d80
--- /dev/null
+++ b/deny_missing_docs.patch
@@ -0,0 +1,38 @@
+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