[arch-commits] Commit in alacritty/trunk (PKGBUILD pr2367.patch)

[Jiachen Yang]

    Date: Tuesday, November 26, 2019 @ 06:29:36
  Author: farseerfc
Revision: 533384

upgpkg: alacritty 0.4.0-1

alacritty 0.4 release

Modified:
  alacritty/trunk/PKGBUILD
Deleted:
  alacritty/trunk/pr2367.patch

--------------+
 PKGBUILD     |   15 ++-------
 pr2367.patch |   89 ---------------------------------------------------------
 2 files changed, 4 insertions(+), 100 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-26 06:09:00 UTC (rev 533383)
+++ PKGBUILD	2019-11-26 06:29:36 UTC (rev 533384)
@@ -5,24 +5,17 @@
 pkgbase='alacritty'
 pkgname=('alacritty' 'alacritty-terminfo')
 pkgdesc="A cross-platform, GPU-accelerated terminal emulator"
-_pkgver=0.3.3
+_pkgver=0.4.0
 pkgver=$_pkgver
-pkgrel=3
+pkgrel=1
 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')
+source=("${pkgbase}-${_pkgver}.tar.gz::https://github.com/jwilm/${pkgbase}/archive/v${_pkgver}.tar.gz")
+sha256sums=('cbc0da74f313a806efed02fa863eece4b422c52e24832b553cd8592832c591e3')
 
-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

Deleted: pr2367.patch
===================================================================
--- pr2367.patch	2019-11-26 06:09:00 UTC (rev 533383)
+++ pr2367.patch	2019-11-26 06:29:36 UTC (rev 533384)
@@ -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;