Attachment #253280 for bug #281212

View | Details | Raw Unified | Return to bug 281212
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/x11/wezterm/Makefile (-2 / +2 lines)
1	PORTNAME= wezterm	1	PORTNAME= wezterm
2	DISTVERSION= 20240203-110809-5046fc22	2	DISTVERSION= 20240203-110809-5046fc22
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= x11 wayland	4	CATEGORIES= x11 wayland
5		5
6	MAINTAINER= vladislav.movchan@gmail.com	6	MAINTAINER= vladislav.movchan@gmail.com
Lines 18-24 LIB_DEPENDS= libzstd.so:archivers/zstd \ Link Here
18	libxcb-util.so:x11/xcb-util \	18	libxcb-util.so:x11/xcb-util \
19	libxcb-image.so:x11/xcb-util-image	19	libxcb-image.so:x11/xcb-util-image
20		20
21	USES= cargo ssl xorg	21	USES= cargo desktop-file-utils ssl xorg
22	USE_GITHUB= yes	22	USE_GITHUB= yes
23	USE_GITLAB= nodefault	23	USE_GITLAB= nodefault
24	USE_XORG= x11 xcb	24	USE_XORG= x11 xcb

Lines 199-205 CARGO_CRATES= addr2line-0.21.0 \ Link Here

(-)b/x11/wezterm/Makefile.crates (-1 / +1 lines)
199	gimli-0.28.1 \	199	gimli-0.28.1 \
200	git2-0.16.1 \	200	git2-0.16.1 \
201	gl_generator-0.14.0 \	201	gl_generator-0.14.0 \
202	glium-0.31.0 \	202	glium-0.32.1 \
203	glob-0.3.1 \	203	glob-0.3.1 \
204	globset-0.4.14 \	204	globset-0.4.14 \
205	globwalk-0.9.1 \	205	globwalk-0.9.1 \

Lines 1-4 Link Here

(-)b/x11/wezterm/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1715853494	1	TIMESTAMP = 1725297326
2	SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb	2	SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
3	SIZE (rust/crates/addr2line-0.21.0.crate) = 40807	3	SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
4	SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe	4	SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
Lines 401-408 SHA256 (rust/crates/git2-0.16.1.crate) = ccf7f68c2995f392c49fffb4f95ae2c87329783 Link Here
401	SIZE (rust/crates/git2-0.16.1.crate) = 199956	401	SIZE (rust/crates/git2-0.16.1.crate) = 199956
402	SHA256 (rust/crates/gl_generator-0.14.0.crate) = 1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d	402	SHA256 (rust/crates/gl_generator-0.14.0.crate) = 1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d
403	SIZE (rust/crates/gl_generator-0.14.0.crate) = 22330	403	SIZE (rust/crates/gl_generator-0.14.0.crate) = 22330
404	SHA256 (rust/crates/glium-0.31.0.crate) = 0ab4f09b43d8ee427a700cb9ed3b20e0e858d62a509edded1a98ca5707d68e19	404	SHA256 (rust/crates/glium-0.32.1.crate) = d2766728ecb86014b91d3d687614b32d65aacbbdc887f424a7b03cba3ab593bf
405	SIZE (rust/crates/glium-0.31.0.crate) = 915561	405	SIZE (rust/crates/glium-0.32.1.crate) = 925217
406	SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b	406	SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
407	SIZE (rust/crates/glob-0.3.1.crate) = 18880	407	SIZE (rust/crates/glob-0.3.1.crate) = 18880
408	SHA256 (rust/crates/globset-0.4.14.crate) = 57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1	408	SHA256 (rust/crates/globset-0.4.14.crate) = 57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1




--- Cargo.lock.orig	2024-02-03 18:08:09 UTC
+++ Cargo.lock
@@ -2165,9 +2165,9 @@ name = "glium"
 
 [[package]]
 name = "glium"
