[pkgsrc/trunk]: pkgsrc/www Fix build with lang/rust-1.33.0. Bump PKGREVISION

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www Fix build with lang/rust-1.33.0. Bump PKGREVISION
From: ryoon <ryoon%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 10:50:13 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/047a5346a0be
branches:  trunk
changeset: 392611:047a5346a0be
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Mar 04 15:53:06 2019 +0000

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

diffstat:

 www/firefox/Makefile                                               |   9 +----
 www/firefox/distinfo                                               |   5 ++-
 www/firefox/mozilla-common.mk                                      |   8 ++--
 www/firefox/patches/patch-servo_components_style__traits_lib.rs    |  14 +++++++++
 www/firefox/patches/patch-servo_components_style__traits_values.rs |  15 ++++++++++
 www/firefox/patches/patch-servo_components_style_lib.rs            |  15 ++++++++++
 www/firefox60/Makefile                                             |   3 +-
 www/firefox60/distinfo                                             |   4 ++-
 www/firefox60/patches/patch-servo_components_style__traits_lib.rs  |  13 ++++++++
 www/firefox60/patches/patch-servo_components_style_lib.rs          |  13 ++++++++
 10 files changed, 85 insertions(+), 14 deletions(-)

diffs (204 lines):

diff -r 96562b002793 -r 047a5346a0be www/firefox/Makefile
--- a/www/firefox/Makefile      Mon Mar 04 15:37:54 2019 +0000
+++ b/www/firefox/Makefile      Mon Mar 04 15:53:06 2019 +0000
@@ -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 @@
 
 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=  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.
diff -r 96562b002793 -r 047a5346a0be www/firefox/distinfo
--- a/www/firefox/distinfo      Mon Mar 04 15:37:54 2019 +0000
+++ b/www/firefox/distinfo      Mon Mar 04 15:53:06 2019 +0000
@@ -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_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
diff -r 96562b002793 -r 047a5346a0be www/firefox/mozilla-common.mk
--- a/www/firefox/mozilla-common.mk     Mon Mar 04 15:37:54 2019 +0000
+++ b/www/firefox/mozilla-common.mk     Mon Mar 04 15:53:06 2019 +0000
@@ -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 @@
 
 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
diff -r 96562b002793 -r 047a5346a0be www/firefox/patches/patch-servo_components_style__traits_lib.rs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-servo_components_style__traits_lib.rs   Mon Mar 04 15:53:06 2019 +0000
@@ -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]
diff -r 96562b002793 -r 047a5346a0be www/firefox/patches/patch-servo_components_style__traits_values.rs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-servo_components_style__traits_values.rs        Mon Mar 04 15:53:06 2019 +0000
@@ -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)]
diff -r 96562b002793 -r 047a5346a0be www/firefox/patches/patch-servo_components_style_lib.rs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-servo_components_style_lib.rs   Mon Mar 04 15:53:06 2019 +0000
@@ -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;
diff -r 96562b002793 -r 047a5346a0be www/firefox60/Makefile
--- a/www/firefox60/Makefile    Mon Mar 04 15:37:54 2019 +0000
+++ b/www/firefox60/Makefile    Mon Mar 04 15:53:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/02/26 11:23:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2019/03/04 15:55:18 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            60.5
@@ -6,6 +6,7 @@
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
diff -r 96562b002793 -r 047a5346a0be www/firefox60/distinfo
--- a/www/firefox60/distinfo    Mon Mar 04 15:37:54 2019 +0000
+++ b/www/firefox60/distinfo    Mon Mar 04 15:53:06 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2019/02/26 13:47:39 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2019/03/04 15:55:18 ryoon Exp $
 
 SHA1 (firefox-60.5.2esr.source.tar.xz) = a6fd649d5a9e3943fb3e67a5e45f856a154b0483
 RMD160 (firefox-60.5.2esr.source.tar.xz) = ba8bb525e8a307c97f4ec4b1e20ab14781a83097
@@ -32,7 +32,9 @@
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 0141dd1372c13ea1fce6e2f5ffb65e0cb0f3a13e
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = a69bc7b7096b410582e725f9dbec57fee90d6686
 SHA1 (patch-modules_pdfium_update.sh) = b0bf091325c9322c54880de067871354cd689038
+SHA1 (patch-servo_components_style__traits_lib.rs) = b07dfc91bae3f94b7da0c5dab523a6901b9b1bf7
 SHA1 (patch-servo_components_style_build__gecko.rs) = fca2260a70b496fc010f165ff4d68788b7e28632
+SHA1 (patch-servo_components_style_lib.rs) = 1df2f6580da3c4a2fadd7ddcead000fa3c8a6a14
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
 SHA1 (patch-toolkit_library_moz.build) = ecb6125e996d5496335c58ecd3433ad3214f29f0
 SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
diff -r 96562b002793 -r 047a5346a0be www/firefox60/patches/patch-servo_components_style__traits_lib.rs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox60/patches/patch-servo_components_style__traits_lib.rs Mon Mar 04 15:53:06 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-servo_components_style__traits_lib.rs,v 1.1 2019/03/04 15:55:18 ryoon Exp $
+
+--- servo/components/style_traits/lib.rs.orig  2019-02-21 19:22:50.000000000 +0000
++++ servo/components/style_traits/lib.rs
+@@ -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;
diff -r 96562b002793 -r 047a5346a0be www/firefox60/patches/patch-servo_components_style_lib.rs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox60/patches/patch-servo_components_style_lib.rs Mon Mar 04 15:53:06 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-servo_components_style_lib.rs,v 1.1 2019/03/04 15:55:18 ryoon Exp $
+
+--- servo/components/style/lib.rs.orig 2019-02-21 19:22:50.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;
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/rust Bump bootstrap for armv7/NetBSD to 1.33.0 (s...
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/thunderbird Fix build with lang/rust-1.33.0. Bump...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/rust Bump bootstrap for armv7/NetBSD to 1.33.0 (s...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/thunderbird Fix build with lang/rust-1.33.0. Bump...
Indexes:
Home | Main Index | Thread Index | Old Index