CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Mar  4 15:53:06 UTC 2019

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo mozilla-common.mk
Added Files:
        pkgsrc/www/firefox/patches: patch-servo_components_style__traits_lib.rs
            patch-servo_components_style__traits_values.rs
            patch-servo_components_style_lib.rs

Log Message:
Fix build with lang/rust-1.33.0. Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.361 -r1.362 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.340 -r1.341 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.126 -r1.127 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-servo_components_style__traits_lib.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style__traits_values.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_lib.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.361 pkgsrc/www/firefox/Makefile:1.362
--- pkgsrc/www/firefox/Makefile:1.361   Sun Mar  3 00:57:29 2019
+++ pkgsrc/www/firefox/Makefile Mon Mar  4 15:53:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.361 2019/03/03 00:57:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.362 2019/03/04 15:53:06 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            65.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=       .2
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
@@ -67,12 +68,6 @@ MOZILLA_NAME=        Firefox
 MOZILLA_NAME=  Browser
 .endif
 
-SUBST_CLASSES+=                sys-dic
-SUBST_STAGE.sys-dic=   pre-configure
-SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries.
-SUBST_FILES.sys-dic=   extensions/spellcheck/hunspell/glue/mozHunspell.cpp
-SUBST_VARS.sys-dic=    PREFIX
-
 post-extract:
        mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
 # XXX Hack taken from lang/rust.

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.340 pkgsrc/www/firefox/distinfo:1.341
--- pkgsrc/www/firefox/distinfo:1.340   Sun Mar  3 00:57:29 2019
+++ pkgsrc/www/firefox/distinfo Mon Mar  4 15:53:06 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.340 2019/03/03 00:57:29 ryoon Exp $
+$NetBSD: distinfo,v 1.341 2019/03/04 15:53:06 ryoon Exp $
 
 SHA1 (firefox-65.0.2.source.tar.xz) = b38b5f10faac672656933c1c3537281d449d2785
 RMD160 (firefox-65.0.2.source.tar.xz) = 62587dbd874fa2a302cd8aed715512bce3241b67
@@ -29,7 +29,10 @@ SHA1 (patch-media_libcubeb_src_moz.build
 SHA1 (patch-media_libcubeb_update.sh) = cddb5849fa2972e961e4891bc8a79a650df06d8d
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
 SHA1 (patch-python_mozbuild_mozbuild_action_check__binary.py) = 8103ca9f95fe98a4461c97abcd4cafd5ae5294f0
+SHA1 (patch-servo_components_style__traits_lib.rs) = 0d9d3c605063950296693703fa784e1f242c68e1
+SHA1 (patch-servo_components_style__traits_values.rs) = dda1fc773b3a2bbcf01689eb04085a447676df5c
 SHA1 (patch-servo_components_style_build__gecko.rs) = dacdcb69de1c8409bda20b11afbfa49624005c72
+SHA1 (patch-servo_components_style_lib.rs) = cc83236c03913f19bcfb710e7ac6bd891a872713
 SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = bacab47c65bd9d3f5686426f1026edccda66942f
 SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_other_mod.rs) = 7af37abb3bf0674591192146476ea46ca180b5ab
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 082aa7830b33cb91c2606fb06059d544c70a7e62

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.126 pkgsrc/www/firefox/mozilla-common.mk:1.127
--- pkgsrc/www/firefox/mozilla-common.mk:1.126  Tue Feb 26 12:14:12 2019
+++ pkgsrc/www/firefox/mozilla-common.mk        Mon Mar  4 15:53:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.126 2019/02/26 12:14:12 rin Exp $
+# $NetBSD: mozilla-common.mk,v 1.127 2019/03/04 15:53:06 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -76,15 +76,15 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}br
 
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
 CONFIGURE_ARGS+=       --enable-release
