accessibility/wl-gammarelay-rs: update to 0.4.1

Changes:	https://github.com/MaxVerevkin/wl-gammarelay-rs/releases/tag/v0.4.1
Reported by:	GitHub (watch releases)

5 files changed, 10 insertions, 71 deletions

diff --git a/accessibility/wl-gammarelay-rs/Makefile b/accessibility/wl-gammarelay-rs/Makefile
index 0a2802cd9d23..1aeeefd61bc0 100644
--- a/accessibility/wl-gammarelay-rs/Makefile
+++ b/accessibility/wl-gammarelay-rs/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	wl-gammarelay-rs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.0
-PORTREVISION=	1
+DISTVERSION=	0.4.1
 CATEGORIES=	accessibility wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/accessibility/wl-gammarelay-rs/Makefile.crates b/accessibility/wl-gammarelay-rs/Makefile.crates
index cd4025076a97..991f71eab844 100644
--- a/accessibility/wl-gammarelay-rs/Makefile.crates
+++ b/accessibility/wl-gammarelay-rs/Makefile.crates
@@ -34,5 +34,5 @@ CARGO_CRATES=	anstyle-1.0.6 \
 		wayrs-protocols-0.13.2 \
 		wayrs-scanner-0.13.2 \
 		winnow-0.5.40 \
-		rustbus-service,rustbus-service-macros@git+https://github.com/MaxVerevkin/rustbus-service?rev=7401913\#7401913977ccf665748b1f4dee033921e1c86afd \
-		rustbus,rustbus_derive@git+https://github.com/KillingSpark/rustbus?rev=20af8f2\#20af8f2a4296196779e1044c0c08d4e5f784fc61
+		rustbus-service,rustbus-service-macros@git+https://github.com/MaxVerevkin/rustbus-service?rev=1bd3aef\#1bd3aef5fe2a646685c8e640c0f67a645eeaf41d \
+		rustbus,rustbus_derive@git+https://github.com/KillingSpark/rustbus?rev=5875f1f\#5875f1fefc054ed4e2d91641f59a55b9eaee5be9
diff --git a/accessibility/wl-gammarelay-rs/distinfo b/accessibility/wl-gammarelay-rs/distinfo
index 0960aab30112..49c36c1ac835 100644
--- a/accessibility/wl-gammarelay-rs/distinfo
+++ b/accessibility/wl-gammarelay-rs/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1710763688
+TIMESTAMP = 1711040534
 SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
 SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
 SHA256 (rust/crates/anyhow-1.0.81.crate) = 0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247
@@ -71,9 +71,9 @@ SHA256 (rust/crates/wayrs-scanner-0.13.2.crate) = e387d47549e37bd2a6f03973a77578
 SIZE (rust/crates/wayrs-scanner-0.13.2.crate) = 7925
 SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
 SIZE (rust/crates/winnow-0.5.40.crate) = 159316
