Attachment 260245 Details for Bug 286654 – irc/halloy: update to 2025.5

[patch] irc/halloy: update to 2025.5

0002-irc-halloy-update-to-2025.5.patch (text/plain), 7.77 KB, created by Andie Bradley on 2025-05-07 16:30:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andie Bradley

Created: 2025-05-07 16:30:26 UTC

Size: 7.77 KB

patch

obsolete

>From ac98a0cba53415d3ae37bf6359a046b2952ab934 Mon Sep 17 00:00:00 2001
>From: Andie Bradley <pokeysquirrel@gmail.com>
>Date: Tue, 6 May 2025 17:13:43 -0500
>Subject: [PATCH 2/2] irc/halloy update to 2025.5
>
>---
> irc/halloy/Makefile                         |  2 +-
> irc/halloy/Makefile.crates                  | 13 ++++++++++---
> irc/halloy/distinfo                         | 20 +++++++++++---------
> irc/halloy/files/patch-data_src_shortcut.rs | 13 +++++++++++++
> 4 files changed, 35 insertions(+), 13 deletions(-)
> create mode 100644 irc/halloy/files/patch-data_src_shortcut.rs
>
>diff --git a/irc/halloy/Makefile b/irc/halloy/Makefile
>index 2038f4d0fd..141e9f24ae 100644
>--- a/irc/halloy/Makefile
>+++ b/irc/halloy/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	halloy
>-DISTVERSION=	2025.4
>+DISTVERSION=	2025.5
> CATEGORIES=	irc
> 
> MAINTAINER=	pokeysquirrel@gmail.com
>diff --git a/irc/halloy/Makefile.crates b/irc/halloy/Makefile.crates
>index 1c8bdcef65..e55f230858 100644
>--- a/irc/halloy/Makefile.crates
>+++ b/irc/halloy/Makefile.crates
>@@ -1,3 +1,9 @@
>+===>  License GPLv3 accepted by the user
>+===>   halloy-2025.5 depends on file: /usr/local/sbin/pkg - found
>+===> Fetching all distfiles required by halloy-2025.5 for building
>+===>  Extracting for halloy-2025.5
>+=> SHA256 Checksum OK for squidowl-halloy-2025.5_GH0.tar.gz.
>+===>  Moving crates to /usr/ports/irc/halloy/work/halloy-2025.5/cargo-crates
> CARGO_CRATES=	ab_glyph-0.2.29 \
> 		ab_glyph_rasterizer-0.1.8 \
> 		addr2line-0.24.2 \
>@@ -62,6 +68,7 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
> 		base64-0.13.1 \
> 		base64-0.22.1 \
> 		base64ct-1.6.0 \
>+		bincode-1.3.3 \
> 		bindgen-0.70.1 \
> 		bit-set-0.8.0 \
> 		bit-vec-0.8.0 \
>@@ -123,7 +130,7 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
> 		core-graphics-types-0.2.0 \
> 		coreaudio-rs-0.11.3 \
> 		coreaudio-sys-0.2.16 \
>-		cosmic-text-0.13.2 \
>+		cosmic-text-0.14.2 \
> 		cpal-0.15.3 \
> 		cpufeatures-0.2.16 \
> 		crc32fast-1.4.2 \
>@@ -851,6 +858,6 @@ CARGO_CRATES=	ab_glyph-0.2.29 \
> 		zvariant_derive-5.2.0 \
> 		zvariant_utils-3.1.0 \
> 		dpi,winit@git+https://github.com/iced-rs/winit.git?rev=11414b6aa45699f038114e61b4ddf5102b2d3b4b\#11414b6aa45699f038114e61b4ddf5102b2d3b4b \
>+		cryoglyph@git+https://github.com/iced-rs/cryoglyph.git?rev=a456d1c17bbcf33afcca41d9e5e299f9f1193819\#a456d1c17bbcf33afcca41d9e5e299f9f1193819 \
> 		dark-light@git+https://github.com/rust-dark-light/dark-light?rev=8e1f745f91e1e805fa772a83e4744afe95d70aa1\#8e1f745f91e1e805fa772a83e4744afe95d70aa1 \
>-		iced,iced_core,iced_futures,iced_graphics,iced_renderer,iced_runtime,iced_tiny_skia,iced_wgpu,iced_widget,iced_winit@git+https://github.com/iced-rs/iced?rev=1b22d7d5fcdf519a3cac7a3cfd14398a3108c3b8\#1b22d7d5fcdf519a3cac7a3cfd14398a3108c3b8 \
>-		cryoglyph@git+https://github.com/iced-rs/cryoglyph.git?rev=be2defe4a13fd7c97c6f4c81e8e085463eb578dc\#be2defe4a13fd7c97c6f4c81e8e085463eb578dc
>+		iced,iced_beacon,iced_core,iced_debug,iced_devtools,iced_futures,iced_graphics,iced_program,iced_renderer,iced_runtime,iced_tiny_skia,iced_wgpu,iced_widget,iced_winit@git+https://github.com/iced-rs/iced?rev=aa633f6832c93d81fc829bcd351b369f0aada282\#aa633f6832c93d81fc829bcd351b369f0aada282
>diff --git a/irc/halloy/distinfo b/irc/halloy/distinfo
>index bd62ca333d..e080bdad23 100644
>--- a/irc/halloy/distinfo
>+++ b/irc/halloy/distinfo
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1744150666
>+TIMESTAMP = 1746548380
> SHA256 (rust/crates/ab_glyph-0.2.29.crate) = ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0
> SIZE (rust/crates/ab_glyph-0.2.29.crate) = 20011
> SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
>@@ -127,6 +127,8 @@ SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f
> SIZE (rust/crates/base64-0.22.1.crate) = 81597
> SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
> SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
>+SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
>+SIZE (rust/crates/bincode-1.3.3.crate) = 28958
> SHA256 (rust/crates/bindgen-0.70.1.crate) = f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f
> SIZE (rust/crates/bindgen-0.70.1.crate) = 226363
> SHA256 (rust/crates/bit-set-0.8.0.crate) = 08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3
>@@ -249,8 +251,8 @@ SHA256 (rust/crates/coreaudio-rs-0.11.3.crate) = 321077172d79c662f64f5071a031207
> SIZE (rust/crates/coreaudio-rs-0.11.3.crate) = 42844
> SHA256 (rust/crates/coreaudio-sys-0.2.16.crate) = 2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b
> SIZE (rust/crates/coreaudio-sys-0.2.16.crate) = 5480
>-SHA256 (rust/crates/cosmic-text-0.13.2.crate) = e418dd4f5128c3e93eab12246391c54a20c496811131f85754dc8152ee207892
>-SIZE (rust/crates/cosmic-text-0.13.2.crate) = 1896921
>+SHA256 (rust/crates/cosmic-text-0.14.2.crate) = da46a9d5a8905cc538a4a5bceb6a4510de7a51049c5588c0114efce102bcbbe8
>+SIZE (rust/crates/cosmic-text-0.14.2.crate) = 1910697
> SHA256 (rust/crates/cpal-0.15.3.crate) = 873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779
> SIZE (rust/crates/cpal-0.15.3.crate) = 100083
> SHA256 (rust/crates/cpufeatures-0.2.16.crate) = 16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3
>@@ -1705,11 +1707,11 @@ SHA256 (rust/crates/zvariant_utils-3.1.0.crate) = ddd46446ea2a1f353bfda53e35f176
> SIZE (rust/crates/zvariant_utils-3.1.0.crate) = 13991
> SHA256 (iced-rs-winit-11414b6aa45699f038114e61b4ddf5102b2d3b4b_GH0.tar.gz) = bee38ace5cbe9299770dd50d9b0b6a30a96924955cef3bada321489a0b446169
> SIZE (iced-rs-winit-11414b6aa45699f038114e61b4ddf5102b2d3b4b_GH0.tar.gz) = 607146
>+SHA256 (iced-rs-cryoglyph-a456d1c17bbcf33afcca41d9e5e299f9f1193819_GH0.tar.gz) = 857e8382fd6eb9c511ff8b7aa18aec81f07b326fe1ed4d5a146d3162279385ba
>+SIZE (iced-rs-cryoglyph-a456d1c17bbcf33afcca41d9e5e299f9f1193819_GH0.tar.gz) = 221785
> SHA256 (rust-dark-light-dark-light-8e1f745f91e1e805fa772a83e4744afe95d70aa1_GH0.tar.gz) = 8cae94eb1834d67a002b02c759deb607f054d29a14bab8a1747d2515ba807471
> SIZE (rust-dark-light-dark-light-8e1f745f91e1e805fa772a83e4744afe95d70aa1_GH0.tar.gz) = 5285
>-SHA256 (iced-rs-iced-1b22d7d5fcdf519a3cac7a3cfd14398a3108c3b8_GH0.tar.gz) = 12239d746615867e7dc41f76d19c5a790dde8a7617940c608027e04d361348e3
>-SIZE (iced-rs-iced-1b22d7d5fcdf519a3cac7a3cfd14398a3108c3b8_GH0.tar.gz) = 5215204
>-SHA256 (iced-rs-cryoglyph-be2defe4a13fd7c97c6f4c81e8e085463eb578dc_GH0.tar.gz) = 88d8425516e72e070a47967a2ca03ab1a4e44b8cd54b2e4945dff91a321dd389
>-SIZE (iced-rs-cryoglyph-be2defe4a13fd7c97c6f4c81e8e085463eb578dc_GH0.tar.gz) = 221775
>-SHA256 (squidowl-halloy-2025.4_GH0.tar.gz) = f19f01f0e31739bfbafaaf63e7d01e9d1de2813127715f6243a1bcb4e041a8c1
>-SIZE (squidowl-halloy-2025.4_GH0.tar.gz) = 15681933
>+SHA256 (iced-rs-iced-aa633f6832c93d81fc829bcd351b369f0aada282_GH0.tar.gz) = e9a6ed7e95da32980d4f64578a1de9bc50646ecb3c5112c46752b5fb387a4c53
>+SIZE (iced-rs-iced-aa633f6832c93d81fc829bcd351b369f0aada282_GH0.tar.gz) = 5224300
>+SHA256 (squidowl-halloy-2025.5_GH0.tar.gz) = ee348b830db85fcea09616a45271551fa7a382513184170a84ef9dc8b720a88d
>+SIZE (squidowl-halloy-2025.5_GH0.tar.gz) = 15703732
>diff --git a/irc/halloy/files/patch-data_src_shortcut.rs b/irc/halloy/files/patch-data_src_shortcut.rs
>new file mode 100644
>index 0000000000..df985cd6d0
>--- /dev/null
>+++ b/irc/halloy/files/patch-data_src_shortcut.rs
>@@ -0,0 +1,13 @@
>+--- data/src/shortcut.rs.orig	2025-05-06 21:46:52 UTC
>++++ data/src/shortcut.rs
>+@@ -146,9 +146,7 @@ impl KeyBind {
>+     default!(toggle_topic, "t", COMMAND | ALT);
>+     #[cfg(target_os = "macos")]
>+     default!(toggle_fullscreen, "f", COMMAND | CTRL);
>+-    #[cfg(target_os = "linux")]
>+-    default!(toggle_fullscreen, F11);
>+-    #[cfg(target_os = "windows")]
>++    #[cfg(not(target_os = "macos"))]
>+     default!(toggle_fullscreen, F11);
>+     default!(command_bar, "k", COMMAND);
>+     default!(reload_configuration, "r", COMMAND);
>-- 
>2.49.0
>

Flags:

pokeysquirrel: maintainer-approval+

Actions: View | Diff

Attachments on bug 286654: 260245 | 260350