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,19 +1,18 @@ PORTNAME= wl-gammarelay-rs DISTVERSIONPREFIX= v -DISTVERSION= 0.4.0 -PORTREVISION= 1 +DISTVERSION= 0.4.1 CATEGORIES= accessibility wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Adjust color temperature/brightness under Wayland via DBus WWW= https://github.com/MaxVerevkin/wl-gammarelay-rs LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENCE USES= cargo USE_GITHUB= yes GH_ACCOUNT= MaxVerevkin PLIST_FILES= bin/${PORTNAME} .include 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 @@ -1,38 +1,38 @@ CARGO_CRATES= anstyle-1.0.6 \ anyhow-1.0.81 \ autocfg-1.1.0 \ bitflags-2.4.2 \ bytemuck-1.15.0 \ cfg-if-1.0.0 \ cfg_aliases-0.1.1 \ clap-4.5.3 \ clap_builder-4.5.2 \ clap_derive-4.5.3 \ clap_lex-0.7.0 \ equivalent-1.0.1 \ hashbrown-0.14.3 \ heck-0.5.0 \ indexmap-2.2.5 \ libc-0.2.153 \ memchr-2.7.1 \ memmap2-0.9.4 \ memoffset-0.9.0 \ nix-0.28.0 \ proc-macro-crate-3.1.0 \ proc-macro2-1.0.79 \ quick-xml-0.31.0 \ quote-1.0.35 \ shmemfdrs2-1.0.0 \ syn-2.0.53 \ thiserror-1.0.58 \ thiserror-impl-1.0.58 \ toml_datetime-0.6.5 \ toml_edit-0.21.1 \ unicode-ident-1.0.12 \ wayrs-client-1.0.3 \ wayrs-proto-parser-2.0.0 \ 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,79 +1,79 @@ -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 SIZE (rust/crates/anyhow-1.0.81.crate) = 45142 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 SHA256 (rust/crates/bitflags-2.4.2.crate) = ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf SIZE (rust/crates/bitflags-2.4.2.crate) = 42602 SHA256 (rust/crates/bytemuck-1.15.0.crate) = 5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15 SIZE (rust/crates/bytemuck-1.15.0.crate) = 47672 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009 SHA256 (rust/crates/clap-4.5.3.crate) = 949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813 SIZE (rust/crates/clap-4.5.3.crate) = 55388 SHA256 (rust/crates/clap_builder-4.5.2.crate) = ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4 SIZE (rust/crates/clap_builder-4.5.2.crate) = 163566 SHA256 (rust/crates/clap_derive-4.5.3.crate) = 90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f SIZE (rust/crates/clap_derive-4.5.3.crate) = 29043 SHA256 (rust/crates/clap_lex-0.7.0.crate) = 98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce SIZE (rust/crates/clap_lex-0.7.0.crate) = 11915 SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5 SIZE (rust/crates/equivalent-1.0.1.crate) = 6615 SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604 SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea SIZE (rust/crates/heck-0.5.0.crate) = 11517 SHA256 (rust/crates/indexmap-2.2.5.crate) = 7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4 SIZE (rust/crates/indexmap-2.2.5.crate) = 81498 SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd SIZE (rust/crates/libc-0.2.153.crate) = 740614 SHA256 (rust/crates/memchr-2.7.1.crate) = 523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149 SIZE (rust/crates/memchr-2.7.1.crate) = 96307 SHA256 (rust/crates/memmap2-0.9.4.crate) = fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322 SIZE (rust/crates/memmap2-0.9.4.crate) = 32752 SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c SIZE (rust/crates/memoffset-0.9.0.crate) = 9033 SHA256 (rust/crates/nix-0.28.0.crate) = ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4 SIZE (rust/crates/nix-0.28.0.crate) = 311086 SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284 SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084 SHA256 (rust/crates/proc-macro2-1.0.79.crate) = e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e SIZE (rust/crates/proc-macro2-1.0.79.crate) = 47200 SHA256 (rust/crates/quick-xml-0.31.0.crate) = 1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33 SIZE (rust/crates/quick-xml-0.31.0.crate) = 172236 SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef SIZE (rust/crates/quote-1.0.35.crate) = 28136 SHA256 (rust/crates/shmemfdrs2-1.0.0.crate) = 70a05cf957f811e44f99c629e6d34025429912ffb2333f2960372669e670f54c SIZE (rust/crates/shmemfdrs2-1.0.0.crate) = 7919 SHA256 (rust/crates/syn-2.0.53.crate) = 7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032 SIZE (rust/crates/syn-2.0.53.crate) = 254828 SHA256 (rust/crates/thiserror-1.0.58.crate) = 03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297 SIZE (rust/crates/thiserror-1.0.58.crate) = 21025 SHA256 (rust/crates/thiserror-impl-1.0.58.crate) = c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7 SIZE (rust/crates/thiserror-impl-1.0.58.crate) = 15645 SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1 SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910 SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1 SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661 SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168 SHA256 (rust/crates/wayrs-client-1.0.3.crate) = ae384b841a260a5d86f471b21c22639a6fd41fe37c407be72a6d714fd3433bae SIZE (rust/crates/wayrs-client-1.0.3.crate) = 54704 SHA256 (rust/crates/wayrs-proto-parser-2.0.0.crate) = 1406ebeb6ba4a201745a92c221eca3dcec5b404fcbe948acf8a166b323582fa9 SIZE (rust/crates/wayrs-proto-parser-2.0.0.crate) = 4475 SHA256 (rust/crates/wayrs-protocols-0.13.2.crate) = b37562eeb522e6cbc9fb9e4e96a8622e10d0f31fec780ed5c12c1fc15d127a47 SIZE (rust/crates/wayrs-protocols-0.13.2.crate) = 161400 SHA256 (rust/crates/wayrs-scanner-0.13.2.crate) = e387d47549e37bd2a6f03973a77578bb003f661559a096c9274b5b9bcd78bf1f 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 { -+ // 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 Service { - 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("") -+ ); -+ } - MessageType::Call => { - if let Some(cb) = get_call_handler(&self.root, &msg) { - cb(MethodContext {