diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-02-28 18:51:45 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-02-28 18:51:45 +0000 |
| commit | 87378368c4cd9d84e237f7da415b7dac422158ae (patch) | |
| tree | 692346311e6ea5e3a20aa4de86fc4c034fef9753 | |
| parent | USES=cargo to update libc to 0.2.49 for Tier2 (diff) | |
lang/rust: update to 1.33.0
- www/firefox temporarily loses SIMD in charset conversion, see
https://bugzilla.mozilla.org/show_bug.cgi?id=1521249
- Force rebuild all consumers to catch regressions early
Changes: https://blog.rust-lang.org/2019/02/28/Rust-1.33.0.html
Tested by: Mikaël Urankar (aarch64, armv6, armv7, powerpc64), Piotr Kubaj (powerpc64)
Approved by: rust (tobik)
Differential Revision: https://reviews.freebsd.org/D19354
Notes
Notes:
svn path=/head/; revision=494176
78 files changed, 1541 insertions, 329 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 7c5a56b901ab..a77c85418cbe 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -43,7 +43,7 @@ DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}.tar.gz:cargo_${_crate:S/-//g:S/.//g} CARGO_BUILDDEP?= yes .if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.32.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.33.0:lang/${RUST_DEFAULT} .endif # Location of cargo binary (default to lang/rust's Cargo binary) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index d21d52b59f49..f9d12bf5e425 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -355,7 +355,7 @@ MOZ_OPTIONS+= --enable-debug --disable-release STRIP= # ports/184285 .else MOZ_OPTIONS+= --disable-debug --disable-debug-symbols --enable-release -. if ${MOZILLA_VER:R:R} >= 56 && (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}) +. if ${MOZILLA_VER:R:R} >= 67 && (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}) MOZ_OPTIONS+= --enable-rust-simd . endif .endif diff --git a/audio/spotifyd/Makefile b/audio/spotifyd/Makefile index 8d5ebc634bc5..917269656cdb 100644 --- a/audio/spotifyd/Makefile +++ b/audio/spotifyd/Makefile @@ -3,7 +3,7 @@ PORTNAME= spotifyd DISTVERSIONPREFIX= v DISTVERSION= 0.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= tobik@FreeBSD.org diff --git a/benchmarks/hyperfine/Makefile b/benchmarks/hyperfine/Makefile index 5a47fd34536a..3fe5d328afc1 100644 --- a/benchmarks/hyperfine/Makefile +++ b/benchmarks/hyperfine/Makefile @@ -3,7 +3,7 @@ PORTNAME= hyperfine DISTVERSIONPREFIX= v DISTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= benchmarks MAINTAINER= pizzamig@FreeBSD.org diff --git a/databases/puppetdb-cli/Makefile b/databases/puppetdb-cli/Makefile index 83cbf9cd55ae..6a515287ab03 100644 --- a/databases/puppetdb-cli/Makefile +++ b/databases/puppetdb-cli/Makefile @@ -2,7 +2,7 @@ PORTNAME= puppetdb-cli PORTVERSION= 1.2.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases MAINTAINER= puppet@FreeBSD.org diff --git a/devel/bingrep/Makefile b/devel/bingrep/Makefile index 3f4efd0da402..37e5715f62c3 100644 --- a/devel/bingrep/Makefile +++ b/devel/bingrep/Makefile @@ -2,7 +2,7 @@ PORTNAME= bingrep PORTVERSION= g20171111 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org diff --git a/devel/git-absorb/Makefile b/devel/git-absorb/Makefile index 48770db8f6e4..6bed13e067a4 100644 --- a/devel/git-absorb/Makefile +++ b/devel/git-absorb/Makefile @@ -2,7 +2,7 @@ PORTNAME= git-absorb DISTVERSION= 0.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= greg@unrelenting.technology diff --git a/devel/interactive_rebase_tool/Makefile b/devel/interactive_rebase_tool/Makefile index a357b1283329..c6c7a4653967 100644 --- a/devel/interactive_rebase_tool/Makefile +++ b/devel/interactive_rebase_tool/Makefile @@ -2,7 +2,7 @@ PORTNAME= interactive_rebase_tool DISTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= petteri.valkonen@iki.fi diff --git a/devel/pijul/Makefile b/devel/pijul/Makefile index 96cfae4f6b90..cc94e878524e 100644 --- a/devel/pijul/Makefile +++ b/devel/pijul/Makefile @@ -3,7 +3,7 @@ PORTNAME= pijul PORTVERSION= 0.11.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= https://pijul.org/releases/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/devel/racer/Makefile b/devel/racer/Makefile index cc3c916ad360..73e2f8004930 100644 --- a/devel/racer/Makefile +++ b/devel/racer/Makefile @@ -4,7 +4,7 @@ PORTNAME= racer DISTVERSIONPREFIX= v DISTVERSION= 2.1.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= beyert@cs.ucr.edu diff --git a/devel/racerd/Makefile b/devel/racerd/Makefile index 9848ec69745a..6275e2e498ed 100644 --- a/devel/racerd/Makefile +++ b/devel/racerd/Makefile @@ -5,7 +5,7 @@ PORTNAME= racerd DISTVERSIONPREFIX= v DISTVERSION= 0.1.1-56 DISTVERSIONSUFFIX= -g29cd4c6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MAINTAINER= ultima@FreeBSD.org diff --git a/devel/rust-bindgen/Makefile b/devel/rust-bindgen/Makefile index ed405e642537..e6569b11ecc1 100644 --- a/devel/rust-bindgen/Makefile +++ b/devel/rust-bindgen/Makefile @@ -3,7 +3,7 @@ PORTNAME= rust-bindgen DISTVERSIONPREFIX= v DISTVERSION= 0.47.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= gecko@FreeBSD.org diff --git a/devel/rust-cbindgen/Makefile b/devel/rust-cbindgen/Makefile index 97e0c1e0ed52..383450282157 100644 --- a/devel/rust-cbindgen/Makefile +++ b/devel/rust-cbindgen/Makefile @@ -3,7 +3,7 @@ PORTNAME= cbindgen DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= rust- diff --git a/devel/sccache/Makefile b/devel/sccache/Makefile index 00cb345353f5..8d44d023c90b 100644 --- a/devel/sccache/Makefile +++ b/devel/sccache/Makefile @@ -2,7 +2,7 @@ PORTNAME= sccache DISTVERSION= 2.8.0.alpha0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MAINTAINER= pizzamig@FreeBSD.org diff --git a/devel/tokei/Makefile b/devel/tokei/Makefile index e39f4ff97fd3..bda4999a9973 100644 --- a/devel/tokei/Makefile +++ b/devel/tokei/Makefile @@ -3,7 +3,7 @@ PORTNAME= tokei DISTVERSIONPREFIX= v DISTVERSION= 9.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= tobik@FreeBSD.org diff --git a/dns/doh-proxy/Makefile b/dns/doh-proxy/Makefile index e6ce83c6ecb6..9565b9745d72 100644 --- a/dns/doh-proxy/Makefile +++ b/dns/doh-proxy/Makefile @@ -3,7 +3,7 @@ PORTNAME= doh-proxy DISTVERSION= 0.1.10 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns MAINTAINER= mat@FreeBSD.org diff --git a/editors/kak-lsp/Makefile b/editors/kak-lsp/Makefile index aaf16e2baf3f..f7f7d2804597 100644 --- a/editors/kak-lsp/Makefile +++ b/editors/kak-lsp/Makefile @@ -3,7 +3,7 @@ PORTNAME= kak-lsp DISTVERSIONPREFIX= v DISTVERSION= 6.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors MAINTAINER= tobik@FreeBSD.org diff --git a/editors/parinfer-rust/Makefile b/editors/parinfer-rust/Makefile index 27f06f0dfe21..b2fe9829a472 100644 --- a/editors/parinfer-rust/Makefile +++ b/editors/parinfer-rust/Makefile @@ -4,7 +4,7 @@ PORTNAME= parinfer-rust DISTVERSIONPREFIX= v DISTVERSION= 0.2.0-198 DISTVERSIONSUFFIX= -g506ae2b -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MAINTAINER= tobik@FreeBSD.org diff --git a/editors/xi-core/Makefile b/editors/xi-core/Makefile index 7d700edb92d9..dc19e0b6bc5b 100644 --- a/editors/xi-core/Makefile +++ b/editors/xi-core/Makefile @@ -3,7 +3,7 @@ PORTNAME= xi-core PORTVERSION= g20170612 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors MAINTAINER= ports@FreeBSD.org diff --git a/games/genact/Makefile b/games/genact/Makefile index 6fe833205795..16c16dc66ed9 100644 --- a/games/genact/Makefile +++ b/games/genact/Makefile @@ -2,7 +2,7 @@ PORTNAME= genact DISTVERSION= 0.6.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MAINTAINER= 0mp@FreeBSD.org diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile index 26c356c9898c..392a06c63595 100644 --- a/graphics/librsvg2-rust/Makefile +++ b/graphics/librsvg2-rust/Makefile @@ -3,7 +3,7 @@ PORTNAME= librsvg PORTVERSION= 2.45.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= GNOME \ CRATESIO/libc/0.2.49:libc diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 4f2e71eca414..cfcfb582fccb 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.32.0 +PORTVERSION?= 1.33.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ @@ -42,9 +42,13 @@ ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler CONFLICTS_INSTALL?= rust-nightly # See WRKSRC/src/stage0.txt for this date and version values. -BOOTSTRAPS_DATE?= 2018-12-20 +BOOTSTRAPS_DATE?= 2019-01-17 +BOOTSTRAPS_DATE_aarch64?= 2018-12-20 +BOOTSTRAPS_DATE_armv6?= 2018-12-20 +BOOTSTRAPS_DATE_armv7?= 2018-12-20 +BOOTSTRAPS_DATE_powerpc64?= 2018-12-20 -RUST_BOOTSTRAP_VERSION?= 1.31.1 +RUST_BOOTSTRAP_VERSION?= 1.32.0 RUST_BOOTSTRAP_VERSION_aarch64?= 1.32.0 RUST_BOOTSTRAP_VERSION_armv6?= 1.32.0 RUST_BOOTSTRAP_VERSION_armv7?= 1.32.0 @@ -52,7 +56,7 @@ RUST_BOOTSTRAP_VERSION_powerpc64?= 1.32.0 RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz -CARGO_BOOTSTRAP_VERSION?= 0.32.0 +CARGO_BOOTSTRAP_VERSION?= 0.33.0 CARGO_BOOTSTRAP_VERSION_aarch64?= 0.33.0 CARGO_BOOTSTRAP_VERSION_armv6?= 0.33.0 CARGO_BOOTSTRAP_VERSION_armv7?= 0.33.0 diff --git a/lang/rust/distinfo b/lang/rust/distinfo index eab7372bfd96..d0183780f3b6 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,18 +1,18 @@ -TIMESTAMP = 1547636591 -SHA256 (rust/rustc-1.32.0-src.tar.xz) = d617a7dc39daaafa8256320991005fc376c8ef2080593918301b24466d0067af -SIZE (rust/rustc-1.32.0-src.tar.xz) = 99602696 -SHA256 (rust/2018-12-20/rustc-1.31.1-x86_64-unknown-freebsd.tar.gz) = fb38ad94976c273c0fb95d0b5ba2d1ce90684e58fa06fafc9f8050ba00559f50 -SIZE (rust/2018-12-20/rustc-1.31.1-x86_64-unknown-freebsd.tar.gz) = 69931606 -SHA256 (rust/2018-12-20/rust-std-1.31.1-x86_64-unknown-freebsd.tar.gz) = 89e551403f70eed976ac1dd91c3effc9434ef450da4c347d24a141529f83a101 -SIZE (rust/2018-12-20/rust-std-1.31.1-x86_64-unknown-freebsd.tar.gz) = 69337097 -SHA256 (rust/2018-12-20/cargo-0.32.0-x86_64-unknown-freebsd.tar.gz) = 2cc09d55f6c6dcca58d43815c4968d2349813b12e12a23eff1b8fa30548eba8f -SIZE (rust/2018-12-20/cargo-0.32.0-x86_64-unknown-freebsd.tar.gz) = 6813542 -SHA256 (rust/2018-12-20/rustc-1.31.1-i686-unknown-freebsd.tar.gz) = a68848c513b2eaf3fb15e6798ee3a1cd352d0b75d3f103e104a72d8290651e8b -SIZE (rust/2018-12-20/rustc-1.31.1-i686-unknown-freebsd.tar.gz) = 70696299 -SHA256 (rust/2018-12-20/rust-std-1.31.1-i686-unknown-freebsd.tar.gz) = 87d7e4aa9bfc50a111ac6c47360c831857b83ed61a07bc368a505f4d0183ea8f -SIZE (rust/2018-12-20/rust-std-1.31.1-i686-unknown-freebsd.tar.gz) = 69465005 -SHA256 (rust/2018-12-20/cargo-0.32.0-i686-unknown-freebsd.tar.gz) = 32db6c8124e5cfeffb58576bbdbe9a8ec1317a31588d393a2be822e87efc55ab -SIZE (rust/2018-12-20/cargo-0.32.0-i686-unknown-freebsd.tar.gz) = 6510783 +TIMESTAMP = 1551349163 +SHA256 (rust/rustc-1.33.0-src.tar.xz) = f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71 +SIZE (rust/rustc-1.33.0-src.tar.xz) = 100635400 +SHA256 (rust/2019-01-17/rustc-1.32.0-x86_64-unknown-freebsd.tar.gz) = a14a0e288be8ce894a85810151a2eb70fc86afa36e4a5fae4e903c744b888687 +SIZE (rust/2019-01-17/rustc-1.32.0-x86_64-unknown-freebsd.tar.gz) = 70385575 +SHA256 (rust/2019-01-17/rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = d50f674379791a93764d383153ed6533cea165ede7f233df4e17563bfdab273c +SIZE (rust/2019-01-17/rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = 67069445 +SHA256 (rust/2019-01-17/cargo-0.33.0-x86_64-unknown-freebsd.tar.gz) = e780264949c8e597191f38d4930cad8074890a7a48c04cf10e6864ff0eb4bc8a +SIZE (rust/2019-01-17/cargo-0.33.0-x86_64-unknown-freebsd.tar.gz) = 6253970 +SHA256 (rust/2019-01-17/rustc-1.32.0-i686-unknown-freebsd.tar.gz) = 7bea209a99b8a3c05a80e55fef293d73a68fa57d58120ed5cd11adc9d6b7ed5c +SIZE (rust/2019-01-17/rustc-1.32.0-i686-unknown-freebsd.tar.gz) = 71140698 +SHA256 (rust/2019-01-17/rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 1189726665509f2a5e44fcdbbe70f691e8ffc748404966c9b73abf62b4f9cb82 +SIZE (rust/2019-01-17/rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 67402728 +SHA256 (rust/2019-01-17/cargo-0.33.0-i686-unknown-freebsd.tar.gz) = cba7cf145100c4e74da1fca20ad272999ec2b55817f26723c3dfc9fd4abd196d +SIZE (rust/2019-01-17/cargo-0.33.0-i686-unknown-freebsd.tar.gz) = 6017543 SHA256 (rust/2018-12-20/cargo-0.33.0-aarch64-unknown-freebsd.tar.gz) = a13c3f8c17beb6d19f54ac705d87b6dbb9cd09cd945d0ffbaed1a77e8ac38128 SHA256 (rust/2018-12-20/cargo-0.33.0-armv6-unknown-freebsd.tar.gz) = 62158d26a9dbc17cfd92882cb48b6ee7a06432b9f18d1f78b90b6973d63be12c SHA256 (rust/2018-12-20/cargo-0.33.0-armv7-unknown-freebsd.tar.gz) = bfb8986a11034cac7329037a2f24c07bcd62ba2d91838f6c28955b2ee639e361 diff --git a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs b/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs deleted file mode 100644 index 38971008f5f9..000000000000 --- a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_dragonfly_mod.rs +++ /dev/null @@ -1,7 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2018-06-19 04:36:14 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/dragonfly/mod.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type clock_t = u64; - pub type ino_t = u64; - pub type lwpid_t = i32; diff --git a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs b/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs deleted file mode 100644 index cc3ea537274a..000000000000 --- a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_aarch64.rs +++ /dev/null @@ -1,7 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2018-06-19 04:36:14 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/aarch64.rs -@@ -1,3 +1,4 @@ -+pub type c_char = u8; - pub type c_long = i64; - pub type c_ulong = u64; - pub type time_t = i64; diff --git a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_arm.rs b/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_arm.rs deleted file mode 100644 index ad4612cf62a3..000000000000 --- a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_arm.rs +++ /dev/null @@ -1,40 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/arm.rs.orig 2019-02-15 13:41:07 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/arm.rs -@@ -0,0 +1,37 @@ -+pub type c_char = u8; -+pub type c_long = i32; -+pub type c_ulong = u32; -+pub type time_t = i64; -+pub type suseconds_t = i32; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_atime_pad: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_mtime_pad: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_ctime_pad: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: ::uint32_t, -+ pub st_lspare: ::int32_t, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ pub st_birthtime_pad: ::c_long, -+ } -+} -+ -+pub const MAP_32BIT: ::c_int = 0x00080000; diff --git a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_mod.rs b/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_mod.rs deleted file mode 100644 index 1d5ede2c8e83..000000000000 --- a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_mod.rs +++ /dev/null @@ -1,15 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2019-01-16 09:30:47 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/mod.rs -@@ -1068,6 +1068,12 @@ cfg_if! { - } else if #[cfg(target_arch = "aarch64")] { - mod aarch64; - pub use self::aarch64::*; -+ } else if #[cfg(target_arch = "arm")] { -+ mod arm; -+ pub use self::arm::*; -+ } else if #[cfg(target_arch = "powerpc64")] { -+ mod powerpc64; -+ pub use self::powerpc64::*; - } else { - // Unknown target_arch - } diff --git a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_powerpc64.rs b/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_powerpc64.rs deleted file mode 100644 index b50e935a82b7..000000000000 --- a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_powerpc64.rs +++ /dev/null @@ -1,34 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs.orig 2019-02-15 13:41:07 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs -@@ -0,0 +1,31 @@ -+pub type c_char = u8; -+pub type c_long = i64; -+pub type c_ulong = u64; -+pub type time_t = i64; -+pub type suseconds_t = i64; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: ::uint32_t, -+ pub st_lspare: ::int32_t, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ } -+} diff --git a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86.rs b/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86.rs deleted file mode 100644 index b636ba3a6c02..000000000000 --- a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86.rs +++ /dev/null @@ -1,7 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2018-06-19 04:36:14 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type c_long = i32; - pub type c_ulong = u32; - pub type time_t = i32; diff --git a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs b/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs deleted file mode 100644 index 9c43a045fdda..000000000000 --- a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_freebsd_x86__64.rs +++ /dev/null @@ -1,7 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2018-06-19 04:36:14 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/freebsd/x86_64.rs -@@ -1,3 +1,4 @@ -+pub type c_char = i8; - pub type c_long = i64; - pub type c_ulong = u64; - pub type time_t = i64; diff --git a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_mod.rs b/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_mod.rs deleted file mode 100644 index 23c521ae2776..000000000000 --- a/lang/rust/files/patch-src_liblibc_src_unix_bsd_freebsdlike_mod.rs +++ /dev/null @@ -1,17 +0,0 @@ ---- src/liblibc/src/unix/bsd/freebsdlike/mod.rs.orig 2019-01-16 09:30:47 UTC -+++ src/liblibc/src/unix/bsd/freebsdlike/mod.rs -@@ -1,4 +1,3 @@ --pub type c_char = i8; - pub type dev_t = u32; - pub type mode_t = u16; - pub type pthread_attr_t = *mut ::c_void; -@@ -83,8 +82,7 @@ s! { - } - - pub struct stack_t { -- // In FreeBSD 11 and later, ss_sp is actually a void* -- pub ss_sp: *mut ::c_char, -+ pub ss_sp: *mut ::c_void, - pub ss_size: ::size_t, - pub ss_flags: ::c_int, - } diff --git a/lang/rust/files/patch-src_libstd_build.rs b/lang/rust/files/patch-src_libstd_build.rs deleted file mode 100644 index d0030d9ee7b3..000000000000 --- a/lang/rust/files/patch-src_libstd_build.rs +++ /dev/null @@ -1,22 +0,0 @@ ---- src/libstd/build.rs.orig 2019-01-16 09:30:27 UTC -+++ src/libstd/build.rs -@@ -92,13 +92,18 @@ fn build_libbacktrace(target: &str) -> Result<(), ()> - .out_dir(&native.out_dir) - .warnings(false) - .file("../libbacktrace/alloc.c") -- .file("../libbacktrace/backtrace.c") - .file("../libbacktrace/dwarf.c") - .file("../libbacktrace/fileline.c") - .file("../libbacktrace/posix.c") - .file("../libbacktrace/read.c") - .file("../libbacktrace/sort.c") - .file("../libbacktrace/state.c"); -+ -+ if target.contains("freebsd") { -+ build.file("../libbacktrace/nounwind.c"); -+ } else { -+ build.file("../libbacktrace/backtrace.c"); -+ } - - let any_debug = env::var("RUSTC_DEBUGINFO").unwrap_or_default() == "true" || - env::var("RUSTC_DEBUGINFO_LINES").unwrap_or_default() == "true"; diff --git a/lang/rust/files/patch-src_libstd_os_raw_mod.rs b/lang/rust/files/patch-src_libstd_os_raw_mod.rs deleted file mode 100644 index 5ef6654e415f..000000000000 --- a/lang/rust/files/patch-src_libstd_os_raw_mod.rs +++ /dev/null @@ -1,24 +0,0 @@ ---- src/libstd/os/raw/mod.rs.orig 2019-01-16 09:30:27 UTC -+++ src/libstd/os/raw/mod.rs -@@ -27,6 +27,10 @@ - all(target_os = "android", any(target_arch = "aarch64", - target_arch = "arm")), - all(target_os = "l4re", target_arch = "x86_64"), -+ all(target_os = "freebsd", any(target_arch = "aarch64", -+ target_arch = "arm", -+ target_arch = "powerpc", -+ target_arch = "powerpc64")), - all(target_os = "netbsd", any(target_arch = "aarch64", - target_arch = "arm", - target_arch = "powerpc")), -@@ -42,6 +46,10 @@ - all(target_os = "android", any(target_arch = "aarch64", - target_arch = "arm")), - all(target_os = "l4re", target_arch = "x86_64"), -+ all(target_os = "freebsd", any(target_arch = "aarch64", -+ target_arch = "arm", -+ target_arch = "powerpc", -+ target_arch = "powerpc64")), - all(target_os = "netbsd", any(target_arch = "aarch64", - target_arch = "arm", - target_arch = "powerpc")), diff --git a/lang/rust/files/patch-src_stdsimd_stdsimd_arch_detect_os_aarch64.rs b/lang/rust/files/patch-src_stdsimd_stdsimd_arch_detect_os_aarch64.rs new file mode 100644 index 000000000000..8c2189891167 --- /dev/null +++ b/lang/rust/files/patch-src_stdsimd_stdsimd_arch_detect_os_aarch64.rs @@ -0,0 +1,24 @@ +error: `[7:4]` cannot be resolved, ignoring it... + --> src/libstd/../stdsimd/stdsimd/arch/detect/os/aarch64.rs:9:27 + | +9 | //! when ID_AA64ISAR0_EL1[7:4] is >= 1, AES is supported; when it's >= 2, PMULL is supported. + | ^^^ cannot be resolved, ignoring + | +note: lint level defined here + --> src/libstd/lib.rs:215:9 + | +21| #![deny(intra_doc_link_resolution_failure)] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]` + +--- src/stdsimd/stdsimd/arch/detect/os/aarch64.rs.orig 2019-02-25 09:19:48 UTC ++++ src/stdsimd/stdsimd/arch/detect/os/aarch64.rs +@@ -6,7 +6,7 @@ + //! AArch64 system registers ID_AA64ISAR0_EL1, ID_AA64PFR0_EL1, ID_AA64ISAR1_EL1 + //! have bits dedicated to features like AdvSIMD, CRC32, AES, atomics (LSE), etc. + //! Each part of the register indicates the level of support for a certain feature, e.g. +-//! when ID_AA64ISAR0_EL1[7:4] is >= 1, AES is supported; when it's >= 2, PMULL is supported. ++//! when ID_AA64ISAR0_EL1\[7:4\] is >= 1, AES is supported; when it's >= 2, PMULL is supported. + //! + //! For proper support of [SoCs where different cores have different capabilities](https://medium.com/@jadr2ddude/a-big-little-problem-a-tale-of-big-little-gone-wrong-e7778ce744bb), + //! the OS has to always report only the features supported by all cores, like [FreeBSD does](https://reviews.freebsd.org/D17137#393947). diff --git a/lang/rust/files/patch-src_libbacktrace_fileline.c b/lang/rust/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c index 4e099b1f5df0..3ab27099b284 100644 --- a/lang/rust/files/patch-src_libbacktrace_fileline.c +++ b/lang/rust/files/patch-vendor_backtrace-sys_src_libbacktrace_fileline.c @@ -1,7 +1,7 @@ This file is in the public domain. ---- src/libbacktrace/fileline.c.orig 2019-01-16 09:30:44 UTC -+++ src/libbacktrace/fileline.c +--- vendor/backtrace-sys/src/libbacktrace/fileline.c.orig 2019-01-16 09:30:44 UTC ++++ vendor/backtrace-sys/src/libbacktrace/fileline.c @@ -39,8 +39,39 @@ POSSIBILITY OF SUCH DAMAGE. */ #include <stdlib.h> #include <unistd.h> diff --git a/lang/rust/files/patch-src_libcompiler__builtins_build.rs b/lang/rust/files/patch-vendor_compiler__builtins_build.rs index a59370804eeb..5a2861d298fe 100644 --- a/lang/rust/files/patch-src_libcompiler__builtins_build.rs +++ b/lang/rust/files/patch-vendor_compiler__builtins_build.rs @@ -1,5 +1,5 @@ ---- src/libcompiler_builtins/build.rs.orig 2019-01-16 09:30:44 UTC -+++ src/libcompiler_builtins/build.rs +--- vendor/compiler_builtins/build.rs.orig 2019-01-16 09:30:44 UTC ++++ vendor/compiler_builtins/build.rs @@ -308,6 +308,10 @@ mod c { ], ); diff --git a/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs b/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs index b889d1824f99..971cd5452778 100644 --- a/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs +++ b/lang/rust/files/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs @@ -5,8 +5,8 @@ mod aarch64; pub use self::aarch64::*; + } else if #[cfg(target_arch = "arm")] { -+ mod arm; -+ pub use self::arm::*; ++ mod arm; ++ pub use self::arm::*; + } else if #[cfg(target_arch = "powerpc64")] { + mod powerpc64; + pub use self::powerpc64::*; diff --git a/lang/rust/files/patch-vendor_openssl-sys_build_main.rs b/lang/rust/files/patch-vendor_openssl-sys_build_main.rs deleted file mode 100644 index 95665dac60a7..000000000000 --- a/lang/rust/files/patch-vendor_openssl-sys_build_main.rs +++ /dev/null @@ -1,66 +0,0 @@ -https://github.com/sfackler/rust-openssl/commit/9fd7584a8416 -https://github.com/sfackler/rust-openssl/commit/e75793e8962d - ---- vendor/openssl-sys/build/main.rs.orig 2018-12-05 01:24:32 UTC -+++ vendor/openssl-sys/build/main.rs -@@ -1,9 +1,9 @@ - extern crate cc; -+#[cfg(feature = "vendored")] -+extern crate openssl_src; - extern crate pkg_config; - #[cfg(target_env = "msvc")] - extern crate vcpkg; --#[cfg(feature = "vendored")] --extern crate openssl_src; - - use std::collections::HashSet; - use std::env; -@@ -103,20 +103,23 @@ fn main() { - - #[cfg(feature = "vendored")] - mod imp { -- use std::path::PathBuf; -- use openssl_src; -+ use openssl_src; -+ use std::path::PathBuf; - -- pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) { -- let artifacts = openssl_src::Build::new().build(); -- (artifacts.lib_dir().to_path_buf(), artifacts.include_dir().to_path_buf()) -- } -+ pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) { -+ let artifacts = openssl_src::Build::new().build(); -+ ( -+ artifacts.lib_dir().to_path_buf(), -+ artifacts.include_dir().to_path_buf(), -+ ) -+ } - } - - #[cfg(not(feature = "vendored"))] - mod imp { - use pkg_config; -- use std::path::{Path, PathBuf}; - use std::ffi::OsString; -+ use std::path::{Path, PathBuf}; - use std::process::{self, Command}; - - use super::env; -@@ -500,6 +503,8 @@ See rust-openssl README for more information: - (7, _) => ('7', 'x'), - (8, 0) => ('8', '0'), - (8, 1) => ('8', '1'), -+ (8, _) => ('8', 'x'), -+ (9, 0) => ('9', '0'), - _ => version_error(), - }; - -@@ -540,7 +545,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 --through 2.8.1, but a different version of OpenSSL was found. The build is now aborting -+through 2.9.0, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - " diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index bb1ef3c09343..26e0d6d8982b 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 60.5.2 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git a/mail/thunderbird/files/patch-bug1458219 b/mail/thunderbird/files/patch-bug1458219 new file mode 100644 index 000000000000..0b86d436d050 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1458219 @@ -0,0 +1,26 @@ +commit cfe84bdd1ce1 +Author: Jonathan Watt <jwatt@jwatt.org> +Date: Wed Apr 25 14:54:26 2018 +0100 + + Bug 1458219 - Remove the 'property_name' macro. r=xidorn +--- + servo/components/style/properties/properties.mako.rs | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs +index a1d2ee9d085a..5e3d8eaeaaf8 100644 +--- servo/components/style/properties/properties.mako.rs ++++ servo/components/style/properties/properties.mako.rs +@@ -56,12 +56,6 @@ use style_adjuster::StyleAdjuster; + + pub use self::declaration_block::*; + +-#[cfg(feature = "gecko")] +-#[macro_export] +-macro_rules! property_name { +- ($s: tt) => { atom!($s) } +-} +- + <%! + from data import Method, Keyword, to_rust_ident, to_camel_case, SYSTEM_FONT_LONGHANDS + import os.path diff --git a/mail/thunderbird/files/patch-bug1519629 b/mail/thunderbird/files/patch-bug1519629 new file mode 100644 index 000000000000..f0ceec943602 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1519629 @@ -0,0 +1,35 @@ +commit f8f381bf03b5 +Author: Emilio Cobos Álvarez <emilio@crisal.io> +Date: Sun Jan 13 21:42:38 2019 +0100 + + Bug 1519629 - Document a few more macros. +--- + servo/components/style/gecko/regen_atoms.py | 1 + + servo/components/style/gecko_string_cache/namespace.rs | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git servo/components/style/gecko/regen_atoms.py servo/components/style/gecko/regen_atoms.py +index dfc2252aa899..b6f68fceb7d5 100755 +--- servo/components/style/gecko/regen_atoms.py ++++ servo/components/style/gecko/regen_atoms.py +@@ -203,6 +203,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n ' + + MACRO = ''' + #[macro_export] ++/// Returns a static atom by passing the literal string it represents. + macro_rules! atom {{ + {} + }} +diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs +index 4aa4accaf1d4..725e1da21692 100644 +--- servo/components/style/gecko_string_cache/namespace.rs ++++ servo/components/style/gecko_string_cache/namespace.rs +@@ -11,6 +11,8 @@ use std::borrow::Borrow; + use std::fmt; + use std::ops::Deref; + ++/// In Gecko namespaces are just regular atoms, so this is a simple macro to ++/// forward one macro to the other. + #[macro_export] + macro_rules! ns { + () => { diff --git a/mail/thunderbird/files/patch-bug1519729 b/mail/thunderbird/files/patch-bug1519729 new file mode 100644 index 000000000000..e91ebcec56fc --- /dev/null +++ b/mail/thunderbird/files/patch-bug1519729 @@ -0,0 +1,131 @@ +commit 9bdfa9fecaf1 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:02:28 2019 +0100 + + Bug 1519729 - Remove unused macro. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style_traits/values.rs | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 6da235c07b64..2851082c22e0 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -158,24 +158,6 @@ where + } + } + +-#[macro_export] +-macro_rules! serialize_function { +- ($dest: expr, $name: ident($( $arg: expr, )+)) => { +- serialize_function!($dest, $name($($arg),+)) +- }; +- ($dest: expr, $name: ident($first_arg: expr $( , $arg: expr )*)) => { +- { +- $dest.write_str(concat!(stringify!($name), "("))?; +- $first_arg.to_css($dest)?; +- $( +- $dest.write_str(", ")?; +- $arg.to_css($dest)?; +- )* +- $dest.write_char(')') +- } +- } +-} +- + /// Convenience wrapper to serialise CSS values separated by a given string. + pub struct SequenceWriter<'a, 'b: 'a, W: 'b> { + inner: &'a mut CssWriter<'b, W>, + +commit 9d5e559547d0 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:03:44 2019 +0100 + + Bug 1519729 - Document public macros. r=emilio + + Undocumented public macros emit warnings in nightly-2019-01-11, + and we #![deny] that warning. + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style/properties/properties.mako.rs | 17 ++++++++++++++++- + servo/components/style_traits/values.rs | 2 +- + 2 files changed, 17 insertions(+), 2 deletions(-) + +diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs +index 2d91273be15a..9220c3b1a665 100644 +--- servo/components/style/properties/properties.mako.rs ++++ servo/components/style/properties/properties.mako.rs +@@ -3821,7 +3821,14 @@ impl AliasId { + } + } + +-// NOTE(emilio): Callers are responsible to deal with prefs. ++/// Call the given macro with tokens like this for each longhand and shorthand properties ++/// that is enabled in content: ++/// ++/// ``` ++/// [CamelCaseName, SetCamelCaseName, PropertyId::Longhand(LonghandId::CamelCaseName)], ++/// ``` ++/// ++/// NOTE(emilio): Callers are responsible to deal with prefs. + #[macro_export] + macro_rules! css_properties_accessors { + ($macro_name: ident) => { +@@ -3844,6 +3851,14 @@ macro_rules! css_properties_accessors { + } + } + ++/// Call the given macro with tokens like this for each longhand properties: ++/// ++/// ``` ++/// { snake_case_ident, true } ++/// ``` ++/// ++/// … where the boolean indicates whether the property value type ++/// is wrapped in a `Box<_>` in the corresponding `PropertyDeclaration` variant. + #[macro_export] + macro_rules! longhand_properties_idents { + ($macro_name: ident) => { +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 2851082c22e0..0d7ee3f506ce 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + 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)] + +commit 2b08ae08b260 +Author: lqd <remy.rakic+github@gmail.com> +Date: Fri Jan 11 16:35:26 2019 +0100 + + Bug 1519729 - Typo fix in new doc-comment. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 + + Co-Authored-By: SimonSapin <simon.sapin@exyr.org> +--- + servo/components/style_traits/values.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 0d7ee3f506ce..582e34eb3db0 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + impl_to_css_for_predefined_type!(::cssparser::Color); + impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); + +-/// Define an enum type with unit variants that each corrsepond to a CSS keyword. ++/// Define an enum type with unit variants that each correspond to a CSS keyword. + macro_rules! define_css_keyword_enum { + (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { + #[allow(missing_docs)] diff --git a/multimedia/rav1e/Makefile b/multimedia/rav1e/Makefile index c6665f86d4c9..25bd514cd76d 100644 --- a/multimedia/rav1e/Makefile +++ b/multimedia/rav1e/Makefile @@ -2,6 +2,7 @@ PORTNAME= rav1e PORTVERSION= s20190226 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/net-im/fractal/Makefile b/net-im/fractal/Makefile index a93a9e754e67..e56dbca307b4 100644 --- a/net-im/fractal/Makefile +++ b/net-im/fractal/Makefile @@ -2,7 +2,7 @@ PORTNAME= fractal DISTVERSION= 3.30.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im MASTER_SITES= https://gitlab.gnome.org/World/fractal/uploads/${GL_HASH}/ diff --git a/net/rabbiteer/Makefile b/net/rabbiteer/Makefile index 1690ba185251..773e4eb3d73c 100644 --- a/net/rabbiteer/Makefile +++ b/net/rabbiteer/Makefile @@ -2,7 +2,7 @@ PORTNAME= rabbiteer DISTVERSION= 1.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= dch@FreeBSD.org diff --git a/net/routinator/Makefile b/net/routinator/Makefile index 1c16877f3321..8a1c952ae67b 100644 --- a/net/routinator/Makefile +++ b/net/routinator/Makefile @@ -3,7 +3,7 @@ PORTNAME= routinator PORTVERSION= 0.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= jaap@NLnetLabs.nl diff --git a/security/cargo-audit/Makefile b/security/cargo-audit/Makefile index 11bc542215ab..7c120f02a7b9 100644 --- a/security/cargo-audit/Makefile +++ b/security/cargo-audit/Makefile @@ -3,7 +3,7 @@ PORTNAME= cargo-audit DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org diff --git a/security/kr/Makefile b/security/kr/Makefile index 7b5ea4e38b8b..46fada3d85ab 100644 --- a/security/kr/Makefile +++ b/security/kr/Makefile @@ -3,7 +3,7 @@ PORTNAME= kr PORTVERSION= 2.3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MAINTAINER= feld@FreeBSD.org diff --git a/security/suricata/Makefile b/security/suricata/Makefile index d5a1e212bbe9..3615549aa002 100644 --- a/security/suricata/Makefile +++ b/security/suricata/Makefile @@ -3,7 +3,7 @@ PORTNAME= suricata DISTVERSION= 4.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ diff --git a/sysutils/exa/Makefile b/sysutils/exa/Makefile index 08cdc2e27283..de62f1953e40 100644 --- a/sysutils/exa/Makefile +++ b/sysutils/exa/Makefile @@ -3,7 +3,7 @@ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org diff --git a/sysutils/fd/Makefile b/sysutils/fd/Makefile index 3576004dde92..d99c1ed7ac50 100644 --- a/sysutils/fd/Makefile +++ b/sysutils/fd/Makefile @@ -4,6 +4,7 @@ PORTNAME= fd DISTVERSIONPREFIX= v DISTVERSION= 7.3.0 +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMESUFFIX= -find diff --git a/sysutils/flowgger/Makefile b/sysutils/flowgger/Makefile index a37122a95ffc..ada939a2d503 100644 --- a/sysutils/flowgger/Makefile +++ b/sysutils/flowgger/Makefile @@ -3,7 +3,7 @@ PORTNAME= flowgger DISTVERSION= 0.2.6-28 DISTVERSIONSUFFIX= -gab572a0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org diff --git a/sysutils/fusefs-sandboxfs/Makefile b/sysutils/fusefs-sandboxfs/Makefile index cddafb1bfb23..fc5590fcfd48 100644 --- a/sysutils/fusefs-sandboxfs/Makefile +++ b/sysutils/fusefs-sandboxfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= sandboxfs DISTVERSIONPREFIX= sandboxfs- DISTVERSION= 0.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- diff --git a/sysutils/hexyl/Makefile b/sysutils/hexyl/Makefile index 02016d3f6536..398723fbce04 100644 --- a/sysutils/hexyl/Makefile +++ b/sysutils/hexyl/Makefile @@ -3,7 +3,7 @@ PORTNAME= hexyl DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org diff --git a/sysutils/potnet/Makefile b/sysutils/potnet/Makefile index 751a38d128dc..40e26be31c9c 100644 --- a/sysutils/potnet/Makefile +++ b/sysutils/potnet/Makefile @@ -2,7 +2,7 @@ PORTNAME= potnet DISTVERSION= 0.1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org diff --git a/textproc/bat/Makefile b/textproc/bat/Makefile index 094340c2f97a..a0b36ab600ee 100644 --- a/textproc/bat/Makefile +++ b/textproc/bat/Makefile @@ -3,7 +3,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index 130b8735f490..5ee17afc0d61 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -5,7 +5,7 @@ PORTNAME= ripgrep DISTVERSION= 0.10.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi @@ -27,7 +27,7 @@ CARGO_CRATES= aho-corasick-0.6.8 \ atty-0.2.11 \ base64-0.9.2 \ bitflags-1.0.4 \ - bytecount-0.3.2 \ + bytecount-0.5.1 \ byteorder-1.2.6 \ cc-1.0.24 \ cfg-if-0.1.5 \ @@ -36,7 +36,7 @@ CARGO_CRATES= aho-corasick-0.6.8 \ crossbeam-channel-0.2.4 \ crossbeam-epoch-0.5.2 \ crossbeam-utils-0.5.0 \ - encoding_rs-0.8.6 \ + encoding_rs-0.8.16 \ encoding_rs_io-0.1.2 \ fnv-1.0.6 \ fuchsia-zircon-0.3.3 \ @@ -53,6 +53,7 @@ CARGO_CRATES= aho-corasick-0.6.8 \ nodrop-0.1.12 \ num_cpus-1.8.0 \ owning_ref-0.3.3 \ + packed_simd-0.3.3 \ parking_lot-0.6.4 \ parking_lot_core-0.3.0 \ pcre2-0.1.0 \ @@ -113,18 +114,10 @@ PORTDOCS= CHANGELOG.md FAQ.md GUIDE.md OPTIONS_DEFINE= DOCS PCRE2 SIMD OPTIONS_DEFAULT=PCRE2 -OPTIONS_DEFINE_amd64= AVX -OPTIONS_DEFINE_i386= AVX - OPTIONS_DEFAULT_aarch64=SIMD OPTIONS_DEFAULT_amd64= ${OPTIONS_DEFAULT_i386} OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:S/SSE2/SIMD/} -AVX_DESC= ${SSE_DESC:S/SSE/AVX/} - -AVX_VARS= CARGO_FEATURES+=avx-accel RUSTFLAGS+="-C target-feature=+avx" -AVX_IMPLIES= SIMD - PCRE2_DESC= ${PCRE_DESC} version 2 PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE2_VARS= CARGO_FEATURES+=pcre2 @@ -133,7 +126,7 @@ PCRE2_VARS= CARGO_FEATURES+=pcre2 # unstable features similar to how lang/rust bootstraps. www/firefox # uses the same hack when building with --enable-rust-simd. SIMD_MAKE_ENV= RUSTC_BOOTSTRAP=1 -SIMD_VARS= CARGO_FEATURES+=simd-accel ${SIMD_VARS_${ARCH}${PORT_OPTIONS:MAVX}} +SIMD_VARS= CARGO_FEATURES+=simd-accel ${SIMD_VARS_${ARCH}} SIMD_VARS_i386= RUSTFLAGS+="-C target-feature=+sse2" post-patch: diff --git a/textproc/ripgrep/distinfo b/textproc/ripgrep/distinfo index 57383b96d1a9..228579456bdd 100644 --- a/textproc/ripgrep/distinfo +++ b/textproc/ripgrep/distinfo @@ -9,8 +9,8 @@ SHA256 (rust/crates/base64-0.9.2.tar.gz) = 85415d2594767338a74a30c1d370b2f3262ec SIZE (rust/crates/base64-0.9.2.tar.gz) = 37967 SHA256 (rust/crates/bitflags-1.0.4.tar.gz) = 228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12 SIZE (rust/crates/bitflags-1.0.4.tar.gz) = 15282 -SHA256 (rust/crates/bytecount-0.3.2.tar.gz) = f861d9ce359f56dbcb6e0c2a1cb84e52ad732cadb57b806adeb3c7668caccbd8 -SIZE (rust/crates/bytecount-0.3.2.tar.gz) = 11026 +SHA256 (rust/crates/bytecount-0.5.1.tar.gz) = be0fdd54b507df8f22012890aadd099979befdba27713c767993f8380112ca7c +SIZE (rust/crates/bytecount-0.5.1.tar.gz) = 11888 SHA256 (rust/crates/byteorder-1.2.6.tar.gz) = 90492c5858dd7d2e78691cfb89f90d273a2800fc11d98f60786e5d87e2f83781 SIZE (rust/crates/byteorder-1.2.6.tar.gz) = 19985 SHA256 (rust/crates/cc-1.0.24.tar.gz) = 70f2a88c2e69ceee91c209d8ef25b81fc1a65f42c7f14dfd59d1fed189e514d1 @@ -27,8 +27,8 @@ SHA256 (rust/crates/crossbeam-epoch-0.5.2.tar.gz) = 30fecfcac6abfef8771151f8be4a SIZE (rust/crates/crossbeam-epoch-0.5.2.tar.gz) = 34136 SHA256 (rust/crates/crossbeam-utils-0.5.0.tar.gz) = 677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015 SIZE (rust/crates/crossbeam-utils-0.5.0.tar.gz) = 12162 -SHA256 (rust/crates/encoding_rs-0.8.6.tar.gz) = 2a91912d6f37c6a8fef8a2316a862542d036f13c923ad518b5aca7bcaac7544c -SIZE (rust/crates/encoding_rs-0.8.6.tar.gz) = 1242813 +SHA256 (rust/crates/encoding_rs-0.8.16.tar.gz) = 0535f350c60aac0b87ccf28319abc749391e912192255b0c00a2c12c6917bd73 +SIZE (rust/crates/encoding_rs-0.8.16.tar.gz) = 1401377 SHA256 (rust/crates/encoding_rs_io-0.1.2.tar.gz) = f222ff554d6e172f3569a2d7d0fd8061d54215984ef67b24ce031c1fcbf2c9b3 SIZE (rust/crates/encoding_rs_io-0.1.2.tar.gz) = 15356 SHA256 (rust/crates/fnv-1.0.6.tar.gz) = 2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3 @@ -61,6 +61,8 @@ SHA256 (rust/crates/num_cpus-1.8.0.tar.gz) = c51a3322e4bca9d212ad9a158a02abc6934 SIZE (rust/crates/num_cpus-1.8.0.tar.gz) = 10539 SHA256 (rust/crates/owning_ref-0.3.3.tar.gz) = cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37 SIZE (rust/crates/owning_ref-0.3.3.tar.gz) = 11710 +SHA256 (rust/crates/packed_simd-0.3.3.tar.gz) = a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220 +SIZE (rust/crates/packed_simd-0.3.3.tar.gz) = 97485 SHA256 (rust/crates/parking_lot-0.6.4.tar.gz) = f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5 SIZE (rust/crates/parking_lot-0.6.4.tar.gz) = 31890 SHA256 (rust/crates/parking_lot_core-0.3.0.tar.gz) = 06a2b6aae052309c2fd2161ef58f5067bc17bb758377a0de9d4b279d603fdd8a diff --git a/textproc/ripgrep/files/patch-bytecount b/textproc/ripgrep/files/patch-bytecount new file mode 100644 index 000000000000..45c54baf4b30 --- /dev/null +++ b/textproc/ripgrep/files/patch-bytecount @@ -0,0 +1,51 @@ +https://github.com/BurntSushi/ripgrep/commit/968491f8e93e + +--- Cargo.toml.orig 2018-09-07 18:07:52 UTC ++++ Cargo.toml +@@ -72,7 +72,6 @@ serde = "1.0.77" + serde_derive = "1.0.77" + + [features] +-avx-accel = ["grep/avx-accel"] + simd-accel = ["grep/simd-accel"] + pcre2 = ["grep/pcre2"] + +--- grep-searcher/Cargo.toml.orig 2018-09-07 18:07:52 UTC ++++ grep-searcher/Cargo.toml +@@ -13,7 +13,7 @@ keywords = ["regex", "grep", "egrep", "search", "patte + license = "Unlicense/MIT" + + [dependencies] +-bytecount = "0.3.2" ++bytecount = "0.5" + encoding_rs = "0.8.6" + encoding_rs_io = "0.1.2" + grep-matcher = { version = "0.1.1", path = "../grep-matcher" } +@@ -26,10 +26,8 @@ grep-regex = { version = "0.1.1", path = "../grep-rege + regex = "1.0.5" + + [features] +-avx-accel = [ +- "bytecount/avx-accel", +-] +-simd-accel = [ +- "bytecount/simd-accel", +- "encoding_rs/simd-accel", +-] ++default = ["bytecount/runtime-dispatch-simd"] ++simd-accel = ["encoding_rs/simd-accel"] ++ ++# This feature is DEPRECATED. Runtime dispatch is used for SIMD now. ++avx-accel = [] +--- grep/Cargo.toml.orig 2018-09-07 18:07:52 UTC ++++ grep/Cargo.toml +@@ -32,6 +32,8 @@ default-features = false + features = ["suggestions"] + + [features] +-avx-accel = ["grep-searcher/avx-accel"] + simd-accel = ["grep-searcher/simd-accel"] + pcre2 = ["grep-pcre2"] ++ ++# This feature is DEPRECATED. Runtime dispatch is used for SIMD now. ++avx-accel = [] diff --git a/textproc/ripgrep/files/patch-no-bitmask b/textproc/ripgrep/files/patch-no-bitmask new file mode 100644 index 000000000000..4affbd6dae4c --- /dev/null +++ b/textproc/ripgrep/files/patch-no-bitmask @@ -0,0 +1,663 @@ +Workaround from Firefox 67 until Rust 1.34 update + +https://github.com/hsivonen/packed_simd/commit/3541e3818fdc + +--- cargo-crates/packed_simd-0.3.3/src/api.rs.orig 2019-02-05 20:18:53 UTC ++++ cargo-crates/packed_simd-0.3.3/src/api.rs +@@ -1,7 +1,5 @@ + //! Implements the Simd<[T; N]> APIs + +-#[macro_use] +-mod bitmask; + crate mod cast; + #[macro_use] + mod cmp; +@@ -41,7 +39,7 @@ crate mod into_bits; + + macro_rules! impl_i { + ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident, $mask_ty:ident +- | $ielem_ty:ident, $ibitmask_ty:ident | $test_tt:tt | $($elem_ids:ident),* ++ | $ielem_ty:ident | $test_tt:tt | $($elem_ids:ident),* + | From: $($from_vec_ty:ident),* | $(#[$doc:meta])*) => { + impl_minimal_iuf!([$elem_ty; $elem_n]: $tuple_id | $ielem_ty | $test_tt + | $($elem_ids),* | $(#[$doc])*); +@@ -95,7 +93,6 @@ macro_rules! impl_i { + ); + impl_cmp_partial_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt); + impl_cmp_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt | (0, 1)); +- impl_bitmask!($tuple_id | $ibitmask_ty | (-1, 0) | $test_tt); + + test_select!($elem_ty, $mask_ty, $tuple_id, (1, 2) | $test_tt); + test_cmp_partial_ord_int!([$elem_ty; $elem_n]: $tuple_id | $test_tt); +@@ -105,7 +102,7 @@ macro_rules! impl_i { + + macro_rules! impl_u { + ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident, $mask_ty:ident +- | $ielem_ty:ident, $ibitmask_ty:ident | $test_tt:tt | $($elem_ids:ident),* ++ | $ielem_ty:ident | $test_tt:tt | $($elem_ids:ident),* + | From: $($from_vec_ty:ident),* | $(#[$doc:meta])*) => { + impl_minimal_iuf!([$elem_ty; $elem_n]: $tuple_id | $ielem_ty | $test_tt + | $($elem_ids),* | $(#[$doc])*); +@@ -158,8 +155,6 @@ macro_rules! impl_u { + ); + impl_cmp_partial_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt); + impl_cmp_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt | (0, 1)); +- impl_bitmask!($tuple_id | $ibitmask_ty | ($ielem_ty::max_value(), 0) | +- $test_tt); + + test_select!($elem_ty, $mask_ty, $tuple_id, (1, 2) | $test_tt); + test_cmp_partial_ord_int!([$elem_ty; $elem_n]: $tuple_id | $test_tt); +@@ -227,8 +222,7 @@ macro_rules! impl_f { + } + + macro_rules! impl_m { +- ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident +- | $ielem_ty:ident, $ibitmask_ty:ident ++ ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident | $ielem_ty:ident + | $test_tt:tt | $($elem_ids:ident),* | From: $($from_vec_ty:ident),* + | $(#[$doc:meta])*) => { + impl_minimal_mask!( +@@ -271,7 +265,6 @@ macro_rules! impl_m { + [$elem_ty; $elem_n]: $tuple_id | $test_tt | (false, true) + ); + impl_shuffle1_dyn!([$elem_ty; $elem_n]: $tuple_id | $test_tt); +- impl_bitmask!($tuple_id | $ibitmask_ty | (true, false) | $test_tt); + + test_cmp_partial_ord_mask!([$elem_ty; $elem_n]: $tuple_id | $test_tt); + test_shuffle1_dyn_mask!([$elem_ty; $elem_n]: $tuple_id | $test_tt); +--- cargo-crates/packed_simd-0.3.3/src/api/bitmask.rs.orig 2019-02-05 20:18:53 UTC ++++ cargo-crates/packed_simd-0.3.3/src/api/bitmask.rs +@@ -1,82 +0,0 @@ +-//! Bitmask API +- +-macro_rules! impl_bitmask { +- ($id:ident | $ibitmask_ty:ident | ($set:expr, $clear:expr) +- | $test_tt:tt) => { +- impl $id { +- /// Creates a bitmask with the MSB of each vector lane. +- /// +- /// If the vector has less than 8 lanes, the bits that do not +- /// correspond to any vector lanes are cleared. +- #[inline] +- pub fn bitmask(self) -> $ibitmask_ty { +- unsafe { codegen::llvm::simd_bitmask(self.0) } +- } +- } +- +- test_if! { +- $test_tt: +- paste::item! { +- #[cfg(not(any( +- // FIXME: https://github.com/rust-lang-nursery/packed_simd/issues/210 +- all(target_arch = "mips", target_endian = "big"), +- all(target_arch = "mips64", target_endian = "big"), +- target_arch = "sparc64", +- target_arch = "s390x", +- )))] +- pub mod [<$id _bitmask>] { +- use super::*; +- #[cfg_attr(not(target_arch = "wasm32"), test)] +- #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)] +- fn bitmask() { +- // clear all lanes +- let vec = $id::splat($clear as _); +- let bitmask: $ibitmask_ty = 0; +- assert_eq!(vec.bitmask(), bitmask); +- +- // set even lanes +- let mut vec = $id::splat($clear as _); +- for i in 0..$id::lanes() { +- if i % 2 == 0 { +- vec = vec.replace(i, $set as _); +- } +- } +- // create bitmask with even lanes set: +- let mut bitmask: $ibitmask_ty = 0; +- for i in 0..$id::lanes() { +- if i % 2 == 0 { +- bitmask |= 1 << i; +- } +- } +- assert_eq!(vec.bitmask(), bitmask); +- +- +- // set odd lanes +- let mut vec = $id::splat($clear as _); +- for i in 0..$id::lanes() { +- if i % 2 != 0 { +- vec = vec.replace(i, $set as _); +- } +- } +- // create bitmask with odd lanes set: +- let mut bitmask: $ibitmask_ty = 0; +- for i in 0..$id::lanes() { +- if i % 2 != 0 { +- bitmask |= 1 << i; +- } +- } +- assert_eq!(vec.bitmask(), bitmask); +- +- // set all lanes +- let vec = $id::splat($set as _); +- let mut bitmask: $ibitmask_ty = 0; +- for i in 0..$id::lanes() { +- bitmask |= 1 << i; +- } +- assert_eq!(vec.bitmask(), bitmask); +- } +- } +- } +- } +- }; +-} +--- cargo-crates/packed_simd-0.3.3/src/codegen/llvm.rs.orig 2019-01-31 22:44:03 UTC ++++ cargo-crates/packed_simd-0.3.3/src/codegen/llvm.rs +@@ -96,6 +96,4 @@ extern "platform-intrinsic" { + + crate fn simd_gather<T, P, M>(value: T, pointers: P, mask: M) -> T; + crate fn simd_scatter<T, P, M>(value: T, pointers: P, mask: M); +- +- crate fn simd_bitmask<T, U>(value: T) -> U; + } +--- cargo-crates/packed_simd-0.3.3/src/v128.rs.orig 2019-01-31 22:44:03 UTC ++++ cargo-crates/packed_simd-0.3.3/src/v128.rs +@@ -3,40 +3,40 @@ + + use crate::*; + +-impl_i!([i8; 16]: i8x16, m8x16 | i8, u16 | test_v128 | ++impl_i!([i8; 16]: i8x16, m8x16 | i8 | test_v128 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 | + From: | + /// A 128-bit vector with 16 `i8` lanes. + ); +-impl_u!([u8; 16]: u8x16, m8x16 | u8, u16 | test_v128 | ++impl_u!([u8; 16]: u8x16, m8x16 | u8 | test_v128 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 | + From: | + /// A 128-bit vector with 16 `u8` lanes. + ); +-impl_m!([m8; 16]: m8x16 | i8, u16 | test_v128 | ++impl_m!([m8; 16]: m8x16 | i8 | test_v128 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 | + From: m16x16 | + /// A 128-bit vector mask with 16 `m8` lanes. + ); + +-impl_i!([i16; 8]: i16x8, m16x8 | i16, u8 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_i!([i16; 8]: i16x8, m16x8 | i16 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: i8x8, u8x8 | + /// A 128-bit vector with 8 `i16` lanes. + ); +-impl_u!([u16; 8]: u16x8, m16x8 | u16, u8 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_u!([u16; 8]: u16x8, m16x8 | u16| test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: u8x8 | + /// A 128-bit vector with 8 `u16` lanes. + ); +-impl_m!([m16; 8]: m16x8 | i16, u8 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_m!([m16; 8]: m16x8 | i16 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: m8x8, m32x8 | + /// A 128-bit vector mask with 8 `m16` lanes. + ); + +-impl_i!([i32; 4]: i32x4, m32x4 | i32, u8 | test_v128 | x0, x1, x2, x3 | ++impl_i!([i32; 4]: i32x4, m32x4 | i32 | test_v128 | x0, x1, x2, x3 | + From: i8x4, u8x4, i16x4, u16x4 | + /// A 128-bit vector with 4 `i32` lanes. + ); +-impl_u!([u32; 4]: u32x4, m32x4 | u32, u8 | test_v128 | x0, x1, x2, x3 | ++impl_u!([u32; 4]: u32x4, m32x4 | u32| test_v128 | x0, x1, x2, x3 | + From: u8x4, u16x4 | + /// A 128-bit vector with 4 `u32` lanes. + ); +@@ -44,16 +44,16 @@ impl_f!([f32; 4]: f32x4, m32x4 | f32 | test_v128 | x0, + From: i8x4, u8x4, i16x4, u16x4 | + /// A 128-bit vector with 4 `f32` lanes. + ); +-impl_m!([m32; 4]: m32x4 | i32, u8 | test_v128 | x0, x1, x2, x3 | ++impl_m!([m32; 4]: m32x4 | i32 | test_v128 | x0, x1, x2, x3 | + From: m8x4, m16x4, m64x4 | + /// A 128-bit vector mask with 4 `m32` lanes. + ); + +-impl_i!([i64; 2]: i64x2, m64x2 | i64, u8 | test_v128 | x0, x1 | ++impl_i!([i64; 2]: i64x2, m64x2 | i64 | test_v128 | x0, x1 | + From: i8x2, u8x2, i16x2, u16x2, i32x2, u32x2 | + /// A 128-bit vector with 2 `i64` lanes. + ); +-impl_u!([u64; 2]: u64x2, m64x2 | u64, u8 | test_v128 | x0, x1 | ++impl_u!([u64; 2]: u64x2, m64x2 | u64 | test_v128 | x0, x1 | + From: u8x2, u16x2, u32x2 | + /// A 128-bit vector with 2 `u64` lanes. + ); +@@ -61,20 +61,20 @@ impl_f!([f64; 2]: f64x2, m64x2 | f64 | test_v128 | x0, + From: i8x2, u8x2, i16x2, u16x2, i32x2, u32x2, f32x2 | + /// A 128-bit vector with 2 `f64` lanes. + ); +-impl_m!([m64; 2]: m64x2 | i64, u8 | test_v128 | x0, x1 | ++impl_m!([m64; 2]: m64x2 | i64 | test_v128 | x0, x1 | + From: m8x2, m16x2, m32x2, m128x2 | + /// A 128-bit vector mask with 2 `m64` lanes. + ); + +-impl_i!([i128; 1]: i128x1, m128x1 | i128, u8 | test_v128 | x0 | ++impl_i!([i128; 1]: i128x1, m128x1 | i128 | test_v128 | x0 | + From: /*i8x1, u8x1, i16x1, u16x1, i32x1, u32x1, i64x1, u64x1 */ | // FIXME: unary small vector types + /// A 128-bit vector with 1 `i128` lane. + ); +-impl_u!([u128; 1]: u128x1, m128x1 | u128, u8 | test_v128 | x0 | ++impl_u!([u128; 1]: u128x1, m128x1 | u128 | test_v128 | x0 | + From: /*u8x1, u16x1, u32x1, u64x1 */ | // FIXME: unary small vector types + /// A 128-bit vector with 1 `u128` lane. + ); +-impl_m!([m128; 1]: m128x1 | i128, u8 | test_v128 | x0 | ++impl_m!([m128; 1]: m128x1 | i128 | test_v128 | x0 | + From: /*m8x1, m16x1, m32x1, m64x1 */ | // FIXME: unary small vector types + /// A 128-bit vector mask with 1 `m128` lane. + ); +--- cargo-crates/packed_simd-0.3.3/src/v16.rs.orig 2019-01-31 22:44:03 UTC ++++ cargo-crates/packed_simd-0.3.3/src/v16.rs +@@ -2,15 +2,15 @@ + + use crate::*; + +-impl_i!([i8; 2]: i8x2, m8x2 | i8, u8 | test_v16 | x0, x1 | ++impl_i!([i8; 2]: i8x2, m8x2 | i8 | test_v16 | x0, x1 | + From: | + /// A 16-bit vector with 2 `i8` lanes. + ); +-impl_u!([u8; 2]: u8x2, m8x2 | u8, u8 | test_v16 | x0, x1 | ++impl_u!([u8; 2]: u8x2, m8x2 | u8 | test_v16 | x0, x1 | + From: | + /// A 16-bit vector with 2 `u8` lanes. + ); +-impl_m!([m8; 2]: m8x2 | i8, u8 | test_v16 | x0, x1 | ++impl_m!([m8; 2]: m8x2 | i8 | test_v16 | x0, x1 | + From: m16x2, m32x2, m64x2, m128x2 | + /// A 16-bit vector mask with 2 `m8` lanes. + ); +--- cargo-crates/packed_simd-0.3.3/src/v256.rs.orig 2019-01-31 22:44:03 UTC ++++ cargo-crates/packed_simd-0.3.3/src/v256.rs +@@ -3,46 +3,46 @@ + + use crate::*; + +-impl_i!([i8; 32]: i8x32, m8x32 | i8, u32 | test_v256 | ++impl_i!([i8; 32]: i8x32, m8x32 | i8 | test_v256 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 | + From: | + /// A 256-bit vector with 32 `i8` lanes. + ); +-impl_u!([u8; 32]: u8x32, m8x32 | u8, u32 | test_v256 | ++impl_u!([u8; 32]: u8x32, m8x32 | u8 | test_v256 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 | + From: | + /// A 256-bit vector with 32 `u8` lanes. + ); +-impl_m!([m8; 32]: m8x32 | i8, u32 | test_v256 | ++impl_m!([m8; 32]: m8x32 | i8 | test_v256 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 | + From: | + /// A 256-bit vector mask with 32 `m8` lanes. + ); + +-impl_i!([i16; 16]: i16x16, m16x16 | i16, u16 | test_v256 | ++impl_i!([i16; 16]: i16x16, m16x16 | i16 | test_v256 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 | + From: i8x16, u8x16 | + /// A 256-bit vector with 16 `i16` lanes. + ); +-impl_u!([u16; 16]: u16x16, m16x16 | u16, u16 | test_v256 | ++impl_u!([u16; 16]: u16x16, m16x16 | u16 | test_v256 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 | + From: u8x16 | + /// A 256-bit vector with 16 `u16` lanes. + ); +-impl_m!([m16; 16]: m16x16 | i16, u16 | test_v256 | ++impl_m!([m16; 16]: m16x16 | i16 | test_v256 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 | + From: m8x16 | + /// A 256-bit vector mask with 16 `m16` lanes. + ); + +-impl_i!([i32; 8]: i32x8, m32x8 | i32, u8 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_i!([i32; 8]: i32x8, m32x8 | i32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: i8x8, u8x8, i16x8, u16x8 | + /// A 256-bit vector with 8 `i32` lanes. + ); +-impl_u!([u32; 8]: u32x8, m32x8 | u32, u8 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_u!([u32; 8]: u32x8, m32x8 | u32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: u8x8, u16x8 | + /// A 256-bit vector with 8 `u32` lanes. + ); +@@ -50,16 +50,16 @@ impl_f!([f32; 8]: f32x8, m32x8 | f32 | test_v256 | x0, + From: i8x8, u8x8, i16x8, u16x8 | + /// A 256-bit vector with 8 `f32` lanes. + ); +-impl_m!([m32; 8]: m32x8 | i32, u8 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_m!([m32; 8]: m32x8 | i32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: m8x8, m16x8 | + /// A 256-bit vector mask with 8 `m32` lanes. + ); + +-impl_i!([i64; 4]: i64x4, m64x4 | i64, u8 | test_v256 | x0, x1, x2, x3 | ++impl_i!([i64; 4]: i64x4, m64x4 | i64 | test_v256 | x0, x1, x2, x3 | + From: i8x4, u8x4, i16x4, u16x4, i32x4, u32x4 | + /// A 256-bit vector with 4 `i64` lanes. + ); +-impl_u!([u64; 4]: u64x4, m64x4 | u64, u8 | test_v256 | x0, x1, x2, x3 | ++impl_u!([u64; 4]: u64x4, m64x4 | u64 | test_v256 | x0, x1, x2, x3 | + From: u8x4, u16x4, u32x4 | + /// A 256-bit vector with 4 `u64` lanes. + ); +@@ -67,20 +67,20 @@ impl_f!([f64; 4]: f64x4, m64x4 | f64 | test_v256 | x0, + From: i8x4, u8x4, i16x4, u16x4, i32x4, u32x4, f32x4 | + /// A 256-bit vector with 4 `f64` lanes. + ); +-impl_m!([m64; 4]: m64x4 | i64, u8 | test_v256 | x0, x1, x2, x3 | ++impl_m!([m64; 4]: m64x4 | i64 | test_v256 | x0, x1, x2, x3 | + From: m8x4, m16x4, m32x4 | + /// A 256-bit vector mask with 4 `m64` lanes. + ); + +-impl_i!([i128; 2]: i128x2, m128x2 | i128, u8 | test_v256 | x0, x1 | ++impl_i!([i128; 2]: i128x2, m128x2 | i128 | test_v256 | x0, x1 | + From: i8x2, u8x2, i16x2, u16x2, i32x2, u32x2, i64x2, u64x2 | + /// A 256-bit vector with 2 `i128` lanes. + ); +-impl_u!([u128; 2]: u128x2, m128x2 | u128, u8 | test_v256 | x0, x1 | ++impl_u!([u128; 2]: u128x2, m128x2 | u128 | test_v256 | x0, x1 | + From: u8x2, u16x2, u32x2, u64x2 | + /// A 256-bit vector with 2 `u128` lanes. + ); +-impl_m!([m128; 2]: m128x2 | i128, u8 | test_v256 | x0, x1 | ++impl_m!([m128; 2]: m128x2 | i128 | test_v256 | x0, x1 | + From: m8x2, m16x2, m32x2, m64x2 | + /// A 256-bit vector mask with 2 `m128` lanes. + ); +--- cargo-crates/packed_simd-0.3.3/src/v32.rs.orig 2019-01-31 22:44:03 UTC ++++ cargo-crates/packed_simd-0.3.3/src/v32.rs +@@ -2,28 +2,28 @@ + + use crate::*; + +-impl_i!([i8; 4]: i8x4, m8x4 | i8, u8 | test_v32 | x0, x1, x2, x3 | ++impl_i!([i8; 4]: i8x4, m8x4 | i8 | test_v32 | x0, x1, x2, x3 | + From: | + /// A 32-bit vector with 4 `i8` lanes. + ); +-impl_u!([u8; 4]: u8x4, m8x4 | u8, u8 | test_v32 | x0, x1, x2, x3 | ++impl_u!([u8; 4]: u8x4, m8x4 | u8 | test_v32 | x0, x1, x2, x3 | + From: | + /// A 32-bit vector with 4 `u8` lanes. + ); +-impl_m!([m8; 4]: m8x4 | i8, u8 | test_v32 | x0, x1, x2, x3 | ++impl_m!([m8; 4]: m8x4 | i8 | test_v32 | x0, x1, x2, x3 | + From: m16x4, m32x4, m64x4 | + /// A 32-bit vector mask with 4 `m8` lanes. + ); + +-impl_i!([i16; 2]: i16x2, m16x2 | i16, u8 | test_v32 | x0, x1 | ++impl_i!([i16; 2]: i16x2, m16x2 | i16 | test_v32 | x0, x1 | + From: i8x2, u8x2 | + /// A 32-bit vector with 2 `i16` lanes. + ); +-impl_u!([u16; 2]: u16x2, m16x2 | u16, u8 | test_v32 | x0, x1 | ++impl_u!([u16; 2]: u16x2, m16x2 | u16 | test_v32 | x0, x1 | + From: u8x2 | + /// A 32-bit vector with 2 `u16` lanes. + ); +-impl_m!([m16; 2]: m16x2 | i16, u8 | test_v32 | x0, x1 | ++impl_m!([m16; 2]: m16x2 | i16 | test_v32 | x0, x1 | + From: m8x2, m32x2, m64x2, m128x2 | + /// A 32-bit vector mask with 2 `m16` lanes. + ); +--- cargo-crates/packed_simd-0.3.3/src/v512.rs.orig 2019-01-31 22:44:03 UTC ++++ cargo-crates/packed_simd-0.3.3/src/v512.rs +@@ -3,7 +3,7 @@ + + use crate::*; + +-impl_i!([i8; 64]: i8x64, m8x64 | i8, u64 | test_v512 | ++impl_i!([i8; 64]: i8x64, m8x64 | i8 | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31, + x32, x33, x34, x35, x36, x37, x38, x39, x40, x41, x42, x43, x44, x45, x46, x47, +@@ -11,7 +11,7 @@ impl_i!([i8; 64]: i8x64, m8x64 | i8, u64 | test_v512 | + From: | + /// A 512-bit vector with 64 `i8` lanes. + ); +-impl_u!([u8; 64]: u8x64, m8x64 | u8, u64 | test_v512 | ++impl_u!([u8; 64]: u8x64, m8x64 | u8 | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31, + x32, x33, x34, x35, x36, x37, x38, x39, x40, x41, x42, x43, x44, x45, x46, x47, +@@ -19,7 +19,7 @@ impl_u!([u8; 64]: u8x64, m8x64 | u8, u64 | test_v512 | + From: | + /// A 512-bit vector with 64 `u8` lanes. + ); +-impl_m!([m8; 64]: m8x64 | i8, u64 | test_v512 | ++impl_m!([m8; 64]: m8x64 | i8 | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31, + x32, x33, x34, x35, x36, x37, x38, x39, x40, x41, x42, x43, x44, x45, x46, x47, +@@ -28,31 +28,31 @@ impl_m!([m8; 64]: m8x64 | i8, u64 | test_v512 | + /// A 512-bit vector mask with 64 `m8` lanes. + ); + +-impl_i!([i16; 32]: i16x32, m16x32 | i16, u32 | test_v512 | ++impl_i!([i16; 32]: i16x32, m16x32 | i16 | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 | + From: i8x32, u8x32 | + /// A 512-bit vector with 32 `i16` lanes. + ); +-impl_u!([u16; 32]: u16x32, m16x32 | u16, u32 | test_v512 | ++impl_u!([u16; 32]: u16x32, m16x32 | u16 | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 | + From: u8x32 | + /// A 512-bit vector with 32 `u16` lanes. + ); +-impl_m!([m16; 32]: m16x32 | i16, u32 | test_v512 | ++impl_m!([m16; 32]: m16x32 | i16 | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, + x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 | + From: m8x32 | + /// A 512-bit vector mask with 32 `m16` lanes. + ); + +-impl_i!([i32; 16]: i32x16, m32x16 | i32, u16 | test_v512 | ++impl_i!([i32; 16]: i32x16, m32x16 | i32 | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 | + From: i8x16, u8x16, i16x16, u16x16 | + /// A 512-bit vector with 16 `i32` lanes. + ); +-impl_u!([u32; 16]: u32x16, m32x16 | u32, u16 | test_v512 | ++impl_u!([u32; 16]: u32x16, m32x16 | u32 | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 | + From: u8x16, u16x16 | + /// A 512-bit vector with 16 `u32` lanes. +@@ -62,17 +62,17 @@ impl_f!([f32; 16]: f32x16, m32x16 | f32 | test_v512 | + From: i8x16, u8x16, i16x16, u16x16 | + /// A 512-bit vector with 16 `f32` lanes. + ); +-impl_m!([m32; 16]: m32x16 | i32, u16 | test_v512 | ++impl_m!([m32; 16]: m32x16 | i32 | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 | + From: m8x16, m16x16 | + /// A 512-bit vector mask with 16 `m32` lanes. + ); + +-impl_i!([i64; 8]: i64x8, m64x8 | i64, u8 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_i!([i64; 8]: i64x8, m64x8 | i64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: i8x8, u8x8, i16x8, u16x8, i32x8, u32x8 | + /// A 512-bit vector with 8 `i64` lanes. + ); +-impl_u!([u64; 8]: u64x8, m64x8 | u64, u8 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_u!([u64; 8]: u64x8, m64x8 | u64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: u8x8, u16x8, u32x8 | + /// A 512-bit vector with 8 `u64` lanes. + ); +@@ -80,20 +80,20 @@ impl_f!([f64; 8]: f64x8, m64x8 | f64 | test_v512 | x0, + From: i8x8, u8x8, i16x8, u16x8, i32x8, u32x8, f32x8 | + /// A 512-bit vector with 8 `f64` lanes. + ); +-impl_m!([m64; 8]: m64x8 | i64, u8 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_m!([m64; 8]: m64x8 | i64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: m8x8, m16x8, m32x8 | + /// A 512-bit vector mask with 8 `m64` lanes. + ); + +-impl_i!([i128; 4]: i128x4, m128x4 | i128, u8 | test_v512 | x0, x1, x2, x3 | ++impl_i!([i128; 4]: i128x4, m128x4 | i128 | test_v512 | x0, x1, x2, x3 | + From: i8x4, u8x4, i16x4, u16x4, i32x4, u32x4, i64x4, u64x4 | + /// A 512-bit vector with 4 `i128` lanes. + ); +-impl_u!([u128; 4]: u128x4, m128x4 | u128, u8 | test_v512 | x0, x1, x2, x3 | ++impl_u!([u128; 4]: u128x4, m128x4 | u128 | test_v512 | x0, x1, x2, x3 | + From: u8x4, u16x4, u32x4, u64x4 | + /// A 512-bit vector with 4 `u128` lanes. + ); +-impl_m!([m128; 4]: m128x4 | i128, u8 | test_v512 | x0, x1, x2, x3 | ++impl_m!([m128; 4]: m128x4 | i128 | test_v512 | x0, x1, x2, x3 | + From: m8x4, m16x4, m32x4, m64x4 | + /// A 512-bit vector mask with 4 `m128` lanes. + ); +--- cargo-crates/packed_simd-0.3.3/src/v64.rs.orig 2019-02-05 20:18:53 UTC ++++ cargo-crates/packed_simd-0.3.3/src/v64.rs +@@ -3,41 +3,41 @@ + + use super::*; + +-impl_i!([i8; 8]: i8x8, m8x8 | i8, u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_i!([i8; 8]: i8x8, m8x8 | i8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: | + /// A 64-bit vector with 8 `i8` lanes. + ); +-impl_u!([u8; 8]: u8x8, m8x8 | u8, u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_u!([u8; 8]: u8x8, m8x8 | u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: | + /// A 64-bit vector with 8 `u8` lanes. + ); +-impl_m!([m8; 8]: m8x8 | i8, u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 | ++impl_m!([m8; 8]: m8x8 | i8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 | + From: m16x8, m32x8 | + /// A 64-bit vector mask with 8 `m8` lanes. + ); + +-impl_i!([i16; 4]: i16x4, m16x4 | i16, u8 | test_v64 | x0, x1, x2, x3 | ++impl_i!([i16; 4]: i16x4, m16x4 | i16 | test_v64 | x0, x1, x2, x3 | + From: i8x4, u8x4 | + /// A 64-bit vector with 4 `i16` lanes. + ); +-impl_u!([u16; 4]: u16x4, m16x4 | u16, u8 | test_v64 | x0, x1, x2, x3 | ++impl_u!([u16; 4]: u16x4, m16x4 | u16 | test_v64 | x0, x1, x2, x3 | + From: u8x4 | + /// A 64-bit vector with 4 `u16` lanes. + ); +-impl_m!([m16; 4]: m16x4 | i16, u8 | test_v64 | x0, x1, x2, x3 | ++impl_m!([m16; 4]: m16x4 | i16 | test_v64 | x0, x1, x2, x3 | + From: m8x4, m32x4, m64x4 | + /// A 64-bit vector mask with 4 `m16` lanes. + ); + +-impl_i!([i32; 2]: i32x2, m32x2 | i32, u8 | test_v64 | x0, x1 | ++impl_i!([i32; 2]: i32x2, m32x2 | i32 | test_v64 | x0, x1 | + From: i8x2, u8x2, i16x2, u16x2 | + /// A 64-bit vector with 2 `i32` lanes. + ); +-impl_u!([u32; 2]: u32x2, m32x2 | u32, u8 | test_v64 | x0, x1 | ++impl_u!([u32; 2]: u32x2, m32x2 | u32 | test_v64 | x0, x1 | + From: u8x2, u16x2 | + /// A 64-bit vector with 2 `u32` lanes. + ); +-impl_m!([m32; 2]: m32x2 | i32, u8 | test_v64 | x0, x1 | ++impl_m!([m32; 2]: m32x2 | i32 | test_v64 | x0, x1 | + From: m8x2, m16x2, m64x2, m128x2 | + /// A 64-bit vector mask with 2 `m32` lanes. + ); +@@ -47,15 +47,15 @@ impl_f!([f32; 2]: f32x2, m32x2 | f32 | test_v64 | x0, + ); + + /* +-impl_i!([i64; 1]: i64x1, m64x1 | i64, u8 | test_v64 | x0 | ++impl_i!([i64; 1]: i64x1, m64x1 | i64 | test_v64 | x0 | + From: /*i8x1, u8x1, i16x1, u16x1, i32x1, u32x1*/ | // FIXME: primitive to vector conversion + /// A 64-bit vector with 1 `i64` lanes. + ); +-impl_u!([u64; 1]: u64x1, m64x1 | u64, u8 | test_v64 | x0 | ++impl_u!([u64; 1]: u64x1, m64x1 | u64 | test_v64 | x0 | + From: /*u8x1, u16x1, u32x1*/ | // FIXME: primitive to vector conversion + /// A 64-bit vector with 1 `u64` lanes. + ); +-impl_m!([m64; 1]: m64x1 | i64, u8 | test_v64 | x0 | ++impl_m!([m64; 1]: m64x1 | i64 | test_v64 | x0 | + From: /*m8x1, m16x1, m32x1, */ m128x1 | // FIXME: unary small vector types + /// A 64-bit vector mask with 1 `m64` lanes. + ); +--- cargo-crates/packed_simd-0.3.3/src/vSize.rs.orig 2019-01-31 22:44:03 UTC ++++ cargo-crates/packed_simd-0.3.3/src/vSize.rs +@@ -3,50 +3,50 @@ + use crate::codegen::pointer_sized_int::{isize_, usize_}; + use crate::*; + +-impl_i!([isize; 2]: isizex2, msizex2 | isize_, u8 | test_v128 | ++impl_i!([isize; 2]: isizex2, msizex2 | isize_ | test_v128 | + x0, x1| + From: | + /// A vector with 2 `isize` lanes. + ); + +-impl_u!([usize; 2]: usizex2, msizex2 | usize_, u8 | test_v128 | ++impl_u!([usize; 2]: usizex2, msizex2 | usize_ | test_v128 | + x0, x1| + From: | + /// A vector with 2 `usize` lanes. + ); +-impl_m!([msize; 2]: msizex2 | isize_, u8 | test_v128 | ++impl_m!([msize; 2]: msizex2 | isize_ | test_v128 | + x0, x1 | + From: | + /// A vector mask with 2 `msize` lanes. + ); + +-impl_i!([isize; 4]: isizex4, msizex4 | isize_, u8 | test_v256 | ++impl_i!([isize; 4]: isizex4, msizex4 | isize_ | test_v256 | + x0, x1, x2, x3 | + From: | + /// A vector with 4 `isize` lanes. + ); +-impl_u!([usize; 4]: usizex4, msizex4 | usize_, u8 | test_v256 | ++impl_u!([usize; 4]: usizex4, msizex4 | usize_ | test_v256 | + x0, x1, x2, x3| + From: | + /// A vector with 4 `usize` lanes. + ); +-impl_m!([msize; 4]: msizex4 | isize_, u8 | test_v256 | ++impl_m!([msize; 4]: msizex4 | isize_ | test_v256 | + x0, x1, x2, x3 | + From: | + /// A vector mask with 4 `msize` lanes. + ); + +-impl_i!([isize; 8]: isizex8, msizex8 | isize_, u8 | test_v512 | ++impl_i!([isize; 8]: isizex8, msizex8 | isize_ | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7 | + From: | + /// A vector with 4 `isize` lanes. + ); +-impl_u!([usize; 8]: usizex8, msizex8 | usize_, u8 | test_v512 | ++impl_u!([usize; 8]: usizex8, msizex8 | usize_ | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7 | + From: | + /// A vector with 8 `usize` lanes. + ); +-impl_m!([msize; 8]: msizex8 | isize_, u8 | test_v512 | ++impl_m!([msize; 8]: msizex8 | isize_ | test_v512 | + x0, x1, x2, x3, x4, x5, x6, x7 | + From: | + /// A vector mask with 8 `msize` lanes. diff --git a/textproc/sd/Makefile b/textproc/sd/Makefile index fc903e8cebea..75b34b97aec9 100644 --- a/textproc/sd/Makefile +++ b/textproc/sd/Makefile @@ -3,6 +3,7 @@ PORTNAME= sd DISTVERSIONPREFIX= sd- DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= tobik@FreeBSD.org diff --git a/textproc/xsv-rs/Makefile b/textproc/xsv-rs/Makefile index 69f91f95a57a..12dc1bdad07c 100644 --- a/textproc/xsv-rs/Makefile +++ b/textproc/xsv-rs/Makefile @@ -2,7 +2,7 @@ PORTNAME= xsv DISTVERSION= 0.13.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc PKGNAMESUFFIX= -rs diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile index d7940678c4d3..75f085b0402d 100644 --- a/www/cliqz/Makefile +++ b/www/cliqz/Makefile @@ -2,7 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.24.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz diff --git a/www/cliqz/files/patch-bug1519629 b/www/cliqz/files/patch-bug1519629 new file mode 100644 index 000000000000..1323fe2d235d --- /dev/null +++ b/www/cliqz/files/patch-bug1519629 @@ -0,0 +1,35 @@ +commit f8f381bf03b5 +Author: Emilio Cobos Álvarez <emilio@crisal.io> +Date: Sun Jan 13 21:42:38 2019 +0100 + + Bug 1519629 - Document a few more macros. +--- + servo/components/style/gecko/regen_atoms.py | 1 + + servo/components/style/gecko_string_cache/namespace.rs | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git servo/components/style/gecko/regen_atoms.py servo/components/style/gecko/regen_atoms.py +index dfc2252aa899..b6f68fceb7d5 100755 +--- mozilla-release/servo/components/style/gecko/regen_atoms.py ++++ mozilla-release/servo/components/style/gecko/regen_atoms.py +@@ -203,6 +203,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n ' + + MACRO = ''' + #[macro_export] ++/// Returns a static atom by passing the literal string it represents. + macro_rules! atom {{ + {} + }} +diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs +index 4aa4accaf1d4..725e1da21692 100644 +--- mozilla-release/servo/components/style/gecko_string_cache/namespace.rs ++++ mozilla-release/servo/components/style/gecko_string_cache/namespace.rs +@@ -11,6 +11,8 @@ use std::borrow::Borrow; + use std::fmt; + use std::ops::Deref; + ++/// In Gecko namespaces are just regular atoms, so this is a simple macro to ++/// forward one macro to the other. + #[macro_export] + macro_rules! ns { + () => { diff --git a/www/cliqz/files/patch-bug1519729 b/www/cliqz/files/patch-bug1519729 new file mode 100644 index 000000000000..64829a4a0355 --- /dev/null +++ b/www/cliqz/files/patch-bug1519729 @@ -0,0 +1,131 @@ +commit 9bdfa9fecaf1 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:02:28 2019 +0100 + + Bug 1519729 - Remove unused macro. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style_traits/values.rs | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 6da235c07b64..2851082c22e0 100644 +--- mozilla-release/servo/components/style_traits/values.rs ++++ mozilla-release/servo/components/style_traits/values.rs +@@ -158,24 +158,6 @@ where + } + } + +-#[macro_export] +-macro_rules! serialize_function { +- ($dest: expr, $name: ident($( $arg: expr, )+)) => { +- serialize_function!($dest, $name($($arg),+)) +- }; +- ($dest: expr, $name: ident($first_arg: expr $( , $arg: expr )*)) => { +- { +- $dest.write_str(concat!(stringify!($name), "("))?; +- $first_arg.to_css($dest)?; +- $( +- $dest.write_str(", ")?; +- $arg.to_css($dest)?; +- )* +- $dest.write_char(')') +- } +- } +-} +- + /// Convenience wrapper to serialise CSS values separated by a given string. + pub struct SequenceWriter<'a, 'b: 'a, W: 'b> { + inner: &'a mut CssWriter<'b, W>, + +commit 9d5e559547d0 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:03:44 2019 +0100 + + Bug 1519729 - Document public macros. r=emilio + + Undocumented public macros emit warnings in nightly-2019-01-11, + and we #![deny] that warning. + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style/properties/properties.mako.rs | 17 ++++++++++++++++- + servo/components/style_traits/values.rs | 2 +- + 2 files changed, 17 insertions(+), 2 deletions(-) + +diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs +index 2d91273be15a..9220c3b1a665 100644 +--- mozilla-release/servo/components/style/properties/properties.mako.rs ++++ mozilla-release/servo/components/style/properties/properties.mako.rs +@@ -3821,7 +3821,14 @@ impl AliasId { + } + } + +-// NOTE(emilio): Callers are responsible to deal with prefs. ++/// Call the given macro with tokens like this for each longhand and shorthand properties ++/// that is enabled in content: ++/// ++/// ``` ++/// [CamelCaseName, SetCamelCaseName, PropertyId::Longhand(LonghandId::CamelCaseName)], ++/// ``` ++/// ++/// NOTE(emilio): Callers are responsible to deal with prefs. + #[macro_export] + macro_rules! css_properties_accessors { + ($macro_name: ident) => { +@@ -3844,6 +3851,14 @@ macro_rules! css_properties_accessors { + } + } + ++/// Call the given macro with tokens like this for each longhand properties: ++/// ++/// ``` ++/// { snake_case_ident, true } ++/// ``` ++/// ++/// … where the boolean indicates whether the property value type ++/// is wrapped in a `Box<_>` in the corresponding `PropertyDeclaration` variant. + #[macro_export] + macro_rules! longhand_properties_idents { + ($macro_name: ident) => { +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 2851082c22e0..0d7ee3f506ce 100644 +--- mozilla-release/servo/components/style_traits/values.rs ++++ mozilla-release/servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + 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)] + +commit 2b08ae08b260 +Author: lqd <remy.rakic+github@gmail.com> +Date: Fri Jan 11 16:35:26 2019 +0100 + + Bug 1519729 - Typo fix in new doc-comment. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 + + Co-Authored-By: SimonSapin <simon.sapin@exyr.org> +--- + servo/components/style_traits/values.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 0d7ee3f506ce..582e34eb3db0 100644 +--- mozilla-release/servo/components/style_traits/values.rs ++++ mozilla-release/servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + impl_to_css_for_predefined_type!(::cssparser::Color); + impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); + +-/// Define an enum type with unit variants that each corrsepond to a CSS keyword. ++/// Define an enum type with unit variants that each correspond to a CSS keyword. + macro_rules! define_css_keyword_enum { + (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { + #[allow(missing_docs)] diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 612fbf6ddd72..8ce8f90b87d1 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 60.5.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox-esr/files/patch-bug1458219 b/www/firefox-esr/files/patch-bug1458219 new file mode 100644 index 000000000000..0b86d436d050 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1458219 @@ -0,0 +1,26 @@ +commit cfe84bdd1ce1 +Author: Jonathan Watt <jwatt@jwatt.org> +Date: Wed Apr 25 14:54:26 2018 +0100 + + Bug 1458219 - Remove the 'property_name' macro. r=xidorn +--- + servo/components/style/properties/properties.mako.rs | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs +index a1d2ee9d085a..5e3d8eaeaaf8 100644 +--- servo/components/style/properties/properties.mako.rs ++++ servo/components/style/properties/properties.mako.rs +@@ -56,12 +56,6 @@ use style_adjuster::StyleAdjuster; + + pub use self::declaration_block::*; + +-#[cfg(feature = "gecko")] +-#[macro_export] +-macro_rules! property_name { +- ($s: tt) => { atom!($s) } +-} +- + <%! + from data import Method, Keyword, to_rust_ident, to_camel_case, SYSTEM_FONT_LONGHANDS + import os.path diff --git a/www/firefox-esr/files/patch-bug1519629 b/www/firefox-esr/files/patch-bug1519629 new file mode 100644 index 000000000000..f0ceec943602 --- /dev/null +++ b/www/firefox-esr/files/patch-bug1519629 @@ -0,0 +1,35 @@ +commit f8f381bf03b5 +Author: Emilio Cobos Álvarez <emilio@crisal.io> +Date: Sun Jan 13 21:42:38 2019 +0100 + + Bug 1519629 - Document a few more macros. +--- + servo/components/style/gecko/regen_atoms.py | 1 + + servo/components/style/gecko_string_cache/namespace.rs | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git servo/components/style/gecko/regen_atoms.py servo/components/style/gecko/regen_atoms.py +index dfc2252aa899..b6f68fceb7d5 100755 +--- servo/components/style/gecko/regen_atoms.py ++++ servo/components/style/gecko/regen_atoms.py +@@ -203,6 +203,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n ' + + MACRO = ''' + #[macro_export] ++/// Returns a static atom by passing the literal string it represents. + macro_rules! atom {{ + {} + }} +diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs +index 4aa4accaf1d4..725e1da21692 100644 +--- servo/components/style/gecko_string_cache/namespace.rs ++++ servo/components/style/gecko_string_cache/namespace.rs +@@ -11,6 +11,8 @@ use std::borrow::Borrow; + use std::fmt; + use std::ops::Deref; + ++/// In Gecko namespaces are just regular atoms, so this is a simple macro to ++/// forward one macro to the other. + #[macro_export] + macro_rules! ns { + () => { diff --git a/www/firefox-esr/files/patch-bug1519729 b/www/firefox-esr/files/patch-bug1519729 new file mode 100644 index 000000000000..e91ebcec56fc --- /dev/null +++ b/www/firefox-esr/files/patch-bug1519729 @@ -0,0 +1,131 @@ +commit 9bdfa9fecaf1 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:02:28 2019 +0100 + + Bug 1519729 - Remove unused macro. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style_traits/values.rs | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 6da235c07b64..2851082c22e0 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -158,24 +158,6 @@ where + } + } + +-#[macro_export] +-macro_rules! serialize_function { +- ($dest: expr, $name: ident($( $arg: expr, )+)) => { +- serialize_function!($dest, $name($($arg),+)) +- }; +- ($dest: expr, $name: ident($first_arg: expr $( , $arg: expr )*)) => { +- { +- $dest.write_str(concat!(stringify!($name), "("))?; +- $first_arg.to_css($dest)?; +- $( +- $dest.write_str(", ")?; +- $arg.to_css($dest)?; +- )* +- $dest.write_char(')') +- } +- } +-} +- + /// Convenience wrapper to serialise CSS values separated by a given string. + pub struct SequenceWriter<'a, 'b: 'a, W: 'b> { + inner: &'a mut CssWriter<'b, W>, + +commit 9d5e559547d0 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:03:44 2019 +0100 + + Bug 1519729 - Document public macros. r=emilio + + Undocumented public macros emit warnings in nightly-2019-01-11, + and we #![deny] that warning. + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style/properties/properties.mako.rs | 17 ++++++++++++++++- + servo/components/style_traits/values.rs | 2 +- + 2 files changed, 17 insertions(+), 2 deletions(-) + +diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs +index 2d91273be15a..9220c3b1a665 100644 +--- servo/components/style/properties/properties.mako.rs ++++ servo/components/style/properties/properties.mako.rs +@@ -3821,7 +3821,14 @@ impl AliasId { + } + } + +-// NOTE(emilio): Callers are responsible to deal with prefs. ++/// Call the given macro with tokens like this for each longhand and shorthand properties ++/// that is enabled in content: ++/// ++/// ``` ++/// [CamelCaseName, SetCamelCaseName, PropertyId::Longhand(LonghandId::CamelCaseName)], ++/// ``` ++/// ++/// NOTE(emilio): Callers are responsible to deal with prefs. + #[macro_export] + macro_rules! css_properties_accessors { + ($macro_name: ident) => { +@@ -3844,6 +3851,14 @@ macro_rules! css_properties_accessors { + } + } + ++/// Call the given macro with tokens like this for each longhand properties: ++/// ++/// ``` ++/// { snake_case_ident, true } ++/// ``` ++/// ++/// … where the boolean indicates whether the property value type ++/// is wrapped in a `Box<_>` in the corresponding `PropertyDeclaration` variant. + #[macro_export] + macro_rules! longhand_properties_idents { + ($macro_name: ident) => { +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 2851082c22e0..0d7ee3f506ce 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + 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)] + +commit 2b08ae08b260 +Author: lqd <remy.rakic+github@gmail.com> +Date: Fri Jan 11 16:35:26 2019 +0100 + + Bug 1519729 - Typo fix in new doc-comment. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 + + Co-Authored-By: SimonSapin <simon.sapin@exyr.org> +--- + servo/components/style_traits/values.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 0d7ee3f506ce..582e34eb3db0 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + impl_to_css_for_predefined_type!(::cssparser::Color); + impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); + +-/// Define an enum type with unit variants that each corrsepond to a CSS keyword. ++/// Define an enum type with unit variants that each correspond to a CSS keyword. + macro_rules! define_css_keyword_enum { + (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { + #[allow(missing_docs)] diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 65b1e3060c30..91a3a1e86169 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 65.0.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/files/patch-bug1519629 b/www/firefox/files/patch-bug1519629 new file mode 100644 index 000000000000..f0ceec943602 --- /dev/null +++ b/www/firefox/files/patch-bug1519629 @@ -0,0 +1,35 @@ +commit f8f381bf03b5 +Author: Emilio Cobos Álvarez <emilio@crisal.io> +Date: Sun Jan 13 21:42:38 2019 +0100 + + Bug 1519629 - Document a few more macros. +--- + servo/components/style/gecko/regen_atoms.py | 1 + + servo/components/style/gecko_string_cache/namespace.rs | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git servo/components/style/gecko/regen_atoms.py servo/components/style/gecko/regen_atoms.py +index dfc2252aa899..b6f68fceb7d5 100755 +--- servo/components/style/gecko/regen_atoms.py ++++ servo/components/style/gecko/regen_atoms.py +@@ -203,6 +203,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n ' + + MACRO = ''' + #[macro_export] ++/// Returns a static atom by passing the literal string it represents. + macro_rules! atom {{ + {} + }} +diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs +index 4aa4accaf1d4..725e1da21692 100644 +--- servo/components/style/gecko_string_cache/namespace.rs ++++ servo/components/style/gecko_string_cache/namespace.rs +@@ -11,6 +11,8 @@ use std::borrow::Borrow; + use std::fmt; + use std::ops::Deref; + ++/// In Gecko namespaces are just regular atoms, so this is a simple macro to ++/// forward one macro to the other. + #[macro_export] + macro_rules! ns { + () => { diff --git a/www/firefox/files/patch-bug1519729 b/www/firefox/files/patch-bug1519729 new file mode 100644 index 000000000000..e91ebcec56fc --- /dev/null +++ b/www/firefox/files/patch-bug1519729 @@ -0,0 +1,131 @@ +commit 9bdfa9fecaf1 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:02:28 2019 +0100 + + Bug 1519729 - Remove unused macro. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style_traits/values.rs | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 6da235c07b64..2851082c22e0 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -158,24 +158,6 @@ where + } + } + +-#[macro_export] +-macro_rules! serialize_function { +- ($dest: expr, $name: ident($( $arg: expr, )+)) => { +- serialize_function!($dest, $name($($arg),+)) +- }; +- ($dest: expr, $name: ident($first_arg: expr $( , $arg: expr )*)) => { +- { +- $dest.write_str(concat!(stringify!($name), "("))?; +- $first_arg.to_css($dest)?; +- $( +- $dest.write_str(", ")?; +- $arg.to_css($dest)?; +- )* +- $dest.write_char(')') +- } +- } +-} +- + /// Convenience wrapper to serialise CSS values separated by a given string. + pub struct SequenceWriter<'a, 'b: 'a, W: 'b> { + inner: &'a mut CssWriter<'b, W>, + +commit 9d5e559547d0 +Author: Simon Sapin <simon.sapin@exyr.org> +Date: Fri Jan 11 14:03:44 2019 +0100 + + Bug 1519729 - Document public macros. r=emilio + + Undocumented public macros emit warnings in nightly-2019-01-11, + and we #![deny] that warning. + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 +--- + servo/components/style/properties/properties.mako.rs | 17 ++++++++++++++++- + servo/components/style_traits/values.rs | 2 +- + 2 files changed, 17 insertions(+), 2 deletions(-) + +diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs +index 2d91273be15a..9220c3b1a665 100644 +--- servo/components/style/properties/properties.mako.rs ++++ servo/components/style/properties/properties.mako.rs +@@ -3821,7 +3821,14 @@ impl AliasId { + } + } + +-// NOTE(emilio): Callers are responsible to deal with prefs. ++/// Call the given macro with tokens like this for each longhand and shorthand properties ++/// that is enabled in content: ++/// ++/// ``` ++/// [CamelCaseName, SetCamelCaseName, PropertyId::Longhand(LonghandId::CamelCaseName)], ++/// ``` ++/// ++/// NOTE(emilio): Callers are responsible to deal with prefs. + #[macro_export] + macro_rules! css_properties_accessors { + ($macro_name: ident) => { +@@ -3844,6 +3851,14 @@ macro_rules! css_properties_accessors { + } + } + ++/// Call the given macro with tokens like this for each longhand properties: ++/// ++/// ``` ++/// { snake_case_ident, true } ++/// ``` ++/// ++/// … where the boolean indicates whether the property value type ++/// is wrapped in a `Box<_>` in the corresponding `PropertyDeclaration` variant. + #[macro_export] + macro_rules! longhand_properties_idents { + ($macro_name: ident) => { +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 2851082c22e0..0d7ee3f506ce 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + 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)] + +commit 2b08ae08b260 +Author: lqd <remy.rakic+github@gmail.com> +Date: Fri Jan 11 16:35:26 2019 +0100 + + Bug 1519729 - Typo fix in new doc-comment. r=emilio + + Cherry-picks a commit from https://github.com/servo/servo/pull/22674 + + Co-Authored-By: SimonSapin <simon.sapin@exyr.org> +--- + servo/components/style_traits/values.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs +index 0d7ee3f506ce..582e34eb3db0 100644 +--- servo/components/style_traits/values.rs ++++ servo/components/style_traits/values.rs +@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); + impl_to_css_for_predefined_type!(::cssparser::Color); + impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); + +-/// Define an enum type with unit variants that each corrsepond to a CSS keyword. ++/// Define an enum type with unit variants that each correspond to a CSS keyword. + macro_rules! define_css_keyword_enum { + (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { + #[allow(missing_docs)] diff --git a/www/geckodriver/Makefile b/www/geckodriver/Makefile index acb4daeec1e0..add5013bbb66 100644 --- a/www/geckodriver/Makefile +++ b/www/geckodriver/Makefile @@ -3,7 +3,7 @@ PORTNAME= geckodriver DISTVERSIONPREFIX= v DISTVERSION= 0.23.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MAINTAINER= daniel@blodan.se diff --git a/www/newsboat/Makefile b/www/newsboat/Makefile index 3984e8f6c72c..24441eeef39e 100644 --- a/www/newsboat/Makefile +++ b/www/newsboat/Makefile @@ -3,7 +3,7 @@ PORTNAME= newsboat PORTVERSION= 2.14.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://newsboat.org/releases/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index f1506c4bbd11..094443c75687 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.49.4 -PORTREVISION= 23 +PORTREVISION= 24 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/websocat/Makefile b/www/websocat/Makefile index 0d462355c68d..c95e3f52cc5a 100644 --- a/www/websocat/Makefile +++ b/www/websocat/Makefile @@ -4,7 +4,7 @@ PORTNAME= websocat DISTVERSION= 1.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MAINTAINER= osa@FreeBSD.org diff --git a/x11/admiral/Makefile b/x11/admiral/Makefile index c00801ab61f7..2e1b425f7fe3 100644 --- a/x11/admiral/Makefile +++ b/x11/admiral/Makefile @@ -4,7 +4,7 @@ PORTNAME= admiral DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-7 DISTVERSIONSUFFIX= -g5a9f33b -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MAINTAINER= rigoletto@FreeBSD.org diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile index f799ebfd908b..84682bc9ccf5 100644 --- a/x11/alacritty/Makefile +++ b/x11/alacritty/Makefile @@ -3,7 +3,7 @@ PORTNAME= alacritty PORTVERSION= 0.2.9 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= zeising@FreeBSD.org |