-version = "0.31.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab4f09b43d8ee427a700cb9ed3b20e0e858d62a509edded1a98ca5707d68e19"
+checksum = "d2766728ecb86014b91d3d687614b32d65aacbbdc887f424a7b03cba3ab593bf"
 dependencies = [
  "backtrace",
  "fnv",




From 5b0c627366babea1636b35db641c0fec964ddbd1 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 15 Mar 2024 20:47:22 -0700
Subject: [PATCH] Delete identity conversion in format_description::parse_owned
 (#671)

--- cargo-crates/time-0.3.31/src/format_description/parse/mod.rs.orig	2006-07-24 01:21:28 UTC
+++ cargo-crates/time-0.3.31/src/format_description/parse/mod.rs
@@ -80,9 +80,7 @@ pub fn parse_owned<const VERSION: usize>(
     let mut lexed = lexer::lex::<VERSION>(s.as_bytes());
     let ast = ast::parse::<_, VERSION>(&mut lexed);
     let format_items = format_item::parse(ast);
-    let items = format_items
-        .map(|res| res.map(Into::into))
-        .collect::<Result<Box<_>, _>>()?;
+    let items = format_items.collect::<Result<Box<_>, _>>()?;
     Ok(items.into())
 }
 

Added Link Here

(-)b/x11/wezterm/files/patch-window_Cargo.toml (+11 lines)
1	--- window/Cargo.toml.orig 2024-02-03 18:08:09 UTC
2	+++ window/Cargo.toml
3	@@ -40,7 +40,7 @@ tiny-skia = "0.11"
4	resize = "0.5"
5	serde = {version="1.0", features = ["rc", "derive"]}
6	tiny-skia = "0.11"
7	-glium = { version = "0.31", default-features = false }
8	+glium = { version = "0.32", default-features = false }
9	url = "2"
10	wezterm-bidi = { path = "../bidi" }
11	wezterm-color-types = { path = "../color-types" }




  Shift-Insert (bracketed paste is supported!)
- SGR style mouse reporting (works in vim and tmux)
- Render underline, double-underline, italic, bold, strikethrough
  (most other terminal emulators do not support as many render
  attributes)
- Configuration via a file with hot reloading
- Multiple Windows (Hotkey: Super-N)
- Splits/Panes and Tabs
- Tabs (Hotkey: Super-T, next/prev: Super-Shift-[ and Super-Shift-], go-to: Super-[1-9])
- SSH client with native tabs
- Connect to serial ports for embedded/Arduino work
- Connect to a local multiplexer server over unix domain sockets

Return to bug 281212

Added Link Here

(-)b/x11/wezterm/files/patch-Cargo.lock (+14 lines)
1	--- Cargo.lock.orig 2024-02-03 18:08:09 UTC
2	+++ Cargo.lock
3	@@ -2165,9 +2165,9 @@ name = "glium"
4
5	[[package]]
6	name = "glium"
7	-version = "0.31.0"
8	+version = "0.32.1"
9	source = "registry+https://github.com/rust-lang/crates.io-index"
10	-checksum = "0ab4f09b43d8ee427a700cb9ed3b20e0e858d62a509edded1a98ca5707d68e19"
11	+checksum = "d2766728ecb86014b91d3d687614b32d65aacbbdc887f424a7b03cba3ab593bf"
12	dependencies = [
13	"backtrace",
14	"fnv",

Added Link Here

(-)b/x11/wezterm/files/patch-cargo-crates_time-0.3.31_src_format__description_parse_mod.rs (+19 lines)
1	From 5b0c627366babea1636b35db641c0fec964ddbd1 Mon Sep 17 00:00:00 2001
2	From: David Tolnay <dtolnay@gmail.com>
3	Date: Fri, 15 Mar 2024 20:47:22 -0700
4	Subject: [PATCH] Delete identity conversion in format_description::parse_owned
5	(#671)
6
7	--- cargo-crates/time-0.3.31/src/format_description/parse/mod.rs.orig 2006-07-24 01:21:28 UTC
8	+++ cargo-crates/time-0.3.31/src/format_description/parse/mod.rs
9	@@ -80,9 +80,7 @@ pub fn parse_owned<const VERSION: usize>(
10	let mut lexed = lexer::lex::<VERSION>(s.as_bytes());
11	let ast = ast::parse::<_, VERSION>(&mut lexed);
12	let format_items = format_item::parse(ast);
13	- let items = format_items
14	- .map(\|res\| res.map(Into::into))
15	- .collect::<Result<Box<_>, _>>()?;
16	+ let items = format_items.collect::<Result<Box<_>, _>>()?;
17	Ok(items.into())
18	}
19

Lines 12-23 multiplexer written by @wez and implemented in Rust. Link Here

(-)b/x11/wezterm/pkg-descr (-4 / +1 lines)
12	Shift-Insert (bracketed paste is supported!)	12	Shift-Insert (bracketed paste is supported!)
13	- SGR style mouse reporting (works in vim and tmux)	13	- SGR style mouse reporting (works in vim and tmux)
14	- Render underline, double-underline, italic, bold, strikethrough	14	- Render underline, double-underline, italic, bold, strikethrough
15	(most other terminal emulators do not support as many render
16	attributes)
17	- Configuration via a file with hot reloading	15	- Configuration via a file with hot reloading
18	- Multiple Windows (Hotkey: Super-N)	16	- Multiple Windows (Hotkey: Super-N)
19	- Splits/Panes	17	- Splits/Panes and Tabs
20	- Tabs (Hotkey: Super-T, next/prev: Super-Shift-[ and Super-Shift-], go-to: Super-[1-9])
21	- SSH client with native tabs	18	- SSH client with native tabs
22	- Connect to serial ports for embedded/Arduino work	19	- Connect to serial ports for embedded/Arduino work
23	- Connect to a local multiplexer server over unix domain sockets	20	- Connect to a local multiplexer server over unix domain sockets