summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2021-07-27 21:37:02 +0200
committerChristian Duerr <contact@christianduerr.com>2021-07-27 19:52:42 +0000
commit2b53585d6c136eb261cffb91faa129aaf2ccf339 (patch)
tree659f02d0ae713c32e8eee95ecdb31a40653aa474
parentc4e8b5399c6b9b4c4f006e1febe50d9a07e32c5c (diff)
downloadalacritty-2b53585d6c136eb261cffb91faa129aaf2ccf339.tar.gz
alacritty-2b53585d6c136eb261cffb91faa129aaf2ccf339.zip
-rw-r--r--CHANGELOG.md2
-rw-r--r--Cargo.lock185
-rw-r--r--alacritty/Cargo.toml4
-rw-r--r--alacritty/windows/wix/alacritty.wxs2
-rw-r--r--alacritty_terminal/Cargo.toml2
-rw-r--r--extra/alacritty.man2
-rw-r--r--extra/osx/Alacritty.app/Contents/Info.plist2
7 files changed, 51 insertions, 148 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c856e219..0fcaf183 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ The sections should follow the order `Packaging`, `Added`, `Changed`, `Fixed` an
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-## 0.9.0-rc3
+## 0.9.0-rc4
### Packaging
diff --git a/Cargo.lock b/Cargo.lock
index 33988fb8..6784ddca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,13 +16,13 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
[[package]]
name = "alacritty"
-version = "0.9.0-rc3"
+version = "0.9.0-rc4"
dependencies = [
"alacritty_config_derive",
"alacritty_terminal",
"bitflags",
"clap",
- "cocoa",
+ "cocoa 0.24.0",
"copypasta",
"crossfont",
"dirs",
@@ -62,7 +62,7 @@ dependencies = [
[[package]]
name = "alacritty_terminal"
-version = "0.15.0-rc3"
+version = "0.15.0-rc4"
dependencies = [
"alacritty_config_derive",
"base64",
@@ -70,7 +70,7 @@ dependencies = [
"dirs",
"libc",
"log",
- "mio 0.6.23",
+ "mio",
"mio-anonymous-pipes",
"mio-extras",
"miow 0.3.7",
@@ -222,6 +222,22 @@ dependencies = [
[[package]]
name = "cocoa"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c54201c07dcf3a5ca33fececb8042aed767ee4bfd5a0235a8ceabcda956044b2"
+dependencies = [
+ "bitflags",
+ "block",
+ "cocoa-foundation",
+ "core-foundation 0.9.1",
+ "core-graphics 0.22.2",
+ "foreign-types 0.3.2",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832"
@@ -369,80 +385,12 @@ dependencies = [
]
[[package]]
-name = "crossbeam"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
- "lazy_static",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
-dependencies = [
- "cfg-if 1.0.0",
- "lazy_static",
-]
-
-[[package]]
name = "crossfont"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc52c750165ecb41cf02bfa8fd6731dc6796dddd87a3713fc9fbe9e08e71d48b"
dependencies = [
- "cocoa",
+ "cocoa 0.24.0",
"core-foundation 0.9.1",
"core-foundation-sys 0.8.2",
"core-graphics 0.22.2",
@@ -735,13 +683,13 @@ dependencies = [
[[package]]
name = "glutin"
-version = "0.27.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "762d6cd2e1b855d99668ebe591cc9058659d85ac39a9a2078000eb122ddba8f0"
+checksum = "1ae1cbb9176b9151c4ce03f012e3cd1c6c18c4be79edeaeb3d99f5d8085c5fa3"
dependencies = [
"android_glue",
"cgl",
- "cocoa",
+ "cocoa 0.23.0",
"core-foundation 0.9.1",
"glutin_egl_sys",
"glutin_emscripten_sys",
@@ -749,7 +697,7 @@ dependencies = [
"glutin_glx_sys",
"glutin_wgl_sys",
"lazy_static",
- "libloading 0.7.0",
+ "libloading 0.6.7",
"log",
"objc",
"osmesa-sys",
@@ -1032,25 +980,12 @@ dependencies = [
]
[[package]]
-name = "mio"
-version = "0.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
-dependencies = [
- "libc",
- "log",
- "miow 0.3.7",
- "ntapi",
- "winapi 0.3.9",
-]
-
-[[package]]
name = "mio-anonymous-pipes"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bc513025fe5005a3aa561b50fdb2cda5a150b84800ae02acd8aa9ed62ca1a6b"
dependencies = [
- "mio 0.6.23",
+ "mio",
"miow 0.3.7",
"parking_lot",
"spsc-buffer",
@@ -1065,23 +1000,11 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
dependencies = [
"lazycell",
"log",
- "mio 0.6.23",
+ "mio",
"slab",
]
[[package]]
-name = "mio-misc"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ddf05411bb159cdb5801bb10002afb66cb4572be656044315e363460ce69dc2"
-dependencies = [
- "crossbeam",
- "crossbeam-queue",
- "log",
- "mio 0.7.13",
-]
-
-[[package]]
name = "miow"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1104,9 +1027,9 @@ dependencies = [
[[package]]
name = "ndk"
-version = "0.3.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
+checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73"
dependencies = [
"jni-sys",
"ndk-sys",
@@ -1116,9 +1039,9 @@ dependencies = [
[[package]]
name = "ndk-glue"
-version = "0.3.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385"
+checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241"
dependencies = [
"lazy_static",
"libc",
@@ -1135,7 +1058,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d"
dependencies = [
"darling",
- "proc-macro-crate 0.1.5",
+ "proc-macro-crate",
"proc-macro2",
"quote",
"syn",
@@ -1217,26 +1140,17 @@ dependencies = [
"fsevent-sys",
"inotify",
"libc",
- "mio 0.6.23",
+ "mio",
"mio-extras",
"walkdir",
"winapi 0.3.9",
]
[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
name = "num_enum"
-version = "0.5.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5adf0198d427ee515335639f275e806ca01acf9f07d7cf14bb36a10532a6169"
+checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
dependencies = [
"derivative",
"num_enum_derive",
@@ -1244,11 +1158,11 @@ dependencies = [
[[package]]
name = "num_enum_derive"
-version = "0.5.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1def5a3f69d4707d8a040b12785b98029a39e8c610ae685c7f6265669767482"
+checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
dependencies = [
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate",
"proc-macro2",
"quote",
"syn",
@@ -1365,16 +1279,6 @@ dependencies = [
]
[[package]]
-name = "proc-macro-crate"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92"
-dependencies = [
- "thiserror",
- "toml",
-]
-
-[[package]]
name = "proc-macro2"
version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1553,7 +1457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
dependencies = [
"libc",
- "mio 0.6.23",
+ "mio",
"signal-hook-registry",
]
@@ -1922,12 +1826,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "winit"
-version = "0.25.0"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8"
+checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597"
dependencies = [
"bitflags",
- "cocoa",
+ "cocoa 0.24.0",
"core-foundation 0.9.1",
"core-graphics 0.22.2",
"core-video-sys",
@@ -1936,8 +1840,8 @@ dependencies = [
"lazy_static",
"libc",
"log",
- "mio 0.7.13",
- "mio-misc",
+ "mio",
+ "mio-extras",
"ndk",
"ndk-glue",
"ndk-sys",
@@ -1945,7 +1849,6 @@ dependencies = [
"parking_lot",
"percent-encoding",
"raw-window-handle",
- "scopeguard",
"serde",
"smithay-client-toolkit 0.12.3",
"wayland-client",
diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml
index bb248f1b..ac0f951f 100644
--- a/alacritty/Cargo.toml
+++ b/alacritty/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "alacritty"
-version = "0.9.0-rc3"
+version = "0.9.0-rc4"
authors = ["Christian Duerr <contact@christianduerr.com>", "Joe Wilm <joe@jwilm.com>"]
license = "Apache-2.0"
description = "A fast, cross-platform, OpenGL terminal emulator"
@@ -10,7 +10,7 @@ edition = "2018"
[dependencies.alacritty_terminal]
path = "../alacritty_terminal"
-version = "0.15.0-rc3"
+version = "0.15.0-rc4"
default-features = false
[dependencies.alacritty_config_derive]
diff --git a/alacritty/windows/wix/alacritty.wxs b/alacritty/windows/wix/alacritty.wxs
index 70c21cff..acb75c80 100644
--- a/alacritty/windows/wix/alacritty.wxs
+++ b/alacritty/windows/wix/alacritty.wxs
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="windows-1252"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
- <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.9.0-rc3" Manufacturer="Alacritty">
+ <Product Name="Alacritty" Id="*" UpgradeCode="87c21c74-dbd5-4584-89d5-46d9cd0c40a7" Language="1033" Codepage="1252" Version="0.9.0-rc4" Manufacturer="Alacritty">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
<MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
<Icon Id="AlacrittyIco" SourceFile=".\extra\windows\alacritty.ico"/>
diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml
index 11b932d5..50015ef6 100644
--- a/alacritty_terminal/Cargo.toml
+++ b/alacritty_terminal/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "alacritty_terminal"
-version = "0.15.0-rc3"
+version = "0.15.0-rc4"
authors = ["Christian Duerr <contact@christianduerr.com>", "Joe Wilm <joe@jwilm.com>"]
license = "Apache-2.0"
description = "Library for writing terminal emulators"
diff --git a/extra/alacritty.man b/extra/alacritty.man
index 4b14dd87..159d0d17 100644
--- a/extra/alacritty.man
+++ b/extra/alacritty.man
@@ -1,4 +1,4 @@
-.TH ALACRITTY "1" "August 2018" "alacritty 0.9.0-rc3" "User Commands"
+.TH ALACRITTY "1" "August 2018" "alacritty 0.9.0-rc4" "User Commands"
.SH NAME
Alacritty \- A fast, cross-platform, OpenGL terminal emulator
.SH "SYNOPSIS"
diff --git a/extra/osx/Alacritty.app/Contents/Info.plist b/extra/osx/Alacritty.app/Contents/Info.plist
index 2f7517a1..612ef143 100644
--- a/extra/osx/Alacritty.app/Contents/Info.plist
+++ b/extra/osx/Alacritty.app/Contents/Info.plist
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.9.0-rc3</string>
+ <string>0.9.0-rc4</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>