[arch-commits] Commit in alacritty/repos/community-x86_64 (6 files)

Jiachen Yang farseerfc at archlinux.org
Fri Jul 26 05:43:12 UTC 2019


    Date: Friday, July 26, 2019 @ 05:43:12
  Author: farseerfc
Revision: 492815

archrelease: copy trunk to community-x86_64

Added:
  alacritty/repos/community-x86_64/PKGBUILD
    (from rev 492814, alacritty/trunk/PKGBUILD)
  alacritty/repos/community-x86_64/fix-transparency-0.3.3.patch
    (from rev 492814, alacritty/trunk/fix-transparency-0.3.3.patch)
  alacritty/repos/community-x86_64/pr2367.patch
    (from rev 492814, alacritty/trunk/pr2367.patch)
Deleted:
  alacritty/repos/community-x86_64/PKGBUILD
  alacritty/repos/community-x86_64/fix-transparency-0.3.3.patch
  alacritty/repos/community-x86_64/pr2367.patch

------------------------------+
 PKGBUILD                     |  122 +++----
 fix-transparency-0.3.3.patch |  656 ++++++++++++++++++++---------------------
 pr2367.patch                 |  178 +++++------
 3 files changed, 478 insertions(+), 478 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-26 05:42:25 UTC (rev 492814)
+++ PKGBUILD	2019-07-26 05:43:12 UTC (rev 492815)
@@ -1,61 +0,0 @@
-# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
-# Maintainer: Jiachen YANG <farseerfc at archlinux.org>
-# Contributor: kpcyrd <git at rxv.cc>
-# Contributor: quininer <quininer at live.com>
-pkgbase='alacritty'
-pkgname=('alacritty' 'alacritty-terminfo')
-pkgdesc="A cross-platform, GPU-accelerated terminal emulator"
-_pkgver=0.3.3
-pkgver=$_pkgver
-pkgrel=2
-arch=('x86_64')
-url="https://github.com/jwilm/alacritty"
-license=('Apache')
-makedepends=('rust' 'cargo' 'cmake' 'fontconfig' 'ncurses' 'desktop-file-utils' 'gdb' 'libxcb')
-checkdepends=('ttf-dejavu') # for monospace fontconfig test
-source=("${pkgbase}-${_pkgver}.tar.gz::https://github.com/jwilm/${pkgbase}/archive/v${_pkgver}.tar.gz"
-        "fix-transparency-${_pkgver}.patch")
-sha256sums=('f5af7e0d143bd2b89f029ad3e3d000d3ceb9922fbf189f7cfe3a59c9626d4519'
-            '8426e42c16d2ec8a6933bdfa1c94806118379da9e2006c468b099be2db2da569')
-
-prepare() {
-  cd $pkgbase-$_pkgver
-  # https://github.com/jwilm/alacritty/issues/2254
-  patch -Np1 -i ../fix-transparency-${_pkgver}.patch
-}
-build(){
-  cd $pkgbase-$_pkgver
-  env CARGO_INCREMENTAL=0 cargo build --release --locked
-}
-
-check(){
-  cd $pkgbase-$_pkgver
-  env CARGO_INCREMENTAL=0 cargo test --release
-}
-
-package_alacritty() {
-  depends=('freetype2' 'fontconfig' 'libxi' 'libxcursor')
-  optdepends=('alacritty-terminfo: terminfo for alacritty')
-  
-  cd $pkgbase-$_pkgver
-  desktop-file-install -m 644 --dir "$pkgdir/usr/share/applications/" "extra/linux/alacritty.desktop"
-  
-  install -D -m755 "target/release/alacritty" "$pkgdir/usr/bin/alacritty"
-  install -D -m644 "extra/alacritty.man" "$pkgdir/usr/share/man/man1/alacritty.1"
-  install -D -m644 "extra/linux/io.alacritty.Alacritty.appdata.xml" "$pkgdir/usr/share/appdata/io.alacritty.Alacritty.appdata.xml"
-  install -D -m644 "alacritty.yml" "$pkgdir/usr/share/doc/alacritty/example/alacritty.yml"
-  install -D -m644 "extra/completions/alacritty.bash" "$pkgdir/usr/share/bash-completion/completions/alacritty"
-  install -D -m644 "extra/completions/_alacritty" "$pkgdir/usr/share/zsh/site-functions/_alacritty"
-  install -D -m644 "extra/completions/alacritty.fish" "$pkgdir/usr/share/fish/completions/alacritty.fish"
-  install -D -m644 "extra/logo/alacritty-term.svg" "$pkgdir/usr/share/pixmaps/Alacritty.svg"
-}
-
-package_alacritty-terminfo() {
-  pkgdesc="Terminfo files for the alacritty terminal emulator"
-  depends=('ncurses')
-  
-  cd $pkgbase-$_pkgver
-  
-  install -dm 755 "$pkgdir/usr/share/terminfo/a/"
-  tic -o "$pkgdir/usr/share/terminfo" -xe alacritty,alacritty-direct extra/alacritty.info
-}

