Index: head/x11/alacritty/Makefile =================================================================== --- head/x11/alacritty/Makefile (revision 451379) +++ head/x11/alacritty/Makefile (revision 451380) @@ -1,173 +1,177 @@ # $FreeBSD$ PORTNAME= alacritty PORTVERSION= g20170618 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= tobik@FreeBSD.org COMMENT= GPU-accelerated terminal emulator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-APACHE BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= cargo USE_GITHUB= yes GH_ACCOUNT= jwilm GH_TAGNAME= 3c8514ba103d5d987d2269c421a3cc09e6784904 GH_TUPLE= jwilm:glutin:cc64178d39a1fa06b2c5403117e5e0ef24deeac4:glutin \ jwilm:rust-fontconfig:419135e5e1106ec0973dd4923bd9c70d8e438cc8:servofontconfig \ jwilm:libfontconfig:618a52973d46e5cce4f054f6ee3bd2682167eee4:servofontconfigsys + +EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL:R}} +EXTRA_PATCHES_FreeBSD_12= ${PATCHDIR}/extra-patch-freebsd12 PLIST_FILES= bin/alacritty CARGO_CRATES= android_glue-0.2.2 \ ansi_term-0.9.0 \ arraydeque-0.2.3 \ atty-0.2.2 \ bitflags-0.3.3 \ bitflags-0.4.0 \ bitflags-0.7.0 \ bitflags-0.8.2 \ block-0.1.6 \ byteorder-0.5.3 \ bytes-0.3.0 \ cfg-if-0.1.0 \ cgl-0.1.5 \ cgmath-0.7.0 \ clap-2.24.2 \ clippy-0.0.104 \ clippy_lints-0.0.104 \ cmake-0.1.24 \ cocoa-0.3.3 \ core-foundation-0.2.3 \ core-foundation-0.3.0 \ core-foundation-sys-0.2.3 \ core-foundation-sys-0.3.1 \ core-graphics-0.3.2 \ core-graphics-0.8.1 \ core-text-5.0.0 \ crossbeam-0.2.10 \ dlib-0.3.1 \ dtoa-0.4.1 \ dwmapi-sys-0.1.0 \ errno-0.2.3 \ euclid-0.12.0 \ expat-sys-2.1.4 \ filetime-0.1.10 \ fnv-1.0.5 \ freetype-rs-0.13.0 \ freetype-sys-0.4.0 \ fs2-0.2.5 \ fsevent-0.2.16 \ fsevent-sys-0.1.6 \ gcc-0.3.49 \ gdi32-sys-0.1.1 \ gl_generator-0.5.3 \ gleam-0.2.32 \ heapsize-0.3.9 \ inotify-0.2.3 \ itoa-0.3.1 \ kernel32-sys-0.2.2 \ khronos_api-1.0.1 \ lazy_static-0.1.16 \ lazy_static-0.2.8 \ lazycell-0.4.0 \ libc-0.2.23 \ libloading-0.3.4 \ libz-sys-1.0.13 \ linked-hash-map-0.3.0 \ log-0.3.8 \ malloc_buf-0.0.6 \ matches-0.1.4 \ memmap-0.2.3 \ mio-0.5.1 \ mio-0.6.2 \ miow-0.1.5 \ net2-0.2.29 \ nix-0.5.1 \ nix-0.7.0 \ nodrop-0.1.9 \ nom-1.2.4 \ notify-2.6.3 \ num-0.1.37 \ num-bigint-0.1.37 \ num-complex-0.1.37 \ num-integer-0.1.34 \ num-iter-0.1.33 \ num-rational-0.1.36 \ num-traits-0.1.37 \ objc-0.2.2 \ objc-foundation-0.1.1 \ objc_id-0.1.0 \ odds-0.2.25 \ osmesa-sys-0.1.2 \ owning_ref-0.2.4 \ parking_lot-0.3.8 \ parking_lot_core-0.2.2 \ phf-0.7.21 \ phf_codegen-0.7.21 \ phf_generator-0.7.21 \ phf_shared-0.7.21 \ pkg-config-0.3.9 \ quine-mc_cluskey-0.2.4 \ quote-0.3.15 \ rand-0.3.15 \ redox_syscall-0.1.17 \ regex-syntax-0.3.9 \ rustc-serialize-0.3.24 \ rustc_version-0.1.7 \ semver-0.1.20 \ semver-0.2.3 \ serde-0.7.15 \ serde-0.9.15 \ serde_codegen_internals-0.14.2 \ serde_derive-0.9.15 \ serde_json-0.9.10 \ serde_yaml-0.6.2 \ shared_library-0.1.5 \ shell32-sys-0.1.1 \ siphasher-0.2.2 \ slab-0.1.3 \ slab-0.3.0 \ smallvec-0.4.0 \ strsim-0.6.0 \ syn-0.11.11 \ synom-0.11.3 \ target_build_utils-0.3.1 \ tempfile-2.1.5 \ term_size-0.3.0 \ thread-id-3.1.0 \ time-0.1.37 \ toml-0.1.30 \ unicode-normalization-0.1.4 \ unicode-segmentation-1.2.0 \ unicode-width-0.1.4 \ unicode-xid-0.0.4 \ user32-sys-0.1.2 \ utf8parse-0.1.0 \ vec_map-0.8.0 \ void-1.0.2 \ vte-0.3.0 \ walkdir-0.1.8 \ wayland-client-0.5.12 \ wayland-kbd-0.3.6 \ wayland-scanner-0.5.11 \ wayland-sys-0.5.11 \ wayland-window-0.2.3 \ winapi-0.2.8 \ winapi-build-0.1.1 \ ws2_32-sys-0.2.1 \ x11-dl-2.14.0 \ xdg-2.1.0 \ xml-rs-0.3.6 \ yaml-rust-0.3.5 CARGO_USE_GITHUB= yes CARGO_GH_CARGOTOML= ${CARGO_CARGOTOML} \ ${WRKSRC}/font/Cargo.toml \ ${WRKSRC_servofontconfig}/Cargo.toml .include Index: head/x11/alacritty/files/extra-patch-freebsd12 =================================================================== --- head/x11/alacritty/files/extra-patch-freebsd12 (nonexistent) +++ head/x11/alacritty/files/extra-patch-freebsd12 (revision 451380) @@ -0,0 +1,222 @@ +https://github.com/jwilm/alacritty/issues/618 + +--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/aarch64.rs.orig 2017-03-02 02:44:01 UTC ++++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/aarch64.rs +@@ -7,10 +7,12 @@ 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_mode: ::mode_t, ++ pub st_pad0: ::uint16_t, + pub st_uid: ::uid_t, + pub st_gid: ::gid_t, ++ pub st_pad1: ::uint32_t, + pub st_rdev: ::dev_t, + pub st_atime: ::time_t, + pub st_atime_nsec: ::c_long, +@@ -18,13 +20,13 @@ s! { + pub st_mtime_nsec: ::c_long, + pub st_ctime: ::time_t, + pub st_ctime_nsec: ::c_long, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_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, ++ pub st_gen: ::uint64_t, ++ pub st_spare: [::uint64_t; 10], + } + } +--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2017-04-26 14:28:39 UTC ++++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/mod.rs +@@ -1,8 +1,8 @@ + pub type fflags_t = u32; + pub type clock_t = i32; +-pub type ino_t = u32; ++pub type ino_t = u64; + pub type lwpid_t = i32; +-pub type nlink_t = u16; ++pub type nlink_t = u64; + pub type blksize_t = u32; + pub type clockid_t = ::c_int; + pub type sem_t = _sem; +@@ -44,10 +44,13 @@ s! { + } + + pub struct dirent { +- pub d_fileno: u32, ++ pub d_fileno: u64, ++ pub d_off: u64, + pub d_reclen: u16, + pub d_type: u8, +- pub d_namlen: u8, ++ pub d_pad0: u8, ++ pub d_namlen: u16, ++ pub d_pad1: u16, + pub d_name: [::c_char; 256], + } + +--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/x86.rs.orig 2016-10-14 21:54:23 UTC ++++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/x86.rs +@@ -7,25 +7,30 @@ 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_mode: ::mode_t, ++ pub st_pad0: ::uint16_t, + pub st_uid: ::uid_t, + pub st_gid: ::gid_t, ++ pub st_pad1: ::uint32_t, + pub st_rdev: ::dev_t, ++ pub st_atime_ext: ::int32_t, + pub st_atime: ::time_t, + pub st_atime_nsec: ::c_long, ++ pub st_mtime_ext: ::int32_t, + pub st_mtime: ::time_t, + pub st_mtime_nsec: ::c_long, ++ pub st_ctime_ext: ::int32_t, + pub st_ctime: ::time_t, + pub st_ctime_nsec: ::c_long, ++ pub st_birthtime_ext: ::int32_t, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_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, +- __unused: [u8; 8], ++ pub st_gen: ::uint64_t, ++ pub st_spare: [::uint64_t; 10], + } + } +--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/x86_64.rs.orig 2016-10-14 21:54:23 UTC ++++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/freebsd/x86_64.rs +@@ -7,10 +7,12 @@ 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_mode: ::mode_t, ++ pub st_pad0: ::uint16_t, + pub st_uid: ::uid_t, + pub st_gid: ::gid_t, ++ pub st_pad1: ::uint32_t, + pub st_rdev: ::dev_t, + pub st_atime: ::time_t, + pub st_atime_nsec: ::c_long, +@@ -18,13 +20,13 @@ s! { + pub st_mtime_nsec: ::c_long, + pub st_ctime: ::time_t, + pub st_ctime_nsec: ::c_long, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_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, ++ pub st_gen: ::uint64_t, ++ pub st_spare: [::uint64_t; 10], + } + } +--- cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/mod.rs.orig 2017-05-19 03:32:21 UTC ++++ cargo-crates/libc-0.2.23/src/unix/bsd/freebsdlike/mod.rs +@@ -1,4 +1,4 @@ +-pub type dev_t = u32; ++pub type dev_t = u64; + pub type mode_t = u16; + pub type pthread_attr_t = *mut ::c_void; + pub type rlim_t = i64; +@@ -35,8 +35,9 @@ s! { + pub filter: ::c_short, + pub flags: ::c_ushort, + pub fflags: ::c_uint, +- pub data: ::intptr_t, ++ pub data: i64, + pub udata: *mut ::c_void, ++ pub ext: [u64; 4], + } + + pub struct sockaddr_storage { +--- cargo-crates/mio-0.5.1/src/sys/unix/kqueue.rs.orig 2016-04-27 20:28:22 UTC ++++ cargo-crates/mio-0.5.1/src/sys/unix/kqueue.rs +@@ -110,6 +110,7 @@ impl Selector { + fflags: FilterFlag::empty(), + data: 0, +- udata: token ++ udata: token, ++ ext: [0, 0, 0, 0], + }); + } + +--- cargo-crates/mio-0.6.2/src/sys/unix/kqueue.rs.orig 2016-12-14 20:41:05 UTC ++++ cargo-crates/mio-0.6.2/src/sys/unix/kqueue.rs +@@ -121,6 +121,7 @@ impl Selector { + fflags: FilterFlag::empty(), + data: 0, + udata: token as UData, ++ ext: [0, 0, 0, 0], + }); + } + +--- cargo-crates/nix-0.5.1/src/sys/event.rs.orig 2016-03-16 20:17:51 UTC ++++ cargo-crates/nix-0.5.1/src/sys/event.rs +@@ -23,8 +23,9 @@ mod ffi { + pub filter: EventFilter, // 2 + pub flags: EventFlag, // 2 + pub fflags: FilterFlag, // 4 +- pub data: intptr_t, // 8 +- pub udata: usize // 8 ++ pub data: i64, // 8 ++ pub udata: usize, // 8 ++ pub ext: [u64; 4], // 32 + } + + #[cfg(target_os = "netbsd")] +@@ -346,6 +347,7 @@ pub fn ev_set(ev: &mut KEvent, + ev.fflags = fflags; + ev.data = 0; + ev.udata = udata; ++ ev.ext = [0, 0, 0, 0]; + } + + #[cfg(target_os = "netbsd")] +--- cargo-crates/nix-0.7.0/src/sys/event.rs.orig 2016-08-31 18:53:01 UTC ++++ cargo-crates/nix-0.7.0/src/sys/event.rs +@@ -23,8 +23,9 @@ mod ffi { + pub filter: EventFilter, // 2 + pub flags: EventFlag, // 2 + pub fflags: FilterFlag, // 4 +- pub data: intptr_t, // 8 +- pub udata: usize // 8 ++ pub data: i64, // 8 ++ pub udata: usize, // 8 ++ pub ext: [u64; 4], // 32 + } + + #[cfg(target_os = "netbsd")] +@@ -346,6 +347,7 @@ pub fn ev_set(ev: &mut KEvent, + ev.fflags = fflags; + ev.data = 0; + ev.udata = udata; ++ ev.ext = [0, 0, 0, 0]; + } + + #[cfg(target_os = "netbsd")] Property changes on: head/x11/alacritty/files/extra-patch-freebsd12 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property