Index: head/x11/alacritty/Makefile =================================================================== --- head/x11/alacritty/Makefile (revision 538444) +++ head/x11/alacritty/Makefile (revision 538445) @@ -1,318 +1,319 @@ # $FreeBSD$ PORTNAME= alacritty DISTVERSIONPREFIX= v DISTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= tobik@FreeBSD.org COMMENT= GPU-accelerated terminal emulator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-APACHE LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 TEST_DEPENDS= dejavu>0:x11-fonts/dejavu USES= cargo localbase:ldflags python:3.6+,build ssl:build xorg USE_GITHUB= yes USE_XORG= xcb CARGO_CRATES= adler32-1.0.4 \ aho-corasick-0.7.10 \ andrew-0.2.1 \ android_glue-0.2.3 \ android_log-sys-0.1.2 \ ansi_term-0.11.0 \ approx-0.3.2 \ arc-swap-0.4.6 \ arrayref-0.3.6 \ arrayvec-0.4.12 \ arrayvec-0.5.1 \ atty-0.2.14 \ autocfg-1.0.0 \ base64-0.11.0 \ bindgen-0.53.2 \ bitflags-1.2.1 \ blake2b_simd-0.5.10 \ block-0.1.6 \ bytemuck-1.2.0 \ byteorder-1.3.4 \ bzip2-0.3.3 \ bzip2-sys-0.1.8+1.0.8 \ calloop-0.4.4 \ cc-1.0.53 \ cexpr-0.4.0 \ cfg-if-0.1.10 \ cgl-0.3.2 \ clang-sys-0.29.3 \ clap-2.33.1 \ clipboard-win-2.2.0 \ cloudabi-0.0.3 \ cmake-0.1.43 \ cocoa-0.19.1 \ cocoa-0.20.0 \ constant_time_eq-0.1.5 \ copypasta-0.6.3 \ core-foundation-0.6.4 \ core-foundation-0.7.0 \ core-foundation-sys-0.6.2 \ core-foundation-sys-0.7.0 \ core-graphics-0.17.3 \ core-graphics-0.19.0 \ core-text-15.0.0 \ core-video-sys-0.1.4 \ crc32fast-1.2.0 \ crossbeam-utils-0.7.2 \ deflate-0.8.4 \ derivative-2.1.1 \ dirs-2.0.2 \ dirs-sys-0.3.4 \ dispatch-0.2.0 \ dlib-0.4.1 \ downcast-rs-1.1.1 \ dtoa-0.4.5 \ dwrote-0.9.0 \ embed-resource-1.3.3 \ env_logger-0.7.1 \ euclid-0.20.11 \ expat-sys-2.1.6 \ filetime-0.2.10 \ flate2-1.0.14 \ fnv-1.0.7 \ foreign-types-0.3.2 \ foreign-types-0.5.0 \ foreign-types-macros-0.2.1 \ foreign-types-shared-0.1.1 \ foreign-types-shared-0.3.0 \ freetype-rs-0.23.0 \ freetype-sys-0.9.0 \ fsevent-0.4.0 \ fsevent-sys-2.0.1 \ fuchsia-zircon-0.3.3 \ fuchsia-zircon-sys-0.3.3 \ getrandom-0.1.14 \ gl_generator-0.13.1 \ gl_generator-0.14.0 \ glob-0.3.0 \ glutin-0.24.0 \ glutin_egl_sys-0.1.4 \ glutin_emscripten_sys-0.1.1 \ glutin_gles2_sys-0.1.4 \ glutin_glx_sys-0.1.6 \ glutin_wgl_sys-0.1.4 \ hermit-abi-0.1.13 \ http_req-0.5.5 \ humantime-1.3.0 \ idna-0.2.0 \ image-0.23.4 \ inflate-0.4.5 \ inotify-0.7.0 \ inotify-sys-0.1.3 \ instant-0.1.3 \ iovec-0.1.4 \ itoa-0.4.5 \ jni-sys-0.3.0 \ jobserver-0.1.21 \ kernel32-sys-0.2.2 \ khronos_api-3.1.0 \ lazy_static-1.4.0 \ lazycell-1.2.1 \ lexical-core-0.6.2 \ libc-0.2.70 \ libloading-0.5.2 \ libz-sys-1.0.25 \ line_drawing-0.7.0 \ linked-hash-map-0.5.3 \ lock_api-0.3.4 \ log-0.4.8 \ malloc_buf-0.0.6 \ matches-0.1.8 \ maybe-uninit-2.0.0 \ memchr-2.3.3 \ memmap-0.7.0 \ miniz_oxide-0.3.6 \ mio-0.6.22 \ mio-anonymous-pipes-0.1.0 \ mio-extras-2.0.6 \ mio-named-pipes-0.1.6 \ miow-0.2.1 \ miow-0.3.3 \ native-tls-0.2.4 \ ndk-0.1.0 \ ndk-glue-0.1.0 \ ndk-sys-0.1.0 \ net2-0.2.34 \ nix-0.14.1 \ nix-0.17.0 \ nodrop-0.1.14 \ nom-5.1.1 \ notify-4.0.15 \ num-integer-0.1.42 \ num-iter-0.1.40 \ num-rational-0.2.4 \ num-traits-0.2.11 \ num_enum-0.4.3 \ num_enum_derive-0.4.3 \ objc-0.2.7 \ objc-foundation-0.1.1 \ objc_id-0.1.1 \ openssl-0.10.29 \ openssl-probe-0.1.2 \ openssl-sys-0.9.56 \ ordered-float-1.0.2 \ osmesa-sys-0.1.2 \ parking_lot-0.10.2 \ parking_lot_core-0.7.2 \ peeking_take_while-0.1.2 \ percent-encoding-2.1.0 \ phf-0.8.0 \ phf_codegen-0.8.0 \ phf_generator-0.8.0 \ phf_shared-0.8.0 \ pkg-config-0.3.17 \ png-0.16.3 \ podio-0.1.6 \ ppv-lite86-0.2.7 \ proc-macro-crate-0.1.4 \ proc-macro2-0.4.30 \ proc-macro2-1.0.13 \ quick-error-1.2.3 \ quote-0.6.13 \ quote-1.0.5 \ rand-0.7.3 \ rand_chacha-0.2.2 \ rand_core-0.5.1 \ rand_hc-0.2.0 \ rand_pcg-0.2.1 \ raw-window-handle-0.3.3 \ redox_syscall-0.1.56 \ redox_users-0.3.4 \ regex-1.3.7 \ regex-syntax-0.6.17 \ remove_dir_all-0.5.2 \ rust-argon2-0.7.0 \ rustc-hash-1.1.0 \ rustc_tools_util-0.2.0 \ rustc_version-0.2.3 \ rusttype-0.7.9 \ rusttype-0.8.3 \ ryu-1.0.4 \ same-file-1.0.6 \ schannel-0.1.19 \ scopeguard-1.1.0 \ security-framework-0.4.4 \ security-framework-sys-0.4.3 \ semver-0.9.0 \ semver-parser-0.7.0 \ serde-1.0.110 \ serde_derive-1.0.110 \ serde_json-1.0.53 \ serde_yaml-0.8.12 \ servo-fontconfig-0.4.0 \ servo-fontconfig-sys-4.0.9 \ shared_library-0.1.9 \ shlex-0.1.1 \ signal-hook-0.1.15 \ signal-hook-registry-1.2.0 \ siphasher-0.3.3 \ slab-0.4.2 \ smallvec-1.4.0 \ smithay-client-toolkit-0.6.6 \ smithay-clipboard-0.4.0 \ socket2-0.3.12 \ spsc-buffer-0.1.1 \ static_assertions-0.3.4 \ stb_truetype-0.3.1 \ strsim-0.8.0 \ syn-1.0.22 \ tempfile-3.1.0 \ termcolor-1.1.0 \ terminfo-0.7.2 \ textwrap-0.11.0 \ thread_local-1.0.1 \ time-0.1.43 \ toml-0.5.6 \ unicase-2.6.0 \ unicode-bidi-0.3.4 \ unicode-normalization-0.1.12 \ unicode-width-0.1.7 \ unicode-xid-0.1.0 \ unicode-xid-0.2.0 \ url-2.1.1 \ urlocator-0.1.3 \ utf8parse-0.2.0 \ vcpkg-0.2.8 \ vec_map-0.8.2 \ version_check-0.9.1 \ void-1.0.2 \ vswhom-0.1.0 \ vswhom-sys-0.1.0 \ vte-0.8.0 \ vte_generate_state_changes-0.1.1 \ walkdir-2.3.1 \ wasi-0.9.0+wasi-snapshot-preview1 \ wayland-client-0.23.6 \ wayland-commons-0.23.6 \ wayland-protocols-0.23.6 \ wayland-scanner-0.23.6 \ wayland-sys-0.23.6 \ which-3.1.1 \ winapi-0.2.8 \ winapi-0.3.8 \ winapi-build-0.1.1 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.5 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ winit-0.22.2 \ winpty-0.2.0 \ winpty-sys-0.5.0 \ winreg-0.6.2 \ ws2_32-sys-0.2.1 \ x11-clipboard-0.5.1 \ x11-dl-2.18.5 \ xcb-0.9.0 \ xdg-2.2.0 \ xml-rs-0.8.0 \ yaml-rust-0.4.3 \ zip-0.5.5 CARGO_INSTALL_PATH= alacritty # For xcb crate BINARY_ALIAS= python3=${PYTHON_CMD} PLIST_FILES= bin/alacritty \ etc/bash_completion.d/alacritty.bash \ share/fish/completions/alacritty.fish \ share/man/man1/alacritty.1.gz \ share/pixmaps/Alacritty.svg \ share/zsh/site-functions/_alacritty \ ${DESKTOPDIR}/Alacritty.desktop PORTEXAMPLES= alacritty.yml OPTIONS_DEFINE= EXAMPLES post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/alacritty ${INSTALL_DATA} ${WRKSRC}/extra/linux/Alacritty.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/extra/logo/alacritty-term.svg \ ${STAGEDIR}${PREFIX}/share/pixmaps/Alacritty.svg ${INSTALL_MAN} ${WRKSRC}/extra/alacritty.man \ ${STAGEDIR}${PREFIX}/share/man/man1/alacritty.1 @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC}/extra/completions/alacritty.bash \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions ${INSTALL_DATA} ${WRKSRC}/extra/completions/alacritty.fish \ ${STAGEDIR}${PREFIX}/share/fish/completions @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/extra/completions/_alacritty \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .include Index: head/x11/alacritty/files/patch-winit-pr1534 =================================================================== --- head/x11/alacritty/files/patch-winit-pr1534 (nonexistent) +++ head/x11/alacritty/files/patch-winit-pr1534 (revision 538445) @@ -0,0 +1,170 @@ +https://github.com/rust-windowing/winit/pull/1534 + +--- cargo-crates/winit-0.22.2/src/platform_impl/linux/wayland/keyboard.rs.orig 2020-05-16 16:27:31 UTC ++++ cargo-crates/winit-0.22.2/src/platform_impl/linux/wayland/keyboard.rs +@@ -65,7 +65,7 @@ pub fn init_keyboard( + wl_keyboard::KeyState::Released => ElementState::Released, + _ => unreachable!(), + }; +- let vkcode = key_to_vkey(rawkey, keysym); ++ let vkcode = keysym_to_vkey(keysym); + my_sink.send_window_event( + #[allow(deprecated)] + WindowEvent::KeyboardInput { +@@ -110,7 +110,7 @@ pub fn init_keyboard( + move |repeat_event: KeyRepeatEvent, _| { + if let Some(wid) = *repeat_target.lock().unwrap() { + let state = ElementState::Pressed; +- let vkcode = key_to_vkey(repeat_event.rawkey, repeat_event.keysym); ++ let vkcode = keysym_to_vkey(repeat_event.keysym); + repeat_sink.send_window_event( + #[allow(deprecated)] + WindowEvent::KeyboardInput { +@@ -199,26 +199,20 @@ pub fn init_keyboard( + } + } + +-fn key_to_vkey(rawkey: u32, keysym: u32) -> Option { +- match rawkey { +- 1 => Some(VirtualKeyCode::Escape), +- 2 => Some(VirtualKeyCode::Key1), +- 3 => Some(VirtualKeyCode::Key2), +- 4 => Some(VirtualKeyCode::Key3), +- 5 => Some(VirtualKeyCode::Key4), +- 6 => Some(VirtualKeyCode::Key5), +- 7 => Some(VirtualKeyCode::Key6), +- 8 => Some(VirtualKeyCode::Key7), +- 9 => Some(VirtualKeyCode::Key8), +- 10 => Some(VirtualKeyCode::Key9), +- 11 => Some(VirtualKeyCode::Key0), +- _ => keysym_to_vkey(keysym), +- } +-} +- + fn keysym_to_vkey(keysym: u32) -> Option { + use smithay_client_toolkit::keyboard::keysyms; + match keysym { ++ // numbers ++ keysyms::XKB_KEY_1 => Some(VirtualKeyCode::Key1), ++ keysyms::XKB_KEY_2 => Some(VirtualKeyCode::Key2), ++ keysyms::XKB_KEY_3 => Some(VirtualKeyCode::Key3), ++ keysyms::XKB_KEY_4 => Some(VirtualKeyCode::Key4), ++ keysyms::XKB_KEY_5 => Some(VirtualKeyCode::Key4), ++ keysyms::XKB_KEY_6 => Some(VirtualKeyCode::Key5), ++ keysyms::XKB_KEY_7 => Some(VirtualKeyCode::Key6), ++ keysyms::XKB_KEY_8 => Some(VirtualKeyCode::Key7), ++ keysyms::XKB_KEY_9 => Some(VirtualKeyCode::Key8), ++ keysyms::XKB_KEY_0 => Some(VirtualKeyCode::Key9), + // letters + keysyms::XKB_KEY_A | keysyms::XKB_KEY_a => Some(VirtualKeyCode::A), + keysyms::XKB_KEY_B | keysyms::XKB_KEY_b => Some(VirtualKeyCode::B), +@@ -246,6 +240,8 @@ fn keysym_to_vkey(keysym: u32) -> Option Some(VirtualKeyCode::X), + keysyms::XKB_KEY_Y | keysyms::XKB_KEY_y => Some(VirtualKeyCode::Y), + keysyms::XKB_KEY_Z | keysyms::XKB_KEY_z => Some(VirtualKeyCode::Z), ++ // Escape ++ keysyms::XKB_KEY_Escape => Some(VirtualKeyCode::Escape), + // F-- + keysyms::XKB_KEY_F1 => Some(VirtualKeyCode::F1), + keysyms::XKB_KEY_F2 => Some(VirtualKeyCode::F2), +@@ -286,10 +282,14 @@ fn keysym_to_vkey(keysym: u32) -> Option Some(VirtualKeyCode::Up), + keysyms::XKB_KEY_Right => Some(VirtualKeyCode::Right), + keysyms::XKB_KEY_Down => Some(VirtualKeyCode::Down), +- // ++ + keysyms::XKB_KEY_BackSpace => Some(VirtualKeyCode::Back), + keysyms::XKB_KEY_Return => Some(VirtualKeyCode::Return), + keysyms::XKB_KEY_space => Some(VirtualKeyCode::Space), ++ ++ keysyms::XKB_KEY_Multi_key => Some(VirtualKeyCode::Compose), ++ keysyms::XKB_KEY_caret => Some(VirtualKeyCode::Caret), ++ + // keypad + keysyms::XKB_KEY_Num_Lock => Some(VirtualKeyCode::Numlock), + keysyms::XKB_KEY_KP_0 => Some(VirtualKeyCode::Numpad0), +@@ -308,33 +308,32 @@ fn keysym_to_vkey(keysym: u32) -> Option Some(VirtualKeyCode::Add), + keysyms::XKB_KEY_apostrophe => Some(VirtualKeyCode::Apostrophe), + // => Some(VirtualKeyCode::Apps), +- // => Some(VirtualKeyCode::At), ++ keysyms::XKB_KEY_at => Some(VirtualKeyCode::At), + // => Some(VirtualKeyCode::Ax), + keysyms::XKB_KEY_backslash => Some(VirtualKeyCode::Backslash), +- // => Some(VirtualKeyCode::Calculator), ++ keysyms::XKB_KEY_XF86Calculator => Some(VirtualKeyCode::Calculator), + // => Some(VirtualKeyCode::Capital), + keysyms::XKB_KEY_colon => Some(VirtualKeyCode::Colon), + keysyms::XKB_KEY_comma => Some(VirtualKeyCode::Comma), + // => Some(VirtualKeyCode::Convert), +- // => Some(VirtualKeyCode::Decimal), +- // => Some(VirtualKeyCode::Divide), ++ keysyms::XKB_KEY_KP_Decimal => Some(VirtualKeyCode::Decimal), + keysyms::XKB_KEY_equal => Some(VirtualKeyCode::Equals), +- // => Some(VirtualKeyCode::Grave), ++ keysyms::XKB_KEY_grave => Some(VirtualKeyCode::Grave), + // => Some(VirtualKeyCode::Kana), +- // => Some(VirtualKeyCode::Kanji), ++ keysyms::XKB_KEY_Kanji => Some(VirtualKeyCode::Kanji), + keysyms::XKB_KEY_Alt_L => Some(VirtualKeyCode::LAlt), +- // => Some(VirtualKeyCode::LBracket), ++ keysyms::XKB_KEY_bracketleft => Some(VirtualKeyCode::LBracket), + keysyms::XKB_KEY_Control_L => Some(VirtualKeyCode::LControl), + keysyms::XKB_KEY_Shift_L => Some(VirtualKeyCode::LShift), +- // => Some(VirtualKeyCode::LWin), +- // => Some(VirtualKeyCode::Mail), ++ keysyms::XKB_KEY_Super_L => Some(VirtualKeyCode::LWin), ++ keysyms::XKB_KEY_XF86Mail => Some(VirtualKeyCode::Mail), + // => Some(VirtualKeyCode::MediaSelect), + // => Some(VirtualKeyCode::MediaStop), + keysyms::XKB_KEY_minus => Some(VirtualKeyCode::Minus), + keysyms::XKB_KEY_asterisk => Some(VirtualKeyCode::Multiply), +- // => Some(VirtualKeyCode::Mute), ++ keysyms::XKB_KEY_XF86AudioMute => Some(VirtualKeyCode::Mute), + // => Some(VirtualKeyCode::MyComputer), +- // => Some(VirtualKeyCode::NextTrack), ++ keysyms::XKB_KEY_XF86AudioNext => Some(VirtualKeyCode::NextTrack), + // => Some(VirtualKeyCode::NoConvert), + keysyms::XKB_KEY_KP_Separator => Some(VirtualKeyCode::NumpadComma), + keysyms::XKB_KEY_KP_Enter => Some(VirtualKeyCode::NumpadEnter), +@@ -347,24 +346,23 @@ fn keysym_to_vkey(keysym: u32) -> Option Some(VirtualKeyCode::Home), + keysyms::XKB_KEY_KP_End => Some(VirtualKeyCode::End), + // => Some(VirtualKeyCode::OEM102), +- // => Some(VirtualKeyCode::Period), ++ keysyms::XKB_KEY_period => Some(VirtualKeyCode::Period), + // => Some(VirtualKeyCode::Playpause), +- // => Some(VirtualKeyCode::Power), +- // => Some(VirtualKeyCode::Prevtrack), ++ keysyms::XKB_KEY_XF86PowerOff => Some(VirtualKeyCode::Power), ++ keysyms::XKB_KEY_XF86AudioPrev => Some(VirtualKeyCode::PrevTrack), + keysyms::XKB_KEY_Alt_R => Some(VirtualKeyCode::RAlt), +- // => Some(VirtualKeyCode::RBracket), ++ keysyms::XKB_KEY_bracketright => Some(VirtualKeyCode::RBracket), + keysyms::XKB_KEY_Control_R => Some(VirtualKeyCode::RControl), + keysyms::XKB_KEY_Shift_R => Some(VirtualKeyCode::RShift), +- // => Some(VirtualKeyCode::RWin), ++ keysyms::XKB_KEY_Super_R => Some(VirtualKeyCode::RWin), + keysyms::XKB_KEY_semicolon => Some(VirtualKeyCode::Semicolon), + keysyms::XKB_KEY_slash => Some(VirtualKeyCode::Slash), +- // => Some(VirtualKeyCode::Sleep), ++ keysyms::XKB_KEY_XF86Sleep => Some(VirtualKeyCode::Sleep), + // => Some(VirtualKeyCode::Stop), +- // => Some(VirtualKeyCode::Subtract), + // => Some(VirtualKeyCode::Sysrq), + keysyms::XKB_KEY_Tab => Some(VirtualKeyCode::Tab), + keysyms::XKB_KEY_ISO_Left_Tab => Some(VirtualKeyCode::Tab), +- // => Some(VirtualKeyCode::Underline), ++ keysyms::XKB_KEY_underscore => Some(VirtualKeyCode::Underline), + // => Some(VirtualKeyCode::Unlabeled), + keysyms::XKB_KEY_XF86AudioLowerVolume => Some(VirtualKeyCode::VolumeDown), + keysyms::XKB_KEY_XF86AudioRaiseVolume => Some(VirtualKeyCode::VolumeUp), +@@ -376,7 +374,7 @@ fn keysym_to_vkey(keysym: u32) -> Option Some(VirtualKeyCode::WebRefresh), + // => Some(VirtualKeyCode::WebSearch), + // => Some(VirtualKeyCode::WebStop), +- // => Some(VirtualKeyCode::Yen), ++ keysyms::XKB_KEY_yen => Some(VirtualKeyCode::Yen), + keysyms::XKB_KEY_XF86Copy => Some(VirtualKeyCode::Copy), + keysyms::XKB_KEY_XF86Paste => Some(VirtualKeyCode::Paste), + keysyms::XKB_KEY_XF86Cut => Some(VirtualKeyCode::Cut), Property changes on: head/x11/alacritty/files/patch-winit-pr1534 ___________________________________________________________________ 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