-SHA256 (MaxVerevkin-rustbus-service-7401913977ccf665748b1f4dee033921e1c86afd_GH0.tar.gz) = 2873f4b850994111add4864c91244520795a47e4b5303cc64a1cb5b081bc338e
-SIZE (MaxVerevkin-rustbus-service-7401913977ccf665748b1f4dee033921e1c86afd_GH0.tar.gz) = 6941
-SHA256 (KillingSpark-rustbus-20af8f2a4296196779e1044c0c08d4e5f784fc61_GH0.tar.gz) = f1c6747329d1c48eef33d0ebb09f93a04b6ba3bf6bec0c5167158f1544d4227b
-SIZE (KillingSpark-rustbus-20af8f2a4296196779e1044c0c08d4e5f784fc61_GH0.tar.gz) = 94055
-SHA256 (MaxVerevkin-wl-gammarelay-rs-v0.4.0_GH0.tar.gz) = f73a8616663e86d5579aa649fb3da2b1afb3202b94873b3d5ad57b350ef3dfdf
-SIZE (MaxVerevkin-wl-gammarelay-rs-v0.4.0_GH0.tar.gz) = 27153
+SHA256 (MaxVerevkin-rustbus-service-1bd3aef5fe2a646685c8e640c0f67a645eeaf41d_GH0.tar.gz) = 2c8b9a1f96582a811ce82d91b05699c9ba3ddb30e037f87d367aa24c484f9a54
+SIZE (MaxVerevkin-rustbus-service-1bd3aef5fe2a646685c8e640c0f67a645eeaf41d_GH0.tar.gz) = 7267
+SHA256 (KillingSpark-rustbus-5875f1fefc054ed4e2d91641f59a55b9eaee5be9_GH0.tar.gz) = 687911471c0259cab103b683b1c7772600728b0a41d48c1401571d66d50817f3
+SIZE (KillingSpark-rustbus-5875f1fefc054ed4e2d91641f59a55b9eaee5be9_GH0.tar.gz) = 94248
+SHA256 (MaxVerevkin-wl-gammarelay-rs-v0.4.1_GH0.tar.gz) = 42eec83de003c5f8c9c6c5abce3f0eadb80f5abb027d266bcc77183ecce14edc
+SIZE (MaxVerevkin-wl-gammarelay-rs-v0.4.1_GH0.tar.gz) = 27220
diff --git a/accessibility/wl-gammarelay-rs/files/patch-rustbus b/accessibility/wl-gammarelay-rs/files/patch-rustbus
deleted file mode 100644
index 7165adae1764..000000000000
--- a/accessibility/wl-gammarelay-rs/files/patch-rustbus
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/MaxVerevkin/wl-gammarelay-rs/issues/21
-https://github.com/KillingSpark/rustbus/pull/119
-
---- ../rustbus-20af8f2a4296196779e1044c0c08d4e5f784fc61/rustbus/src/auth.rs.orig	2024-03-05 15:13:03 UTC
-+++ ../rustbus-20af8f2a4296196779e1044c0c08d4e5f784fc61/rustbus/src/auth.rs
-@@ -1,7 +1,9 @@
- //! Deals with authentication to the other side. You probably do not need this.
- 
-+use nix::sys::socket::{self, sendmsg};
- use nix::unistd::getuid;
--use std::io::{Read, Write};
-+use std::io::{IoSlice, Read, Write};
-+use std::os::fd::AsRawFd;
- use std::os::unix::net::UnixStream;
- 
- fn write_message(msg: &str, stream: &mut UnixStream) -> std::io::Result<()> {
-@@ -79,8 +81,21 @@ pub fn do_auth(stream: &mut UnixStream) -> std::io::Re
- }
- 
- pub fn do_auth(stream: &mut UnixStream) -> std::io::Result<AuthResult> {
-+    // The D-Bus daemon expects an SCM_CREDS first message on FreeBSD and Dragonfly
-+    #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
-+    let cmsgs = [socket::ControlMessage::ScmCreds];
-+    #[cfg(not(any(target_os = "freebsd", target_os = "dragonfly")))]
-+    let cmsgs = [];
-+
-     // send a null byte as the first thing
--    stream.write_all(&[0])?;
-+    sendmsg::<()>(
-+        stream.as_raw_fd(),
-+        &[IoSlice::new(&[0])],
-+        &cmsgs,
-+        socket::MsgFlags::empty(),
-+        None,
-+    )?;
-+
-     write_message(&format!("AUTH EXTERNAL {}", get_uid_as_hex()), stream)?;
- 
-     let mut read_buf = Vec::new();
diff --git a/accessibility/wl-gammarelay-rs/files/patch-rustbus-service b/accessibility/wl-gammarelay-rs/files/patch-rustbus-service
deleted file mode 100644
index 09b8ab171a54..000000000000
--- a/accessibility/wl-gammarelay-rs/files/patch-rustbus-service
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/MaxVerevkin/wl-gammarelay-rs/issues/22
-https://github.com/MaxVerevkin/rustbus-service/commit/681b783ff093
-
---- ../rustbus-service-7401913977ccf665748b1f4dee033921e1c86afd/src/lib.rs.orig	2024-03-17 08:14:31 UTC
-+++ ../rustbus-service-7401913977ccf665748b1f4dee033921e1c86afd/src/lib.rs
-@@ -114,7 +114,14 @@ impl<D: 'static> Service<D> {
-                 MessageType::Signal => {
-                     eprintln!("todo: handle signal: {:?}", msg.dynheader.member);
-                 }
--                MessageType::Error => todo!(),
-+                MessageType::Error => {
-+                    let error_name = msg.dynheader.error_name.expect("error without error_name");
-+                    let error_message = msg.body.parser().get::<&str>().ok();
-+                    eprintln!(
-+                        "dbus error: {error_name}: {}",
-+                        error_message.unwrap_or("<no message>")
-+                    );
-+                }
-                 MessageType::Call => {
-                     if let Some(cb) = get_call_handler(&self.root, &msg) {
-                         cb(MethodContext {