Copied: alacritty/repos/community-x86_64/PKGBUILD (from rev 492814, alacritty/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-07-26 05:43:12 UTC (rev 492815)
@@ -0,0 +1,61 @@
+# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
+# Maintainer: Jiachen YANG <farseerfc at archlinux.org>
+# Contributor: kpcyrd <git at rxv.cc>
+# Contributor: quininer <quininer at live.com>
+pkgbase='alacritty'
+pkgname=('alacritty' 'alacritty-terminfo')
+pkgdesc="A cross-platform, GPU-accelerated terminal emulator"
+_pkgver=0.3.3
+pkgver=$_pkgver
+pkgrel=3
+arch=('x86_64')
+url="https://github.com/jwilm/alacritty"
+license=('Apache')
+makedepends=('rust' 'cargo' 'cmake' 'fontconfig' 'ncurses' 'desktop-file-utils' 'gdb' 'libxcb')
+checkdepends=('ttf-dejavu') # for monospace fontconfig test
+source=("${pkgbase}-${_pkgver}.tar.gz::https://github.com/jwilm/${pkgbase}/archive/v${_pkgver}.tar.gz"
+        "fix-transparency-${_pkgver}.patch")
+sha256sums=('f5af7e0d143bd2b89f029ad3e3d000d3ceb9922fbf189f7cfe3a59c9626d4519'
+            '8426e42c16d2ec8a6933bdfa1c94806118379da9e2006c468b099be2db2da569')
+
+prepare() {
+  cd $pkgbase-$_pkgver
+  # https://github.com/jwilm/alacritty/issues/2254
+  patch -Np1 -i ../fix-transparency-${_pkgver}.patch
+}
+build(){
+  cd $pkgbase-$_pkgver
+  env CARGO_INCREMENTAL=0 cargo build --release --locked
+}
+
+check(){
+  cd $pkgbase-$_pkgver
+  env CARGO_INCREMENTAL=0 cargo test --release
+}
+
+package_alacritty() {
+  depends=('freetype2' 'fontconfig' 'libxi' 'libxcursor' 'libxrandr')
+  optdepends=('alacritty-terminfo: terminfo for alacritty')
+  
+  cd $pkgbase-$_pkgver
+  desktop-file-install -m 644 --dir "$pkgdir/usr/share/applications/" "extra/linux/alacritty.desktop"
+  
+  install -D -m755 "target/release/alacritty" "$pkgdir/usr/bin/alacritty"
+  install -D -m644 "extra/alacritty.man" "$pkgdir/usr/share/man/man1/alacritty.1"
+  install -D -m644 "extra/linux/io.alacritty.Alacritty.appdata.xml" "$pkgdir/usr/share/appdata/io.alacritty.Alacritty.appdata.xml"
+  install -D -m644 "alacritty.yml" "$pkgdir/usr/share/doc/alacritty/example/alacritty.yml"
+  install -D -m644 "extra/completions/alacritty.bash" "$pkgdir/usr/share/bash-completion/completions/alacritty"
+  install -D -m644 "extra/completions/_alacritty" "$pkgdir/usr/share/zsh/site-functions/_alacritty"
+  install -D -m644 "extra/completions/alacritty.fish" "$pkgdir/usr/share/fish/completions/alacritty.fish"
+  install -D -m644 "extra/logo/alacritty-term.svg" "$pkgdir/usr/share/pixmaps/Alacritty.svg"
+}
+
+package_alacritty-terminfo() {
+  pkgdesc="Terminfo files for the alacritty terminal emulator"
+  depends=('ncurses')
+  
+  cd $pkgbase-$_pkgver
+  
+  install -dm 755 "$pkgdir/usr/share/terminfo/a/"
+  tic -o "$pkgdir/usr/share/terminfo" -xe alacritty,alacritty-direct extra/alacritty.info
+}

Deleted: fix-transparency-0.3.3.patch
===================================================================
--- fix-transparency-0.3.3.patch	2019-07-26 05:42:25 UTC (rev 492814)
+++ fix-transparency-0.3.3.patch	2019-07-26 05:43:12 UTC (rev 492815)
@@ -1,328 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 7bdd574..2ae63b0 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -51,7 +51,7 @@ dependencies = [
-  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "font 0.1.0",
-  "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "glutin 0.20.0 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
-  "image 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -450,22 +450,21 @@ dependencies = [
- ]
- 
- [[package]]
--name = "deflate"
--version = "0.7.19"
-+name = "debug_stub_derive"
-+version = "0.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
--name = "derivative"
--version = "1.0.2"
-+name = "deflate"
-+version = "0.7.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
-- "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -757,6 +756,16 @@ dependencies = [
-  "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-+[[package]]
-+name = "gl_generator"
-+version = "0.10.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
- [[package]]
- name = "gl_generator"
- version = "0.11.0"
-@@ -782,68 +791,69 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
- name = "glutin"
--version = "0.21.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
-+version = "0.20.0"
-+source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
- dependencies = [
-  "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cocoa 0.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "glutin_egl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "glutin_emscripten_sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "glutin_gles2_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "glutin_glx_sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-- "glutin_wgl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "debug_stub_derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "glutin_egl_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
-+ "glutin_emscripten_sys 0.1.0 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
-+ "glutin_gles2_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
-+ "glutin_glx_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
-+ "glutin_wgl_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
-  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "takeable-option 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-- "winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winit 0.19.0 (git+https://github.com/chrisduerr/winit?branch=bsd-build-fix)",
- ]
- 
- [[package]]
- name = "glutin_egl_sys"
--version = "0.1.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
-+version = "0.1.2"
-+source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
- dependencies = [
-- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
- name = "glutin_emscripten_sys"
- version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
-+source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
- 
- [[package]]
- name = "glutin_gles2_sys"
--version = "0.1.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
-+version = "0.1.2"
-+source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
- dependencies = [
-- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
- name = "glutin_glx_sys"
--version = "0.1.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
-+version = "0.1.2"
-+source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
- dependencies = [
-- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
- name = "glutin_wgl_sys"
--version = "0.1.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
-+version = "0.1.2"
-+source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
- dependencies = [
-- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -1969,6 +1979,16 @@ name = "strsim"
- version = "0.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
-+[[package]]
-+name = "syn"
-+version = "0.11.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
- [[package]]
- name = "syn"
- version = "0.15.36"
-@@ -1979,6 +1999,14 @@ dependencies = [
-  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-+[[package]]
-+name = "synom"
-+version = "0.11.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
- [[package]]
- name = "synstructure"
- version = "0.10.2"
-@@ -1990,6 +2018,11 @@ dependencies = [
-  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-+[[package]]
-+name = "takeable-option"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
- [[package]]
- name = "tempfile"
- version = "3.0.8"
-@@ -2104,6 +2137,11 @@ name = "unicode-width"
- version = "0.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
-+[[package]]
-+name = "unicode-xid"
-+version = "0.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
- [[package]]
- name = "unicode-xid"
- version = "0.1.0"
-@@ -2353,8 +2391,8 @@ dependencies = [
- 
- [[package]]
- name = "winit"
--version = "0.19.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
-+version = "0.19.0"
-+source = "git+https://github.com/chrisduerr/winit?branch=bsd-build-fix#57680d2d17e797ebaa36191a1ef1c0ebdf44de34"
- dependencies = [
-  "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2518,8 +2556,8 @@ dependencies = [
- "checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
- "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
- "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
-+"checksum debug_stub_derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "496b7f8a2f853313c3ca370641d7ff3e42c32974fdccda8f0684599ed0a3ff6b"
- "checksum deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "8a6abb26e16e8d419b5c78662aa9f82857c2386a073da266840e474d5055ec86"
--"checksum derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6073e9676dbebdddeabaeb63e3b7cefd23c86f5c41d381ee1237cc77b1079898"
- "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
- "checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
- "checksum downcast-rs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b92dfd5c2f75260cbf750572f95d387e7ca0ba5e3fbe9e1a33f23025be020f"
-@@ -2553,15 +2591,16 @@ dependencies = [
- "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
- "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
- "checksum gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568"
-+"checksum gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604"
- "checksum gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd"
- "checksum gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7f46fd8874e043ffac0d638ed1567a2584f7814f6d72b4db37ab1689004a26c4"
- "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
--"checksum glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb26027a84c3b9e1949ef0df0b6a3db8d0c124243a5c161ea25c7def90cb1474"
--"checksum glutin_egl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "23f48987ab6cb2b61ad903b59e54a2fd0c380a7baff68cffd6826b69a73dd326"
--"checksum glutin_emscripten_sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "245b3fdb08df6ffed7585365851f8404af9c7e2dd4b59f15262e968b6a95a0c7"
--"checksum glutin_gles2_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "89996c30857ae1b4de4b5189abf1ea822a20a9fe9e1c93e5e7b862ff0bdd5cdf"
--"checksum glutin_glx_sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1290a5ca5e46fcfa7f66f949cc9d9194b2cb6f2ed61892c8c2b82343631dba57"
--"checksum glutin_wgl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f801bbc91efc22dd1c4818a47814fc72bf74d024510451b119381579bfa39021"
-+"checksum glutin 0.20.0 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
-+"checksum glutin_egl_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
-+"checksum glutin_emscripten_sys 0.1.0 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
-+"checksum glutin_gles2_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
-+"checksum glutin_glx_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
-+"checksum glutin_wgl_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
- "checksum http_req 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06dc3c469026e12585cb2b783bbfdd853386907558a5e1b86c4c127d50167806"
- "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
- "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-@@ -2692,8 +2731,11 @@ dependencies = [
- "checksum static_assertions 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4f8de36da215253eb5f24020bfaa0646613b48bf7ebe36cdfa37c3b3b33b241"
- "checksum stb_truetype 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "69b7df505db8e81d54ff8be4693421e5b543e08214bd8d99eb761fcb4d5668ba"
- "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
- "checksum syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)" = "8b4f551a91e2e3848aeef8751d0d4eec9489b6474c720fd4c55958d8d31a430c"
-+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
- "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
-+"checksum takeable-option 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d77adff586b9bd922afef7791341ed94b09845e11225929217efe949e6366d43"
- "checksum tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef"
- "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
- "checksum terminfo 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8e51065bafd2abe106b6036483b69d1741f4a1ec56ce8a2378de341637de689e"
-@@ -2707,6 +2749,7 @@ dependencies = [
- "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
- "checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
- "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
-+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
- "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
- "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
- "checksum utf8-ranges 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9d50aa7650df78abf942826607c62468ce18d9019673d4a2ebe1865dbb96ffde"
-@@ -2738,7 +2781,7 @@ dependencies = [
- "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
- "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
- "checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
--"checksum winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d233301129ddd33260b47f76900b50e154b7254546e2edba0e5468a1a5fe4de3"
-+"checksum winit 0.19.0 (git+https://github.com/chrisduerr/winit?branch=bsd-build-fix)" = "<none>"
- "checksum winpty-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dade7ecea144b3578a02925f93900f32370abfb8768630883971f4ef716b568"
- "checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
- "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml
-index 39228ee..1c0f292 100644
---- a/alacritty_terminal/Cargo.toml
-+++ b/alacritty_terminal/Cargo.toml
-@@ -26,7 +26,7 @@ mio-extras = "2"
- log = "0.4"
- fnv = "1"
- unicode-width = "0.1"
--glutin = { version = "0.21.0", features = ["icon_loading"] }
-+glutin = { git = "https://github.com/chrisduerr/glutin", branch = "bsd-build-fix", features = ["icon_loading"] }
- base64 = "0.10.0"
- static_assertions = "0.3.0"
- terminfo = "0.6.1"
-diff --git a/alacritty_terminal/src/window.rs b/alacritty_terminal/src/window.rs
-index 97f29c5..9ae9967 100644
---- a/alacritty_terminal/src/window.rs
-+++ b/alacritty_terminal/src/window.rs
-@@ -25,8 +25,8 @@ use glutin::os::unix::{EventsLoopExt, WindowExt};
- #[cfg(not(target_os = "macos"))]
- use glutin::Icon;
- use glutin::{
--    self, ContextBuilder, ControlFlow, Event, EventsLoop, MouseCursor, PossiblyCurrent,
--    WindowBuilder,
-+    self, ContextBuilder, ControlFlow, Event, EventsLoop, MouseCursor, PossiblyCurrentContext,
-+    WindowBuilder, ContextTrait, PossiblyCurrentContextTrait
- };
- #[cfg(not(target_os = "macos"))]
- use image::ImageFormat;
-@@ -58,7 +58,7 @@ type Result<T> = ::std::result::Result<T, Error>;
- /// Wraps the underlying windowing library to provide a stable API in Alacritty
- pub struct Window {
-     event_loop: EventsLoop,
--    windowed_context: glutin::WindowedContext<PossiblyCurrent>,
-+    windowed_context: glutin::WindowedContext<PossiblyCurrentContext>,
-     mouse_visible: bool,
- 
-     /// Whether or not the window is the focused window.
-@@ -124,7 +124,7 @@ fn create_gl_window(
-     event_loop: &EventsLoop,
-     srgb: bool,
-     dimensions: Option<LogicalSize>,
--) -> Result<glutin::WindowedContext<PossiblyCurrent>> {
-+) -> Result<glutin::WindowedContext<PossiblyCurrentContext>> {
-     if let Some(dimensions) = dimensions {
-         window = window.with_dimensions(dimensions);
-     }

Copied: alacritty/repos/community-x86_64/fix-transparency-0.3.3.patch (from rev 492814, alacritty/trunk/fix-transparency-0.3.3.patch)
===================================================================
--- fix-transparency-0.3.3.patch	                        (rev 0)
+++ fix-transparency-0.3.3.patch	2019-07-26 05:43:12 UTC (rev 492815)
@@ -0,0 +1,328 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 7bdd574..2ae63b0 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -51,7 +51,7 @@ dependencies = [
+  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "font 0.1.0",
+  "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glutin 0.20.0 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
+  "image 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -450,22 +450,21 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "deflate"
+-version = "0.7.19"
++name = "debug_stub_derive"
++version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+- "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+-name = "derivative"
+-version = "1.0.2"
++name = "deflate"
++version = "0.7.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)",
++ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -757,6 +756,16 @@ dependencies = [
+  "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
++[[package]]
++name = "gl_generator"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
+ [[package]]
+ name = "gl_generator"
+ version = "0.11.0"
+@@ -782,68 +791,69 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "glutin"
+-version = "0.21.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
++version = "0.20.0"
++source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
+ dependencies = [
+  "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cocoa 0.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "glutin_egl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "glutin_emscripten_sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "glutin_gles2_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "glutin_glx_sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+- "glutin_wgl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "debug_stub_derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glutin_egl_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
++ "glutin_emscripten_sys 0.1.0 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
++ "glutin_gles2_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
++ "glutin_glx_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
++ "glutin_wgl_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)",
+  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "takeable-option 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winit 0.19.0 (git+https://github.com/chrisduerr/winit?branch=bsd-build-fix)",
+ ]
+ 
+ [[package]]
+ name = "glutin_egl_sys"
+-version = "0.1.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
++version = "0.1.2"
++source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
+ dependencies = [
+- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+ name = "glutin_emscripten_sys"
+ version = "0.1.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
++source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
+ 
+ [[package]]
+ name = "glutin_gles2_sys"
+-version = "0.1.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
++version = "0.1.2"
++source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
+ dependencies = [
+- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+ name = "glutin_glx_sys"
+-version = "0.1.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
++version = "0.1.2"
++source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
+ dependencies = [
+- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+ name = "glutin_wgl_sys"
+-version = "0.1.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
++version = "0.1.2"
++source = "git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix#ea545cb4a353b7335d4a6efc34ae4fb3caddfe33"
+ dependencies = [
+- "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -1969,6 +1979,16 @@ name = "strsim"
+ version = "0.8.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
++[[package]]
++name = "syn"
++version = "0.11.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
+ [[package]]
+ name = "syn"
+ version = "0.15.36"
+@@ -1979,6 +1999,14 @@ dependencies = [
+  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
++[[package]]
++name = "synom"
++version = "0.11.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
+ [[package]]
+ name = "synstructure"
+ version = "0.10.2"
+@@ -1990,6 +2018,11 @@ dependencies = [
+  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
++[[package]]
++name = "takeable-option"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
+ [[package]]
+ name = "tempfile"
+ version = "3.0.8"
+@@ -2104,6 +2137,11 @@ name = "unicode-width"
+ version = "0.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
++[[package]]
++name = "unicode-xid"
++version = "0.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
+ [[package]]
+ name = "unicode-xid"
+ version = "0.1.0"
+@@ -2353,8 +2391,8 @@ dependencies = [
+ 
+ [[package]]
+ name = "winit"
+-version = "0.19.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
++version = "0.19.0"
++source = "git+https://github.com/chrisduerr/winit?branch=bsd-build-fix#57680d2d17e797ebaa36191a1ef1c0ebdf44de34"
+ dependencies = [
+  "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -2518,8 +2556,8 @@ dependencies = [
+ "checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
+ "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
+ "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
++"checksum debug_stub_derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "496b7f8a2f853313c3ca370641d7ff3e42c32974fdccda8f0684599ed0a3ff6b"
+ "checksum deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "8a6abb26e16e8d419b5c78662aa9f82857c2386a073da266840e474d5055ec86"
+-"checksum derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6073e9676dbebdddeabaeb63e3b7cefd23c86f5c41d381ee1237cc77b1079898"
+ "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
+ "checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
+ "checksum downcast-rs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b92dfd5c2f75260cbf750572f95d387e7ca0ba5e3fbe9e1a33f23025be020f"
+@@ -2553,15 +2591,16 @@ dependencies = [
+ "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+ "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
+ "checksum gif 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86c2f2b597d6e05c86ee5947b2223bda468fe8dad3e88e2a6520869322aaf568"
++"checksum gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604"
+ "checksum gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd"
+ "checksum gleam 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7f46fd8874e043ffac0d638ed1567a2584f7814f6d72b4db37ab1689004a26c4"
+ "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
+-"checksum glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb26027a84c3b9e1949ef0df0b6a3db8d0c124243a5c161ea25c7def90cb1474"
+-"checksum glutin_egl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "23f48987ab6cb2b61ad903b59e54a2fd0c380a7baff68cffd6826b69a73dd326"
+-"checksum glutin_emscripten_sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "245b3fdb08df6ffed7585365851f8404af9c7e2dd4b59f15262e968b6a95a0c7"
+-"checksum glutin_gles2_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "89996c30857ae1b4de4b5189abf1ea822a20a9fe9e1c93e5e7b862ff0bdd5cdf"
+-"checksum glutin_glx_sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1290a5ca5e46fcfa7f66f949cc9d9194b2cb6f2ed61892c8c2b82343631dba57"
+-"checksum glutin_wgl_sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f801bbc91efc22dd1c4818a47814fc72bf74d024510451b119381579bfa39021"
++"checksum glutin 0.20.0 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
++"checksum glutin_egl_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
++"checksum glutin_emscripten_sys 0.1.0 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
++"checksum glutin_gles2_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
++"checksum glutin_glx_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
++"checksum glutin_wgl_sys 0.1.2 (git+https://github.com/chrisduerr/glutin?branch=bsd-build-fix)" = "<none>"
+ "checksum http_req 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06dc3c469026e12585cb2b783bbfdd853386907558a5e1b86c4c127d50167806"
+ "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
+ "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+@@ -2692,8 +2731,11 @@ dependencies = [
+ "checksum static_assertions 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4f8de36da215253eb5f24020bfaa0646613b48bf7ebe36cdfa37c3b3b33b241"
+ "checksum stb_truetype 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "69b7df505db8e81d54ff8be4693421e5b543e08214bd8d99eb761fcb4d5668ba"
+ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
+ "checksum syn 0.15.36 (registry+https://github.com/rust-lang/crates.io-index)" = "8b4f551a91e2e3848aeef8751d0d4eec9489b6474c720fd4c55958d8d31a430c"
++"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
+ "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
++"checksum takeable-option 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d77adff586b9bd922afef7791341ed94b09845e11225929217efe949e6366d43"
+ "checksum tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef"
+ "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
+ "checksum terminfo 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8e51065bafd2abe106b6036483b69d1741f4a1ec56ce8a2378de341637de689e"
+@@ -2707,6 +2749,7 @@ dependencies = [
+ "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+ "checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
+ "checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
++"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
+ "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+ "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+ "checksum utf8-ranges 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9d50aa7650df78abf942826607c62468ce18d9019673d4a2ebe1865dbb96ffde"
+@@ -2738,7 +2781,7 @@ dependencies = [
+ "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
+ "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+ "checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
+-"checksum winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d233301129ddd33260b47f76900b50e154b7254546e2edba0e5468a1a5fe4de3"
++"checksum winit 0.19.0 (git+https://github.com/chrisduerr/winit?branch=bsd-build-fix)" = "<none>"
+ "checksum winpty-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dade7ecea144b3578a02925f93900f32370abfb8768630883971f4ef716b568"
+ "checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
+ "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
+diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml
+index 39228ee..1c0f292 100644
+--- a/alacritty_terminal/Cargo.toml
++++ b/alacritty_terminal/Cargo.toml
+@@ -26,7 +26,7 @@ mio-extras = "2"
+ log = "0.4"
+ fnv = "1"
+ unicode-width = "0.1"
+-glutin = { version = "0.21.0", features = ["icon_loading"] }
++glutin = { git = "https://github.com/chrisduerr/glutin", branch = "bsd-build-fix", features = ["icon_loading"] }
+ base64 = "0.10.0"
+ static_assertions = "0.3.0"
+ terminfo = "0.6.1"
+diff --git a/alacritty_terminal/src/window.rs b/alacritty_terminal/src/window.rs
+index 97f29c5..9ae9967 100644
+--- a/alacritty_terminal/src/window.rs
++++ b/alacritty_terminal/src/window.rs
+@@ -25,8 +25,8 @@ use glutin::os::unix::{EventsLoopExt, WindowExt};
+ #[cfg(not(target_os = "macos"))]
+ use glutin::Icon;
+ use glutin::{
+-    self, ContextBuilder, ControlFlow, Event, EventsLoop, MouseCursor, PossiblyCurrent,
+-    WindowBuilder,
++    self, ContextBuilder, ControlFlow, Event, EventsLoop, MouseCursor, PossiblyCurrentContext,
++    WindowBuilder, ContextTrait, PossiblyCurrentContextTrait
+ };
+ #[cfg(not(target_os = "macos"))]
+ use image::ImageFormat;
+@@ -58,7 +58,7 @@ type Result<T> = ::std::result::Result<T, Error>;
+ /// Wraps the underlying windowing library to provide a stable API in Alacritty
+ pub struct Window {
+     event_loop: EventsLoop,
+-    windowed_context: glutin::WindowedContext<PossiblyCurrent>,
++    windowed_context: glutin::WindowedContext<PossiblyCurrentContext>,
+     mouse_visible: bool,
+ 
+     /// Whether or not the window is the focused window.
+@@ -124,7 +124,7 @@ fn create_gl_window(
+     event_loop: &EventsLoop,
+     srgb: bool,
+     dimensions: Option<LogicalSize>,
+-) -> Result<glutin::WindowedContext<PossiblyCurrent>> {
++) -> Result<glutin::WindowedContext<PossiblyCurrentContext>> {
+     if let Some(dimensions) = dimensions {
+         window = window.with_dimensions(dimensions);
+     }

Deleted: pr2367.patch
===================================================================
--- pr2367.patch	2019-07-26 05:42:25 UTC (rev 492814)
+++ pr2367.patch	2019-07-26 05:43:12 UTC (rev 492815)
@@ -1,89 +0,0 @@
-diff --git a/src/ansi.rs b/src/ansi.rs
-index 4e76c05b4..c0ebb79c8 100644
---- a/src/ansi.rs
-+++ b/src/ansi.rs
-@@ -343,7 +343,7 @@ pub trait Handler {
- }
- 
- /// Describes shape of cursor
--#[derive(Debug, Eq, PartialEq, Copy, Clone, Deserialize)]
-+#[derive(Debug, Eq, PartialEq, Copy, Clone, Hash, Deserialize)]
- pub enum CursorStyle {
-     /// Cursor is a block like `▒`
-     Block,
-diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
-index fd10c8612..c0e3081d6 100644
---- a/src/renderer/mod.rs
-+++ b/src/renderer/mod.rs
-@@ -26,6 +26,7 @@ use font::{self, FontDesc, FontKey, GlyphKey, Rasterize, RasterizedGlyph, Raster
- use glutin::dpi::PhysicalSize;
- use notify::{watcher, DebouncedEvent, RecursiveMode, Watcher};
- 
-+use crate::ansi::CursorStyle;
- use crate::config::{self, Config, Delta};
- use crate::gl;
- use crate::gl::types::*;
-@@ -154,6 +155,9 @@ pub struct GlyphCache {
-     /// Cache of buffered glyphs
-     cache: HashMap<GlyphKey, Glyph, BuildHasherDefault<FnvHasher>>,
- 
-+    /// Cache of buffered cursor glyphs
-+    cursor_cache: HashMap<CursorStyle, Glyph, BuildHasherDefault<FnvHasher>>,
-+
-     /// Rasterizer for loading new glyphs
-     rasterizer: Rasterizer,
- 
-@@ -195,6 +199,7 @@ impl GlyphCache {
- 
-         let mut cache = GlyphCache {
-             cache: HashMap::default(),
-+            cursor_cache: HashMap::default(),
-             rasterizer,
-             font_size: font.size(),
-             font_key: regular,
-@@ -302,6 +307,7 @@ impl GlyphCache {
-         // Clear currently cached data in both GL and the registry
-         loader.clear();
-         self.cache = HashMap::default();
-+        self.cursor_cache = HashMap::default();
- 
-         // Update dpi scaling
-         self.rasterizer.update_dpr(dpr as f32);
-@@ -984,9 +990,12 @@ impl<'a> RenderApi<'a> {
- 
-     pub fn render_cell(&mut self, cell: RenderableCell, glyph_cache: &mut GlyphCache) {
-         let chars = match cell.inner {
--            RenderableCellContent::Raw(ref raw) => {
-+            RenderableCellContent::Cursor((cursor_style, ref raw)) => {
-                 // Raw cell pixel buffers like cursors don't need to go through font lookup
--                let glyph = self.load_glyph(raw);
-+                let glyph = glyph_cache
-+                    .cursor_cache
-+                    .entry(cursor_style)
-+                    .or_insert_with(|| self.load_glyph(raw));
-                 self.add_render_item(&cell, &glyph);
-                 return;
-             },
-diff --git a/src/term/mod.rs b/src/term/mod.rs
-index 0e95423d9..07b643fae 100644
---- a/src/term/mod.rs
-+++ b/src/term/mod.rs
-@@ -259,7 +259,7 @@ impl<'a> RenderableCellsIter<'a> {
- #[derive(Clone, Debug)]
- pub enum RenderableCellContent {
-     Chars([char; cell::MAX_ZEROWIDTH_CHARS + 1]),
--    Raw(RasterizedGlyph),
-+    Cursor((CursorStyle, RasterizedGlyph)),
- }
- 
- #[derive(Clone, Debug)]
-@@ -385,7 +385,8 @@ impl<'a> Iterator for RenderableCellsIter<'a> {
-                     let mut renderable_cell =
-                         RenderableCell::new(self.config, self.colors, cell, false);
- 
--                    renderable_cell.inner = RenderableCellContent::Raw(cursor_cell);
-+                    renderable_cell.inner =
-+                        RenderableCellContent::Cursor((self.cursor_style, cursor_cell));
- 
-                     if let Some(color) = self.config.cursor_cursor_color() {
-                         renderable_cell.fg = color;

Copied: alacritty/repos/community-x86_64/pr2367.patch (from rev 492814, alacritty/trunk/pr2367.patch)
===================================================================
--- pr2367.patch	                        (rev 0)
+++ pr2367.patch	2019-07-26 05:43:12 UTC (rev 492815)
@@ -0,0 +1,89 @@
+diff --git a/src/ansi.rs b/src/ansi.rs
+index 4e76c05b4..c0ebb79c8 100644
+--- a/src/ansi.rs
++++ b/src/ansi.rs
+@@ -343,7 +343,7 @@ pub trait Handler {
+ }
+ 
+ /// Describes shape of cursor
+-#[derive(Debug, Eq, PartialEq, Copy, Clone, Deserialize)]
++#[derive(Debug, Eq, PartialEq, Copy, Clone, Hash, Deserialize)]
+ pub enum CursorStyle {
+     /// Cursor is a block like `▒`
+     Block,
+diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
+index fd10c8612..c0e3081d6 100644
+--- a/src/renderer/mod.rs
++++ b/src/renderer/mod.rs
+@@ -26,6 +26,7 @@ use font::{self, FontDesc, FontKey, GlyphKey, Rasterize, RasterizedGlyph, Raster
+ use glutin::dpi::PhysicalSize;
+ use notify::{watcher, DebouncedEvent, RecursiveMode, Watcher};
+ 
++use crate::ansi::CursorStyle;
+ use crate::config::{self, Config, Delta};
+ use crate::gl;
+ use crate::gl::types::*;
+@@ -154,6 +155,9 @@ pub struct GlyphCache {
+     /// Cache of buffered glyphs
+     cache: HashMap<GlyphKey, Glyph, BuildHasherDefault<FnvHasher>>,
+ 
++    /// Cache of buffered cursor glyphs
++    cursor_cache: HashMap<CursorStyle, Glyph, BuildHasherDefault<FnvHasher>>,
++
+     /// Rasterizer for loading new glyphs
+     rasterizer: Rasterizer,
+ 
+@@ -195,6 +199,7 @@ impl GlyphCache {
+ 
+         let mut cache = GlyphCache {
+             cache: HashMap::default(),
++            cursor_cache: HashMap::default(),
+             rasterizer,
+             font_size: font.size(),
+             font_key: regular,
+@@ -302,6 +307,7 @@ impl GlyphCache {
+         // Clear currently cached data in both GL and the registry
+         loader.clear();
+         self.cache = HashMap::default();
++        self.cursor_cache = HashMap::default();
+ 
+         // Update dpi scaling
+         self.rasterizer.update_dpr(dpr as f32);
+@@ -984,9 +990,12 @@ impl<'a> RenderApi<'a> {
+ 
+     pub fn render_cell(&mut self, cell: RenderableCell, glyph_cache: &mut GlyphCache) {
+         let chars = match cell.inner {
+-            RenderableCellContent::Raw(ref raw) => {
++            RenderableCellContent::Cursor((cursor_style, ref raw)) => {
+                 // Raw cell pixel buffers like cursors don't need to go through font lookup
+-                let glyph = self.load_glyph(raw);
++                let glyph = glyph_cache
++                    .cursor_cache
++                    .entry(cursor_style)
++                    .or_insert_with(|| self.load_glyph(raw));
+                 self.add_render_item(&cell, &glyph);
+                 return;
+             },
+diff --git a/src/term/mod.rs b/src/term/mod.rs
+index 0e95423d9..07b643fae 100644
+--- a/src/term/mod.rs
++++ b/src/term/mod.rs
+@@ -259,7 +259,7 @@ impl<'a> RenderableCellsIter<'a> {
+ #[derive(Clone, Debug)]
+ pub enum RenderableCellContent {
+     Chars([char; cell::MAX_ZEROWIDTH_CHARS + 1]),
+-    Raw(RasterizedGlyph),
++    Cursor((CursorStyle, RasterizedGlyph)),
+ }
+ 
+ #[derive(Clone, Debug)]
+@@ -385,7 +385,8 @@ impl<'a> Iterator for RenderableCellsIter<'a> {
+                     let mut renderable_cell =
+                         RenderableCell::new(self.config, self.colors, cell, false);
+ 
+-                    renderable_cell.inner = RenderableCellContent::Raw(cursor_cell);
++                    renderable_cell.inner =
++                        RenderableCellContent::Cursor((self.cursor_style, cursor_cell));
+ 
+                     if let Some(color) = self.config.cursor_cursor_color() {
+                         renderable_cell.fg = color;


More information about the arch-commits mailing list