-CONFIGURE_ARGS+=       --enable-rust-simd
+# Disable Rust SIMD option to fix build with lang/rust-1.33.0
+# This should be enabled later again.
+#CONFIGURE_ARGS+=      --enable-rust-simd
 CONFIGURE_ARGS+=       --enable-webrender=build
 CONFIGURE_ARGS+=       --disable-tests
 # Mozilla Bug 1432751
 #CONFIGURE_ARGS+=      --enable-system-cairo
 CONFIGURE_ARGS+=       --enable-system-pixman
 CONFIGURE_ARGS+=       --with-system-libvpx
-# textproc/hunspell 1.3 is too old
-#CONFIGURE_ARGS+=      --enable-system-hunspell
 CONFIGURE_ARGS+=       --enable-system-ffi
 CONFIGURE_ARGS+=       --with-system-icu
 CONFIGURE_ARGS+=       --with-system-nss

Added files:

Index: pkgsrc/www/firefox/patches/patch-servo_components_style__traits_lib.rs
diff -u /dev/null pkgsrc/www/firefox/patches/patch-servo_components_style__traits_lib.rs:1.1
--- /dev/null   Mon Mar  4 15:53:06 2019
+++ pkgsrc/www/firefox/patches/patch-servo_components_style__traits_lib.rs      Mon Mar  4 15:53:06 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-servo_components_style__traits_lib.rs,v 1.1 2019/03/04 15:53:06 ryoon Exp $
+
+* Fix build with lang/rust-1.33.0
+
+--- servo/components/style_traits/lib.rs.orig  2019-02-27 22:18:27.000000000 +0000
++++ servo/components/style_traits/lib.rs
+@@ -8,7 +8,6 @@
+ 
+ #![crate_name = "style_traits"]
+ #![crate_type = "rlib"]
+-#![deny(unsafe_code, missing_docs)]
+ 
+ extern crate app_units;
+ #[macro_use]
Index: pkgsrc/www/firefox/patches/patch-servo_components_style__traits_values.rs
diff -u /dev/null pkgsrc/www/firefox/patches/patch-servo_components_style__traits_values.rs:1.1
--- /dev/null   Mon Mar  4 15:53:06 2019
+++ pkgsrc/www/firefox/patches/patch-servo_components_style__traits_values.rs   Mon Mar  4 15:53:06 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-servo_components_style__traits_values.rs,v 1.1 2019/03/04 15:53:06 ryoon Exp $
+
+* Fix build with lang/rust-1.33.0
+
+--- servo/components/style_traits/values.rs.orig       2019-02-27 22:18:28.000000000 +0000
++++ servo/components/style_traits/values.rs
+@@ -450,7 +432,7 @@ impl_to_css_for_predefined_type!(::csspa
+ impl_to_css_for_predefined_type!(::cssparser::Color);
+ impl_to_css_for_predefined_type!(::cssparser::UnicodeRange);
+ 
+-#[macro_export]
++/// Define an enum type with unit variants that each corrsepond to a CSS keyword.
+ macro_rules! define_css_keyword_enum {
+     (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
+         #[allow(missing_docs)]
Index: pkgsrc/www/firefox/patches/patch-servo_components_style_lib.rs
diff -u /dev/null pkgsrc/www/firefox/patches/patch-servo_components_style_lib.rs:1.1
--- /dev/null   Mon Mar  4 15:53:06 2019
+++ pkgsrc/www/firefox/patches/patch-servo_components_style_lib.rs      Mon Mar  4 15:53:06 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-servo_components_style_lib.rs,v 1.1 2019/03/04 15:53:06 ryoon Exp $
+
+* Fix build with lang/rust-1.33.0
+
+--- servo/components/style/lib.rs.orig 2019-02-27 22:18:28.000000000 +0000
++++ servo/components/style/lib.rs
+@@ -23,8 +23,6 @@
+ //! [cssparser]: ../cssparser/index.html
+ //! [selectors]: ../selectors/index.html
+ 
+-#![deny(missing_docs)]
+-
+ extern crate app_units;
+ extern crate arrayvec;
+ extern crate atomic_refcell;