summaryrefslogtreecommitdiff
path: root/source/xap
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap')
-rw-r--r--source/xap/FTBFSlog6
-rwxr-xr-xsource/xap/mozilla-firefox/mozilla-firefox.SlackBuild3
-rw-r--r--source/xap/mozilla-firefox/unbreakdocs.diff38
-rwxr-xr-xsource/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild3
-rw-r--r--source/xap/mozilla-thunderbird/unbreakdocs.diff38
5 files changed, 88 insertions, 0 deletions
diff --git a/source/xap/FTBFSlog b/source/xap/FTBFSlog
index 29e283e6..2ca99769 100644
--- a/source/xap/FTBFSlog
+++ b/source/xap/FTBFSlog
@@ -1,3 +1,9 @@
+Tue Mar 26 23:03:23 UTC 2019
+ mozilla-firefox: added unbreakdocs patch to fix build with latest Rust.
+ Thanks to Stuart Winter.
+ mozilla-thunderbird: added unbreakdocs patch to fix build with latest Rust.
+ Thanks to Stuart Winter.
++--------------------------+
Sat Mar 10 21:02:18 UTC 2018
mozilla-firefox: reduce Rust debug level to avoid memory issues during build.
+--------------------------+
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 0b1f0eea..3649ce8e 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -183,6 +183,9 @@ sed -i.allow-warnings -e '/#!\[deny(warnings)\]/a #![allow(unused_imports)]' \
# Retain GTK+ v2 scrolling behavior:
zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
+# Fix building with latest Rust:
+zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1
+
# Fetch localization, if requested
# https://bugzilla.mozilla.org/show_bug.cgi?id=1256955
if [ ! -z $MOZLOCALIZE ]; then
diff --git a/source/xap/mozilla-firefox/unbreakdocs.diff b/source/xap/mozilla-firefox/unbreakdocs.diff
new file mode 100644
index 00000000..b76dc71d
--- /dev/null
+++ b/source/xap/mozilla-firefox/unbreakdocs.diff
@@ -0,0 +1,38 @@
+
+https://lists.freebsd.org/pipermail/freebsd-gecko/2019-March/009206.html
+https://github.com/grahamperrin/Waterfox/pull/7/files
+
+
+diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo/components/style/lib.rs
+--- firefox-60.6.0_orig/servo/components/style/lib.rs 2019-03-13 21:33:48.000000000 +0000
++++ firefox-60.6.0/servo/components/style/lib.rs 2019-03-20 13:06:18.611024453 +0000
+@@ -23,7 +23,7 @@
+ //! [cssparser]: ../cssparser/index.html
+ //! [selectors]: ../selectors/index.html
+
+-#![deny(missing_docs)]
++// #![deny(missing_docs)]
+
+ extern crate app_units;
+ extern crate arrayvec;
+@@ -148,7 +148,7 @@
+ /// Generated from the properties.mako.rs template by build.rs
+ #[macro_use]
+ #[allow(unsafe_code)]
+-#[deny(missing_docs)]
++// #[deny(missing_docs)]
+ pub mod properties {
+ include!(concat!(env!("OUT_DIR"), "/properties.rs"));
+ }
+diff -urN firefox-60.6.0_orig/servo/components/style_traits/lib.rs firefox-60.6.0/servo/components/style_traits/lib.rs
+--- firefox-60.6.0_orig/servo/components/style_traits/lib.rs 2019-03-13 21:33:48.000000000 +0000
++++ firefox-60.6.0/servo/components/style_traits/lib.rs 2019-03-20 13:06:47.137024070 +0000
+@@ -9,7 +9,7 @@
+ #![crate_name = "style_traits"]
+ #![crate_type = "rlib"]
+
+-#![deny(unsafe_code, missing_docs)]
++#![deny(unsafe_code)]
+
+ extern crate app_units;
+ #[macro_use] extern crate bitflags;
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 9f30d1c3..b03c373b 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -161,6 +161,9 @@ cd thunderbird-$RELEASEVER || exit 1
# Retain GTK+ v2 scrolling behavior:
zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p2 --verbose || exit 1
+# Fix building with latest Rust:
+zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1
+
# Fetch localization, if requested:
if [ ! -z $MOZLOCALIZE ]; then
LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE"
diff --git a/source/xap/mozilla-thunderbird/unbreakdocs.diff b/source/xap/mozilla-thunderbird/unbreakdocs.diff
new file mode 100644
index 00000000..b76dc71d
--- /dev/null
+++ b/source/xap/mozilla-thunderbird/unbreakdocs.diff
@@ -0,0 +1,38 @@
+
+https://lists.freebsd.org/pipermail/freebsd-gecko/2019-March/009206.html
+https://github.com/grahamperrin/Waterfox/pull/7/files
+
+
+diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo/components/style/lib.rs
+--- firefox-60.6.0_orig/servo/components/style/lib.rs 2019-03-13 21:33:48.000000000 +0000
++++ firefox-60.6.0/servo/components/style/lib.rs 2019-03-20 13:06:18.611024453 +0000
+@@ -23,7 +23,7 @@
+ //! [cssparser]: ../cssparser/index.html
+ //! [selectors]: ../selectors/index.html
+
+-#![deny(missing_docs)]
++// #![deny(missing_docs)]
+
+ extern crate app_units;
+ extern crate arrayvec;
+@@ -148,7 +148,7 @@
+ /// Generated from the properties.mako.rs template by build.rs
+ #[macro_use]
+ #[allow(unsafe_code)]
+-#[deny(missing_docs)]
++// #[deny(missing_docs)]
+ pub mod properties {
+ include!(concat!(env!("OUT_DIR"), "/properties.rs"));
+ }
+diff -urN firefox-60.6.0_orig/servo/components/style_traits/lib.rs firefox-60.6.0/servo/components/style_traits/lib.rs
+--- firefox-60.6.0_orig/servo/components/style_traits/lib.rs 2019-03-13 21:33:48.000000000 +0000
++++ firefox-60.6.0/servo/components/style_traits/lib.rs 2019-03-20 13:06:47.137024070 +0000
+@@ -9,7 +9,7 @@
+ #![crate_name = "style_traits"]
+ #![crate_type = "rlib"]
+
+-#![deny(unsafe_code, missing_docs)]
++#![deny(unsafe_code)]
+
+ extern crate app_units;
+ #[macro_use] extern crate bitflags;